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

Turning on charset override by default. r=nhotta a=ftang bug #41620.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@72851 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cata%netscape.com
2000-06-22 00:41:02 +00:00
parent cd180f189c
commit 20be06a0d4
3 changed files with 5 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mozilla/content/html/document/src/nsHTMLDocument.cpp
View File

@@ -599,17 +599,6 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
nsCOMPtr<nsIDocumentCharsetInfo> dcInfo;
docShell->GetDocumentCharsetInfo(getter_AddRefs(dcInfo));
PRBool override = PR_FALSE;
nsCOMPtr<nsIPref> prf(do_GetService(NS_PREF_PROGID));
if (prf) {
char * toOverride = nsnull;
if(NS_SUCCEEDED(prf->CopyCharPref("intl.charset.override", &toOverride)))
{
if (toOverride[0] != 0) override = PR_TRUE;
PR_FREEIF(toOverride);
}
}
//
// The following logic is mirrored in nsWebShell::Embed!
@@ -699,12 +688,13 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
Recycle(forceCharsetFromWebShell);
//TODO: we should define appropriate constant for force charset
charsetSource = kCharsetFromPreviousLoading;
} else if ((dcInfo.get() != NULL) && (override)) {
} else if (dcInfo) {
nsCOMPtr<nsIAtom> csAtom;
dcInfo->GetForcedCharset(getter_AddRefs(csAtom));
if (csAtom.get() != NULL) {
csAtom->ToString(charset);
charsetSource = kCharsetFromPreviousLoading;
dcInfo->SetForcedCharset(NULL);
}
}
}