diff --git a/mozilla/base/src/nsString.cpp b/mozilla/base/src/nsString.cpp index 9eeccac554e..591a600cfc7 100644 --- a/mozilla/base/src/nsString.cpp +++ b/mozilla/base/src/nsString.cpp @@ -1358,12 +1358,12 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); + PRUnichar* from = mStr; PRUnichar* end = mStr + mLength; PRUnichar* to = from; - Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); - //this code converts /n, /t, /r into normal space ' '; //it also eliminates runs of whitespace... while (from < end) { diff --git a/mozilla/string/obsolete/nsString.cpp b/mozilla/string/obsolete/nsString.cpp index 9eeccac554e..591a600cfc7 100644 --- a/mozilla/string/obsolete/nsString.cpp +++ b/mozilla/string/obsolete/nsString.cpp @@ -1358,12 +1358,12 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); + PRUnichar* from = mStr; PRUnichar* end = mStr + mLength; PRUnichar* to = from; - Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); - //this code converts /n, /t, /r into normal space ' '; //it also eliminates runs of whitespace... while (from < end) { diff --git a/mozilla/xpcom/ds/nsString.cpp b/mozilla/xpcom/ds/nsString.cpp index 9eeccac554e..591a600cfc7 100644 --- a/mozilla/xpcom/ds/nsString.cpp +++ b/mozilla/xpcom/ds/nsString.cpp @@ -1358,12 +1358,12 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); + PRUnichar* from = mStr; PRUnichar* end = mStr + mLength; PRUnichar* to = from; - Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); - //this code converts /n, /t, /r into normal space ' '; //it also eliminates runs of whitespace... while (from < end) { diff --git a/mozilla/xpcom/string/obsolete/nsString.cpp b/mozilla/xpcom/string/obsolete/nsString.cpp index 9eeccac554e..591a600cfc7 100644 --- a/mozilla/xpcom/string/obsolete/nsString.cpp +++ b/mozilla/xpcom/string/obsolete/nsString.cpp @@ -1358,12 +1358,12 @@ nsString& nsString::Trim(const char* aTrimSet, nsString& nsString::CompressWhitespace( PRBool aEliminateLeading, PRBool aEliminateTrailing) { + Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); + PRUnichar* from = mStr; PRUnichar* end = mStr + mLength; PRUnichar* to = from; - Trim(" \r\n\t",aEliminateLeading,aEliminateTrailing); - //this code converts /n, /t, /r into normal space ' '; //it also eliminates runs of whitespace... while (from < end) {