From 10824c470f0116050ccea668a0f8a835733b9e5c Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Thu, 11 Feb 1999 06:23:29 +0000 Subject: [PATCH] That last checkin should have read: fix a bug in CompressWhitespace that caused the string length to be set incorrectly, when Trim shortened the string. git-svn-id: svn://10.0.0.236/trunk@20373 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/base/src/nsString.cpp | 1 + mozilla/string/obsolete/nsString.cpp | 1 + mozilla/xpcom/ds/nsString.cpp | 1 + mozilla/xpcom/string/obsolete/nsString.cpp | 1 + 4 files changed, 4 insertions(+) diff --git a/mozilla/base/src/nsString.cpp b/mozilla/base/src/nsString.cpp index 591a600cfc7..df1270bc124 100644 --- a/mozilla/base/src/nsString.cpp +++ b/mozilla/base/src/nsString.cpp @@ -1358,6 +1358,7 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); PRUnichar* from = mStr; diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp index 591a600cfc7..df1270bc124 100644 --- a/mozilla/string/obsolete/nsString.cpp +++ b/mozilla/string/obsolete/nsString.cpp @@ -1358,6 +1358,7 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); PRUnichar* from = mStr; diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp index 591a600cfc7..df1270bc124 100644 --- a/mozilla/xpcom/ds/nsString.cpp +++ b/mozilla/xpcom/ds/nsString.cpp @@ -1358,6 +1358,7 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); PRUnichar* from = mStr; diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp index 591a600cfc7..df1270bc124 100644 --- a/mozilla/xpcom/string/obsolete/nsString.cpp +++ b/mozilla/xpcom/string/obsolete/nsString.cpp @@ -1358,6 +1358,7 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); PRUnichar* from = mStr;