From 541d556187935b4eb3b882fa7db37e25f6dfa252 Mon Sep 17 00:00:00 2001 From: "pollmann%netscape.com" Date: Thu, 30 Mar 2000 01:03:02 +0000 Subject: [PATCH] Bug 33699: Allow whitespace in frameset rows and cols spec '*' r=nisheeth git-svn-id: svn://10.0.0.236/trunk@64538 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/layout/generic/nsFrameSetFrame.cpp | 8 ++++---- mozilla/layout/html/document/src/nsFrameSetFrame.cpp | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/mozilla/layout/generic/nsFrameSetFrame.cpp b/mozilla/layout/generic/nsFrameSetFrame.cpp index eff2a65ec4a..20d41b1e31e 100644 --- a/mozilla/layout/generic/nsFrameSetFrame.cpp +++ b/mozilla/layout/generic/nsFrameSetFrame.cpp @@ -695,9 +695,10 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, static const PRUnichar PERCENT('%'); static const PRUnichar COMMA(','); - // remove leading and trailing whitespace - // also remove leading/trialing commas (bug 31482) - aSpec.Trim(" \n\r\t,"); + // remove whitespace (Bug 33699) + // also remove leading/trailing commas (bug 31482) + aSpec.StripChars(" \n\r\t"); + aSpec.Trim(","); // Count the commas PRInt32 commaX = aSpec.FindChar(COMMA); @@ -739,7 +740,6 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, // Translate value to an integer nsString token(""); aSpec.Mid(token, start, numberEnd - start); - token.StripChars(" \n\r\t"); // Trim whitespace from spec (Bug 33699) // Treat * as 1* if ((eFramesetUnit_Relative == aSpecs[i].mUnit) && diff --git a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp index eff2a65ec4a..20d41b1e31e 100644 --- a/mozilla/layout/html/document/src/nsFrameSetFrame.cpp +++ b/mozilla/layout/html/document/src/nsFrameSetFrame.cpp @@ -695,9 +695,10 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, static const PRUnichar PERCENT('%'); static const PRUnichar COMMA(','); - // remove leading and trailing whitespace - // also remove leading/trialing commas (bug 31482) - aSpec.Trim(" \n\r\t,"); + // remove whitespace (Bug 33699) + // also remove leading/trailing commas (bug 31482) + aSpec.StripChars(" \n\r\t"); + aSpec.Trim(","); // Count the commas PRInt32 commaX = aSpec.FindChar(COMMA); @@ -739,7 +740,6 @@ nsHTMLFramesetFrame::ParseRowColSpec(nsString& aSpec, // Translate value to an integer nsString token(""); aSpec.Mid(token, start, numberEnd - start); - token.StripChars(" \n\r\t"); // Trim whitespace from spec (Bug 33699) // Treat * as 1* if ((eFramesetUnit_Relative == aSpecs[i].mUnit) &&