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

Use a better sourcelevel when setting charset through xsl:output element. Also make sure to use the proper form when setting the charset.

Browse Source 
r/sr=bz


git-svn-id: svn://10.0.0.236/trunk@168845 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cvshook%sicking.cc
2005-02-05 13:47:43 +00:00
parent 989d0480fb
commit 07d5e47b79
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/extensions/transformiix/source/xslt/txMozillaTextOutput.cpp
View File

@@ -49,6 +49,7 @@
#include "nsNetUtil.h"
#include "nsIDOMNSDocument.h"
#include "nsIParser.h"
#include "nsICharsetAlias.h"
static NS_DEFINE_CID(kXMLDocumentCID, NS_XMLDOCUMENT_CID);
@@ -187,9 +188,16 @@ void txMozillaTextOutput::createResultDocument(nsIDOMDocument* aSourceDocument,
// Set the charset
if (!mOutputFormat.mEncoding.IsEmpty()) {
doc->SetDocumentCharacterSet(
NS_LossyConvertUTF16toASCII(mOutputFormat.mEncoding));
doc->SetDocumentCharacterSetSource(kCharsetFromOtherComponent);
NS_LossyConvertUTF16toASCII charset(mOutputFormat.mEncoding);
nsCAutoString canonicalCharset;
nsCOMPtr<nsICharsetAlias> calias =
do_GetService("@mozilla.org/intl/charsetalias;1");
if (calias &&
NS_SUCCEEDED(calias->GetPreferred(charset, canonicalCharset))) {
doc->SetDocumentCharacterSet(canonicalCharset);
doc->SetDocumentCharacterSetSource(kCharsetFromOtherComponent);
}
}
else {
doc->SetDocumentCharacterSet(sourceDoc->GetDocumentCharacterSet());

14
mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.cpp
View File

@@ -71,6 +71,7 @@
#include "nsIStyleSheetLinkingElement.h"
#include "nsIDocumentTransformer.h"
#include "nsICSSLoader.h"
#include "nsICharsetAlias.h"
extern nsINameSpaceManager* gTxNameSpaceManager;
@@ -738,9 +739,16 @@ txMozillaXMLOutput::createResultDocument(const nsAString& aName, PRInt32 aNsID,
// Set the charset
if (!mOutputFormat.mEncoding.IsEmpty()) {
doc->SetDocumentCharacterSet(
NS_LossyConvertUTF16toASCII(mOutputFormat.mEncoding));
doc->SetDocumentCharacterSetSource(kCharsetFromOtherComponent);
NS_LossyConvertUTF16toASCII charset(mOutputFormat.mEncoding);
nsCAutoString canonicalCharset;
nsCOMPtr<nsICharsetAlias> calias =
do_GetService("@mozilla.org/intl/charsetalias;1");
if (calias &&
NS_SUCCEEDED(calias->GetPreferred(charset, canonicalCharset))) {
doc->SetDocumentCharacterSet(canonicalCharset);
doc->SetDocumentCharacterSetSource(kCharsetFromOtherComponent);
}
}
// Set the mime-type

7
mozilla/parser/htmlparser/public/nsIParser.h
View File

@@ -108,9 +108,10 @@ enum eParserDocType {
#define kCharsetFromMetaTag 9
#define kCharsetFromByteOrderMark 10
#define kCharsetFromChannel 11
#define kCharsetFromParentForced 12
#define kCharsetFromUserForced 13
#define kCharsetFromOtherComponent 14
#define kCharsetFromOtherComponent 12
// Levels below here will be forced onto childframes too
#define kCharsetFromParentForced 13
#define kCharsetFromUserForced 14
#define kCharsetFromPreviousLoading 15
enum eStreamState {eNone,eOnStart,eOnDataAvail,eOnStop};