From 44fe02fdd98c2afd928938e5d2a3af1edef75fdc Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Thu, 29 Apr 1999 01:01:04 +0000 Subject: [PATCH] fix build bustage comparing raw pointer to nsCOMPtr. git-svn-id: svn://10.0.0.236/trunk@29782 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/editor/base/nsHTMLEditRules.cpp | 2 +- mozilla/editor/libeditor/html/nsHTMLEditRules.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mozilla/editor/base/nsHTMLEditRules.cpp b/mozilla/editor/base/nsHTMLEditRules.cpp index 0ebbecc961a..46e6768c88b 100644 --- a/mozilla/editor/base/nsHTMLEditRules.cpp +++ b/mozilla/editor/base/nsHTMLEditRules.cpp @@ -986,7 +986,7 @@ nsHTMLEditRules::NextNodeInBlock(nsIDOMNode *aNode, IterDirection aDir) if (NS_FAILED(iter->CurrentNode(getter_AddRefs(content)))) return nullNode; // ignore nodes that aren't elements or text, or that are the block parent node = do_QueryInterface(content); - if (node && IsTextOrElementNode(node) && (node != blockParent) && (node!=aNode)) + if (node && IsTextOrElementNode(node) && (node != blockParent) && (node!=nsCOMPtr(dont_QueryInterface(aNode)))) return node; if (aDir == kIterForward) diff --git a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp index 0ebbecc961a..46e6768c88b 100644 --- a/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp +++ b/mozilla/editor/libeditor/html/nsHTMLEditRules.cpp @@ -986,7 +986,7 @@ nsHTMLEditRules::NextNodeInBlock(nsIDOMNode *aNode, IterDirection aDir) if (NS_FAILED(iter->CurrentNode(getter_AddRefs(content)))) return nullNode; // ignore nodes that aren't elements or text, or that are the block parent node = do_QueryInterface(content); - if (node && IsTextOrElementNode(node) && (node != blockParent) && (node!=aNode)) + if (node && IsTextOrElementNode(node) && (node != blockParent) && (node!=nsCOMPtr(dont_QueryInterface(aNode)))) return node; if (aDir == kIterForward)