From 4e91cec88abfe6ee83d93fe5032edf246086f6e0 Mon Sep 17 00:00:00 2001
From: "cata%netscape.com" <cata%netscape.com>
Date: Wed, 17 May 2000 07:40:40 +0000
Subject: [PATCH] Fixing more of the same problem. nsCOMPtr comparisons. Sorry!

---
 content/html/document/src/nsHTMLDocument.cpp | 4 ++--
 layout/html/document/src/nsHTMLDocument.cpp  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/html/document/src/nsHTMLDocument.cpp b/content/html/document/src/nsHTMLDocument.cpp
index a9b1da769f7e..4e32e3669d1f 100644
--- a/content/html/document/src/nsHTMLDocument.cpp
+++ b/content/html/document/src/nsHTMLDocument.cpp
@@ -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;  
             }
diff --git a/layout/html/document/src/nsHTMLDocument.cpp b/layout/html/document/src/nsHTMLDocument.cpp
index a9b1da769f7e..4e32e3669d1f 100644
--- a/layout/html/document/src/nsHTMLDocument.cpp
+++ b/layout/html/document/src/nsHTMLDocument.cpp
@@ -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;  
             }