From 91949cbf5d3328c2b767e7c93620f9228d6db1a5 Mon Sep 17 00:00:00 2001 From: "akkana%netscape.com" Date: Tue, 29 Aug 2000 00:18:53 +0000 Subject: [PATCH] Last checkin didn't fix 47309, so revert that part 'til we get a better fix git-svn-id: svn://10.0.0.236/trunk@77425 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/content/html/document/src/nsHTMLDocument.cpp | 8 +++++--- mozilla/layout/html/document/src/nsHTMLDocument.cpp | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mozilla/content/html/document/src/nsHTMLDocument.cpp b/mozilla/content/html/document/src/nsHTMLDocument.cpp index a4f443f7188..b4b462696b8 100644 --- a/mozilla/content/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/content/html/document/src/nsHTMLDocument.cpp @@ -4143,14 +4143,16 @@ PRBool nsHTMLDocument::IsInSelection(nsIDOMSelection* aSelection, const nsIContent* aContent) const { + nsIAtom* tag; + nsresult rv = aContent->GetTag(tag); + PRBool retval; + #if 0 // HTML document has to include body in the selection, // so that output can see style nodes on the body // in case the caller doesn't know to specify wrap column // or preformatted or similar styles. - nsIAtom* tag; - nsresult rv = aContent->GetTag(tag); - PRBool retval = (NS_SUCCEEDED(rv) && tag == nsHTMLAtoms::body); + retval = (NS_SUCCEEDED(rv) && tag == nsHTMLAtoms::body); if (retval) { NS_IF_RELEASE(tag); diff --git a/mozilla/layout/html/document/src/nsHTMLDocument.cpp b/mozilla/layout/html/document/src/nsHTMLDocument.cpp index a4f443f7188..b4b462696b8 100644 --- a/mozilla/layout/html/document/src/nsHTMLDocument.cpp +++ b/mozilla/layout/html/document/src/nsHTMLDocument.cpp @@ -4143,14 +4143,16 @@ PRBool nsHTMLDocument::IsInSelection(nsIDOMSelection* aSelection, const nsIContent* aContent) const { + nsIAtom* tag; + nsresult rv = aContent->GetTag(tag); + PRBool retval; + #if 0 // HTML document has to include body in the selection, // so that output can see style nodes on the body // in case the caller doesn't know to specify wrap column // or preformatted or similar styles. - nsIAtom* tag; - nsresult rv = aContent->GetTag(tag); - PRBool retval = (NS_SUCCEEDED(rv) && tag == nsHTMLAtoms::body); + retval = (NS_SUCCEEDED(rv) && tag == nsHTMLAtoms::body); if (retval) { NS_IF_RELEASE(tag);