Oh, drat. Previous fix for const problem also threw away the result

of UnicodeToHTMLString.  This fixes that.


git-svn-id: svn://10.0.0.236/trunk@35588 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
akkana%netscape.com
1999-06-16 00:52:47 +00:00
parent 362a835691
commit a9a778be57
2 changed files with 10 additions and 8 deletions

View File

@@ -472,8 +472,8 @@ void nsHTMLContentSinkStream::UnicodeToHTMLString(const nsString& aSrc,
void nsHTMLContentSinkStream::EncodeToBuffer(const nsString& aSrc)
{
nsString unicode;
UnicodeToHTMLString(aSrc, unicode);
nsString htmlstr;
UnicodeToHTMLString(aSrc, htmlstr);
NS_VERIFY(mUnicodeEncoder != nsnull,"The unicode encoder needs to be initialized");
if (mUnicodeEncoder == nsnull)
@@ -481,7 +481,7 @@ void nsHTMLContentSinkStream::EncodeToBuffer(const nsString& aSrc)
#define CH_NBSP 160
PRInt32 length = aSrc.Length();
PRInt32 length = htmlstr.Length();
nsresult result;
if (mUnicodeEncoder != nsnull && length > 0)
@@ -490,7 +490,8 @@ void nsHTMLContentSinkStream::EncodeToBuffer(const nsString& aSrc)
mBufferLength = mBufferSize;
mUnicodeEncoder->Reset();
result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &mBufferLength);
result = mUnicodeEncoder->Convert(htmlstr.GetUnicode(), &length,
mBuffer, &mBufferLength);
mBuffer[mBufferLength] = 0;
PRInt32 temp = mBufferLength;
if (NS_SUCCEEDED(result))