From dc1c4a0f2682e0cf5dc3582af30406304eae0f85 Mon Sep 17 00:00:00 2001 From: "jfrancis%netscape.com" Date: Wed, 24 May 2000 23:59:45 +0000 Subject: [PATCH] fixing unix nsCOMPtr usage git-svn-id: svn://10.0.0.236/trunk@70773 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsHTMLEditRules.cpp | 12 ++++++------ mozilla/editor/libeditor/html/nsHTMLEditRules.cpp | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index 27a7d118172..84a9aff3574 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -460,7 +460,7 @@ nsHTMLEditRules::GetParagraphState(PRBool &aMixed, nsString &outFormat) if (mEditor->IsInlineNode(curNode)) format.AssignWithConversion(""); - else if (nsIEditProperty::p == atom) + else if (nsIEditProperty::p == atom.get()) format.AssignWithConversion("P"); else if (nsHTMLEditUtils::IsHeader(curNode)) { @@ -469,15 +469,15 @@ nsHTMLEditRules::GetParagraphState(PRBool &aMixed, nsString &outFormat) tag.ToUpperCase(); format = tag; } - else if (nsIEditProperty::blockquote == atom) + else if (nsIEditProperty::blockquote == atom.get()) format.AssignWithConversion("BLOCKQUOTE"); - else if (nsIEditProperty::address == atom) + else if (nsIEditProperty::address == atom.get()) format.AssignWithConversion("ADDRESS"); - else if (nsIEditProperty::pre == atom) + else if (nsIEditProperty::pre == atom.get()) format.AssignWithConversion("PRE"); - else if (nsIEditProperty::dt == atom) + else if (nsIEditProperty::dt == atom.get()) format.AssignWithConversion("DT"); - else if (nsIEditProperty::dd == atom) + else if (nsIEditProperty::dd == atom.get()) format.AssignWithConversion("DD"); // if this is the first node, we've found, remember it as the format diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index 27a7d118172..84a9aff3574 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -460,7 +460,7 @@ nsHTMLEditRules::GetParagraphState(PRBool &aMixed, nsString &outFormat) if (mEditor->IsInlineNode(curNode)) format.AssignWithConversion(""); - else if (nsIEditProperty::p == atom) + else if (nsIEditProperty::p == atom.get()) format.AssignWithConversion("P"); else if (nsHTMLEditUtils::IsHeader(curNode)) { @@ -469,15 +469,15 @@ nsHTMLEditRules::GetParagraphState(PRBool &aMixed, nsString &outFormat) tag.ToUpperCase(); format = tag; } - else if (nsIEditProperty::blockquote == atom) + else if (nsIEditProperty::blockquote == atom.get()) format.AssignWithConversion("BLOCKQUOTE"); - else if (nsIEditProperty::address == atom) + else if (nsIEditProperty::address == atom.get()) format.AssignWithConversion("ADDRESS"); - else if (nsIEditProperty::pre == atom) + else if (nsIEditProperty::pre == atom.get()) format.AssignWithConversion("PRE"); - else if (nsIEditProperty::dt == atom) + else if (nsIEditProperty::dt == atom.get()) format.AssignWithConversion("DT"); - else if (nsIEditProperty::dd == atom) + else if (nsIEditProperty::dd == atom.get()) format.AssignWithConversion("DD"); // if this is the first node, we've found, remember it as the format