diff --git a/mozilla/content/xml/document/src/nsXMLContentSink.cpp b/mozilla/content/xml/document/src/nsXMLContentSink.cpp index 976e4f07918..68974bad840 100644 --- a/mozilla/content/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/content/xml/document/src/nsXMLContentSink.cpp @@ -1107,6 +1107,9 @@ nsXMLContentSink::LoadXSLStyleSheet(const nsIURL* aUrl) NS_NewWellFormed_DTD(&theDTD); parser->RegisterDTD(theDTD); parser->SetContentSink(sink); + + nsAutoString utf8("UTF-8"); + parser->SetDocumentCharset(utf8, kCharsetFromDocTypeDefault); parser->Parse(aUrl); // XXX Don't we have to NS_RELEASE() theDTD? diff --git a/mozilla/content/xml/document/src/nsXMLDocument.cpp b/mozilla/content/xml/document/src/nsXMLDocument.cpp index 867183c32ae..ad93a2fa4b1 100644 --- a/mozilla/content/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/content/xml/document/src/nsXMLDocument.cpp @@ -209,6 +209,8 @@ nsXMLDocument::StartDocumentLoad(nsIURL *aUrl, /* Commenting out the call to RegisterDTD() as per rickg's instructions. XML and HTML DTD's are going to be pre-registered withing nsParser. */ // mParser->RegisterDTD(theDTD); + nsAutoString utf8("utf-8"); + mParser->SetDocumentCharset(utf8, kCharsetFromDocTypeDefault); mParser->SetCommand(aCommand); mParser->SetContentSink(sink); mParser->Parse(aUrl); diff --git a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp index 976e4f07918..68974bad840 100644 --- a/mozilla/layout/xml/document/src/nsXMLContentSink.cpp +++ b/mozilla/layout/xml/document/src/nsXMLContentSink.cpp @@ -1107,6 +1107,9 @@ nsXMLContentSink::LoadXSLStyleSheet(const nsIURL* aUrl) NS_NewWellFormed_DTD(&theDTD); parser->RegisterDTD(theDTD); parser->SetContentSink(sink); + + nsAutoString utf8("UTF-8"); + parser->SetDocumentCharset(utf8, kCharsetFromDocTypeDefault); parser->Parse(aUrl); // XXX Don't we have to NS_RELEASE() theDTD? diff --git a/mozilla/layout/xml/document/src/nsXMLDocument.cpp b/mozilla/layout/xml/document/src/nsXMLDocument.cpp index 867183c32ae..ad93a2fa4b1 100644 --- a/mozilla/layout/xml/document/src/nsXMLDocument.cpp +++ b/mozilla/layout/xml/document/src/nsXMLDocument.cpp @@ -209,6 +209,8 @@ nsXMLDocument::StartDocumentLoad(nsIURL *aUrl, /* Commenting out the call to RegisterDTD() as per rickg's instructions. XML and HTML DTD's are going to be pre-registered withing nsParser. */ // mParser->RegisterDTD(theDTD); + nsAutoString utf8("utf-8"); + mParser->SetDocumentCharset(utf8, kCharsetFromDocTypeDefault); mParser->SetCommand(aCommand); mParser->SetContentSink(sink); mParser->Parse(aUrl);