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

Fixing more of the same problem. nsCOMPtr comparisons. Sorry!

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@70383 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
cata%netscape.com
2000-05-17 07:40:40 +00:00
parent 8318198770
commit c71947a6d1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -674,10 +674,10 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
Recycle(forceCharsetFromWebShell);
//TODO: we should define appropriate constant for force charset
charsetSource = kCharsetFromPreviousLoading;
} else if ((dcInfo != NULL) && (override)) {
} else if ((dcInfo.get() != NULL) && (override)) {
nsCOMPtr<nsIAtom> csAtom;
dcInfo->GetForcedCharset(getter_AddRefs(csAtom));
if (csAtom != NULL) {
if (csAtom.get() != NULL) {
csAtom->ToString(charset);
charsetSource = kCharsetFromPreviousLoading;
}

4
mozilla/layout/html/document/src/nsHTMLDocument.cpp
View File

@@ -674,10 +674,10 @@ nsHTMLDocument::StartDocumentLoad(const char* aCommand,
Recycle(forceCharsetFromWebShell);
//TODO: we should define appropriate constant for force charset
charsetSource = kCharsetFromPreviousLoading;
} else if ((dcInfo != NULL) && (override)) {
} else if ((dcInfo.get() != NULL) && (override)) {
nsCOMPtr<nsIAtom> csAtom;
dcInfo->GetForcedCharset(getter_AddRefs(csAtom));
if (csAtom != NULL) {
if (csAtom.get() != NULL) {
csAtom->ToString(charset);
charsetSource = kCharsetFromPreviousLoading;
}