diff --git a/mozilla/string/obsolete/nsString2.cpp b/mozilla/string/obsolete/nsString2.cpp index a7cbdc27f54..a0d394fe3f3 100644 --- a/mozilla/string/obsolete/nsString2.cpp +++ b/mozilla/string/obsolete/nsString2.cpp @@ -180,6 +180,21 @@ PRUnichar* nsString::GetWritableFragment( nsWritableFragment& aFragme } } + +void +nsString::do_AppendFromElement( PRUnichar inChar ) + { + PRUnichar buf[2] = { 0, 0 }; + buf[0] = inChar; + + nsStr temp; + nsStr::Initialize(temp, eTwoByte); + temp.mUStr = buf; + temp.mLength = 1; + StrAppend(*this, temp, 0, 1); + } + + nsString::nsString( const nsAReadableString& aReadable ) { Initialize(*this,eTwoByte); Assign(aReadable); diff --git a/mozilla/string/obsolete/nsString2.h b/mozilla/string/obsolete/nsString2.h index d41271e09d2..cec472b57ec 100644 --- a/mozilla/string/obsolete/nsString2.h +++ b/mozilla/string/obsolete/nsString2.h @@ -505,6 +505,8 @@ public: void AppendWithConversion(const char*, PRInt32=-1); void AppendWithConversion(char); + virtual void do_AppendFromElement( PRUnichar ); + #ifndef NEW_STRING_APIS /* * Appends n characters from given string to this, diff --git a/mozilla/xpcom/ds/nsString2.cpp b/mozilla/xpcom/ds/nsString2.cpp index a7cbdc27f54..a0d394fe3f3 100644 --- a/mozilla/xpcom/ds/nsString2.cpp +++ b/mozilla/xpcom/ds/nsString2.cpp @@ -180,6 +180,21 @@ PRUnichar* nsString::GetWritableFragment( nsWritableFragment& aFragme } } + +void +nsString::do_AppendFromElement( PRUnichar inChar ) + { + PRUnichar buf[2] = { 0, 0 }; + buf[0] = inChar; + + nsStr temp; + nsStr::Initialize(temp, eTwoByte); + temp.mUStr = buf; + temp.mLength = 1; + StrAppend(*this, temp, 0, 1); + } + + nsString::nsString( const nsAReadableString& aReadable ) { Initialize(*this,eTwoByte); Assign(aReadable); diff --git a/mozilla/xpcom/ds/nsString2.h b/mozilla/xpcom/ds/nsString2.h index d41271e09d2..cec472b57ec 100644 --- a/mozilla/xpcom/ds/nsString2.h +++ b/mozilla/xpcom/ds/nsString2.h @@ -505,6 +505,8 @@ public: void AppendWithConversion(const char*, PRInt32=-1); void AppendWithConversion(char); + virtual void do_AppendFromElement( PRUnichar ); + #ifndef NEW_STRING_APIS /* * Appends n characters from given string to this, diff --git a/mozilla/xpcom/string/obsolete/nsString2.cpp b/mozilla/xpcom/string/obsolete/nsString2.cpp index a7cbdc27f54..a0d394fe3f3 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.cpp +++ b/mozilla/xpcom/string/obsolete/nsString2.cpp @@ -180,6 +180,21 @@ PRUnichar* nsString::GetWritableFragment( nsWritableFragment& aFragme } } + +void +nsString::do_AppendFromElement( PRUnichar inChar ) + { + PRUnichar buf[2] = { 0, 0 }; + buf[0] = inChar; + + nsStr temp; + nsStr::Initialize(temp, eTwoByte); + temp.mUStr = buf; + temp.mLength = 1; + StrAppend(*this, temp, 0, 1); + } + + nsString::nsString( const nsAReadableString& aReadable ) { Initialize(*this,eTwoByte); Assign(aReadable); diff --git a/mozilla/xpcom/string/obsolete/nsString2.h b/mozilla/xpcom/string/obsolete/nsString2.h index d41271e09d2..cec472b57ec 100644 --- a/mozilla/xpcom/string/obsolete/nsString2.h +++ b/mozilla/xpcom/string/obsolete/nsString2.h @@ -505,6 +505,8 @@ public: void AppendWithConversion(const char*, PRInt32=-1); void AppendWithConversion(char); + virtual void do_AppendFromElement( PRUnichar ); + #ifndef NEW_STRING_APIS /* * Appends n characters from given string to this,