From 70e9821209811404071a46faeadfcf8a748fc626 Mon Sep 17 00:00:00 2001
From: "nisheeth%netscape.com" <nisheeth%netscape.com>
Date: Tue, 27 Jun 2000 01:12:44 +0000
Subject: [PATCH] Fix for bug 43019.  Does not affect current build.  Fixes a
 unix compile problem for XSL hooks in mozilla.

---
 content/xml/document/src/nsXMLContentSink.cpp | 9 +++------
 layout/xml/document/src/nsXMLContentSink.cpp  | 9 +++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/content/xml/document/src/nsXMLContentSink.cpp b/content/xml/document/src/nsXMLContentSink.cpp
index 1bf8a01b1cb8..ea83428612c2 100644
--- a/content/xml/document/src/nsXMLContentSink.cpp
+++ b/content/xml/document/src/nsXMLContentSink.cpp
@@ -100,9 +100,7 @@ static NS_DEFINE_IID(kIDOMCDATASectionIID, NS_IDOMCDATASECTION_IID);
 #ifdef MOZ_XSL
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
-static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
 static NS_DEFINE_IID(kIObserverIID, NS_IOBSERVER_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
 #endif
@@ -334,14 +332,13 @@ nsXMLContentSink::StartLayoutProcess()
 NS_IMETHODIMP
 nsXMLContentSink::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData)
 {
-  nsIContent* content;
+  nsCOMPtr<nsIContent> content;
   nsresult rv = NS_OK;
 
   // Set the output content model on the document
-  rv = aSubject->QueryInterface(kIContentIID, (void **) &content);
+  content = do_QueryInterface(aSubject, &rv);
   if (NS_SUCCEEDED(rv)) {
-    mDocument->SetRootContent(content);
-    NS_RELEASE(content);
+    mDocument->SetRootContent(content);    
   }
   else
     mDocument->SetRootContent(mDocElement);
diff --git a/layout/xml/document/src/nsXMLContentSink.cpp b/layout/xml/document/src/nsXMLContentSink.cpp
index 1bf8a01b1cb8..ea83428612c2 100644
--- a/layout/xml/document/src/nsXMLContentSink.cpp
+++ b/layout/xml/document/src/nsXMLContentSink.cpp
@@ -100,9 +100,7 @@ static NS_DEFINE_IID(kIDOMCDATASectionIID, NS_IDOMCDATASECTION_IID);
 #ifdef MOZ_XSL
 static NS_DEFINE_IID(kIDOMDocumentIID, NS_IDOMDOCUMENT_IID);
 static NS_DEFINE_IID(kIDOMElementIID, NS_IDOMELEMENT_IID);
-static NS_DEFINE_IID(kIContentIID, NS_ICONTENT_IID);
 static NS_DEFINE_IID(kIObserverIID, NS_IOBSERVER_IID);
-static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
 static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID);
 static NS_DEFINE_IID(kIStreamListenerIID, NS_ISTREAMLISTENER_IID);
 #endif
@@ -334,14 +332,13 @@ nsXMLContentSink::StartLayoutProcess()
 NS_IMETHODIMP
 nsXMLContentSink::Observe(nsISupports *aSubject, const PRUnichar *aTopic, const PRUnichar *someData)
 {
-  nsIContent* content;
+  nsCOMPtr<nsIContent> content;
   nsresult rv = NS_OK;
 
   // Set the output content model on the document
-  rv = aSubject->QueryInterface(kIContentIID, (void **) &content);
+  content = do_QueryInterface(aSubject, &rv);
   if (NS_SUCCEEDED(rv)) {
-    mDocument->SetRootContent(content);
-    NS_RELEASE(content);
+    mDocument->SetRootContent(content);    
   }
   else
     mDocument->SetRootContent(mDocElement);