Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@76967 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%netscape.com
2000-08-23 17:27:06 +00:00
parent c53de61c00
commit 7e0575bfee
632 changed files with 11678 additions and 10726 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/htmlparser/src/nsHTMLContentSinkStream.cpp
View File

@@ -128,8 +128,8 @@ nsHTMLContentSinkStream::nsHTMLContentSinkStream()
NS_IMETHODIMP
nsHTMLContentSinkStream::Initialize(nsIOutputStream* aOutStream,
nsString* aOutString,
const nsString* aCharsetOverride,
nsAWritableString* aOutString,
const nsAReadableString* aCharsetOverride,
PRUint32 aFlags)
{
mDoFormat = (aFlags & nsIDocumentEncoder::OutputFormatted) ? PR_TRUE
@@ -157,7 +157,7 @@ nsHTMLContentSinkStream::Initialize(nsIOutputStream* aOutStream,
mStream = aOutStream;
mString = aOutString;
if (aCharsetOverride != nsnull)
mCharsetOverride.AssignWithConversion(aCharsetOverride->GetUnicode());
mCharsetOverride.Assign(*aCharsetOverride);
mPreLevel = 0;
@@ -227,10 +227,10 @@ nsHTMLContentSinkStream::InitEncoders()
// Initialize a charset encoder if we're using the stream interface
if (mStream)
{
nsAutoString charsetName; charsetName.AssignWithConversion(mCharsetOverride);
nsAutoString charsetName; charsetName.Assign(mCharsetOverride);
NS_WITH_SERVICE(nsICharsetAlias, calias, kCharsetAliasCID, &res);
if (NS_SUCCEEDED(res) && calias) {
nsAutoString temp; temp.AssignWithConversion(mCharsetOverride);
nsAutoString temp; temp.Assign(mCharsetOverride);
res = calias->GetPreferred(temp, charsetName);
}
if (NS_FAILED(res))
@@ -374,7 +374,7 @@ void nsHTMLContentSinkStream::Write(const char* aData)
}
if (mString)
{
mString->AppendWithConversion(aData);
mString->Append(NS_ConvertASCIItoUCS2(aData));
}
}
@@ -390,7 +390,7 @@ void nsHTMLContentSinkStream::Write(char aData)
}
if (mString)
{
mString->AppendWithConversion(aData);
mString->Append(NS_ConvertASCIItoUCS2(aData));
}
}
@@ -1072,7 +1072,7 @@ nsHTMLContentSinkStream::OpenContainer(const nsIParserNode& aNode)
{
const nsString& value=aNode.GetValueAt(i);
if (mCharsetOverride.IsEmpty())
mCharsetOverride.AssignWithConversion(value.GetUnicode());
mCharsetOverride.Assign(value);
InitEncoders();
}
else if (key.EqualsWithConversion("uri"))