diff --git a/htmlparser/src/nsDTDUtils.cpp b/htmlparser/src/nsDTDUtils.cpp
index 00ee566d9e66..cf6006f50709 100644
--- a/htmlparser/src/nsDTDUtils.cpp
+++ b/htmlparser/src/nsDTDUtils.cpp
@@ -61,17 +61,14 @@ void nsTagStack::Empty(void) {
*/
void nsTagStack::Push(eHTMLTags aTag) {
if(mCount==mCapacity){
- nsTagEntry* temp=new nsTagEntry[mCapacity+50];
- if(mCapacity){
- PRUint32 index=0;
- for(index=0;indexReset();
- nsresult result = mUnicodeEncoder->Convert(data, &length, mBuffer, &bufferLength);
+ nsresult result = mUnicodeEncoder->Convert(data.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))
diff --git a/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index ccf26f593b45..fcf54bc324a8 100644
--- a/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -487,7 +487,7 @@ void nsHTMLToTXTSinkStream::UnicodeToTXTString(const nsString& aSrc)
bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
- result = mUnicodeEncoder->Convert(aSrc, &length, mBuffer, &bufferLength);
+ result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))
diff --git a/parser/htmlparser/src/nsDTDUtils.cpp b/parser/htmlparser/src/nsDTDUtils.cpp
index 00ee566d9e66..cf6006f50709 100644
--- a/parser/htmlparser/src/nsDTDUtils.cpp
+++ b/parser/htmlparser/src/nsDTDUtils.cpp
@@ -61,17 +61,14 @@ void nsTagStack::Empty(void) {
*/
void nsTagStack::Push(eHTMLTags aTag) {
if(mCount==mCapacity){
- nsTagEntry* temp=new nsTagEntry[mCapacity+50];
- if(mCapacity){
- PRUint32 index=0;
- for(index=0;indexReset();
- nsresult result = mUnicodeEncoder->Convert(data, &length, mBuffer, &bufferLength);
+ nsresult result = mUnicodeEncoder->Convert(data.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))
diff --git a/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp b/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
index ccf26f593b45..fcf54bc324a8 100644
--- a/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
+++ b/parser/htmlparser/src/nsHTMLToTXTSinkStream.cpp
@@ -487,7 +487,7 @@ void nsHTMLToTXTSinkStream::UnicodeToTXTString(const nsString& aSrc)
bufferLength = mBufferSize;
mUnicodeEncoder->Reset();
- result = mUnicodeEncoder->Convert(aSrc, &length, mBuffer, &bufferLength);
+ result = mUnicodeEncoder->Convert(aSrc.GetUnicode(), &length, mBuffer, &bufferLength);
mBuffer[bufferLength] = 0;
PRInt32 temp = bufferLength;
if (NS_SUCCEEDED(result))