diff --git a/mozilla/xpcom/string/public/nsReadableUtils.h b/mozilla/xpcom/string/public/nsReadableUtils.h index 8374bd13cf1..eebfc7af6c6 100755 --- a/mozilla/xpcom/string/public/nsReadableUtils.h +++ b/mozilla/xpcom/string/public/nsReadableUtils.h @@ -48,6 +48,9 @@ NS_COM size_t Distance( const nsReadingIterator&, const nsReadingIterator< NS_COM void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest ); NS_COM void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest ); +NS_COM void LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest ); +NS_COM void CopyASCIItoUTF16( const char* aSource, nsAString& aDest ); + NS_COM void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest ); NS_COM void CopyUTF8toUTF16( const nsACString& aSource, nsAString& aDest ); diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp index e2cb5518b72..6baa85cddc6 100755 --- a/mozilla/xpcom/string/src/nsReadableUtils.cpp +++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp @@ -162,6 +162,26 @@ CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest ) AppendASCIItoUTF16(aSource, aDest); } +NS_COM +void +LossyCopyUTF16toASCII( const PRUnichar* aSource, nsACString& aDest ) + { + if (aSource) { + aDest.Truncate(); + LossyAppendUTF16toASCII(nsDependentString(aSource), aDest); + } + } + +NS_COM +void +CopyASCIItoUTF16( const char* aSource, nsAString& aDest ) + { + if (aSource) { + aDest.Truncate(); + AppendASCIItoUTF16(nsDependentCString(aSource), aDest); + } + } + NS_COM void CopyUTF16toUTF8( const nsAString& aSource, nsACString& aDest )