From ae5e6617c45da3e00f97faef42acd21e5cf91c5e Mon Sep 17 00:00:00 2001 From: "peter%propagandism.org" Date: Sun, 2 Nov 2003 12:58:29 +0000 Subject: [PATCH] Restoring fix for bug 224231, didn't affect btek's Tp. git-svn-id: svn://10.0.0.236/trunk@148722 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/xpcom/string/src/nsReadableUtils.cpp | 22 ++++---------------- 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/mozilla/xpcom/string/src/nsReadableUtils.cpp b/mozilla/xpcom/string/src/nsReadableUtils.cpp index 9fa1dbf8dd7..e2cb5518b72 100755 --- a/mozilla/xpcom/string/src/nsReadableUtils.cpp +++ b/mozilla/xpcom/string/src/nsReadableUtils.cpp @@ -150,30 +150,16 @@ NS_COM void LossyCopyUTF16toASCII( const nsAString& aSource, nsACString& aDest ) { - aDest.SetLength(aSource.Length()); - - nsAString::const_iterator fromBegin, fromEnd; - - // right now, this won't work on multi-fragment destinations - nsACString::iterator toBegin; - LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); - - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); + aDest.Truncate(); + LossyAppendUTF16toASCII(aSource, aDest); } NS_COM void CopyASCIItoUTF16( const nsACString& aSource, nsAString& aDest ) { - aDest.SetLength(aSource.Length()); - - nsACString::const_iterator fromBegin, fromEnd; - - // right now, this won't work on multi-fragment destinations - nsAString::iterator toBegin; - LossyConvertEncoding converter(aDest.BeginWriting(toBegin).get()); - - copy_string(aSource.BeginReading(fromBegin), aSource.EndReading(fromEnd), converter); + aDest.Truncate(); + AppendASCIItoUTF16(aSource, aDest); } NS_COM