landing string branch; see bug #73786

git-svn-id: svn://10.0.0.236/trunk@91049 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
scc%mozilla.org
2001-04-02 19:40:52 +00:00
parent e12df9c36a
commit 7b06841b03
143 changed files with 11372 additions and 5238 deletions

View File

@@ -289,7 +289,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
{
nsresult res;
PRUnichar *encodedBuffer = nsnull;
res = mEntityConverter->ConvertToEntities(nsPromiseFlatString(aString).get(),
res = mEntityConverter->ConvertToEntities(PromiseFlatString(aString).get(),
nsIEntityConverter::html40Latin1,
&encodedBuffer);
if (NS_SUCCEEDED(res) && encodedBuffer)
@@ -328,7 +328,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
{
// Call the converter to convert to the target charset.
// Convert() takes a char* output param even though it's writing unicode.
res = mCharsetEncoder->Convert(nsPromiseFlatString(aString).get(), &encodedBuffer);
res = mCharsetEncoder->Convert(PromiseFlatString(aString).get(), &encodedBuffer);
if (NS_SUCCEEDED(res) && encodedBuffer)
{
charsWritten = nsCRT::strlen(encodedBuffer);
@@ -340,7 +340,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
else
{
charsWritten = aString.Length();
out.write(nsPromiseFlatString(aString).get(), charsWritten);
out.write(PromiseFlatString(aString).get(), charsWritten);
}
}
@@ -348,7 +348,7 @@ PRInt32 nsHTMLContentSinkStream::Write(const nsAReadableString& aString)
else
{
charsWritten = aString.Length();
out.write(nsPromiseFlatString(aString).get(), charsWritten);
out.write(PromiseFlatString(aString).get(), charsWritten);
}
return charsWritten;