DOM string changes. All nsString& in DOM interfaces (and interfaces needed by DOM implementations) have been changed to nsAReadableString& and nsAWritableString&. String implementation additions (sanctioned by scc) to support DOM needs. Bug 49091. r=vidur,jst,scc
git-svn-id: svn://10.0.0.236/trunk@76967 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
@@ -249,10 +249,13 @@ nsHTMLToTXTSinkStream::~nsHTMLToTXTSinkStream()
|
||||
*/
|
||||
NS_IMETHODIMP
|
||||
nsHTMLToTXTSinkStream::Initialize(nsIOutputStream* aOutStream,
|
||||
nsString* aOutString,
|
||||
nsAWritableString* aOutString,
|
||||
PRUint32 aFlags)
|
||||
{
|
||||
mStream = aOutStream;
|
||||
// XXX This is wrong. It violates XPCOM string ownership rules.
|
||||
// We're only getting away with this because instances of this
|
||||
// class are restricted to single function scope.
|
||||
mString = aOutString;
|
||||
mFlags = aFlags;
|
||||
|
||||
@@ -304,11 +307,11 @@ nsHTMLToTXTSinkStream::Initialize(nsIOutputStream* aOutStream,
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsHTMLToTXTSinkStream::SetCharsetOverride(const nsString* aCharset)
|
||||
nsHTMLToTXTSinkStream::SetCharsetOverride(const nsAReadableString* aCharset)
|
||||
{
|
||||
if (aCharset)
|
||||
{
|
||||
mCharsetOverride = *aCharset;
|
||||
mCharsetOverride.Assign(*aCharset);
|
||||
InitEncoder(mCharsetOverride);
|
||||
}
|
||||
return NS_OK;
|
||||
@@ -1108,7 +1111,7 @@ void nsHTMLToTXTSinkStream::WriteSimple(nsString& aString)
|
||||
}
|
||||
if (mString != nsnull)
|
||||
{
|
||||
mString->AppendWithConversion(mBuffer);
|
||||
mString->Append(NS_ConvertASCIItoUCS2(mBuffer));
|
||||
}
|
||||
}
|
||||
else
|
||||
|
||||
Reference in New Issue
Block a user