From 1968dc715c57aa8cf6791c1be5cc7adae8504084 Mon Sep 17 00:00:00 2001 From: "peterv%netscape.com" Date: Thu, 12 Apr 2001 10:13:59 +0000 Subject: [PATCH] Fix for bug 75534 (transformiix doesn't compile). Code by Pike, r=me, sr=jst. git-svn-id: svn://10.0.0.236/trunk@92087 18797224-902f-48f8-a5cc-f745e15eee43 --- .../transformiix/source/net/URIUtils.cpp | 18 ++++++++++++++---- .../transformiix/source/net/URIUtils.h | 12 ++---------- .../source/xml/dom/mozImpl/MozillaDocument.cpp | 3 --- .../source/xml/parser/XMLParser.cpp | 9 +++++++-- .../transformiix/source/xslt/XSLTProcessor.cpp | 6 ++++-- 5 files changed, 27 insertions(+), 21 deletions(-) diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.cpp b/mozilla/extensions/transformiix/source/net/URIUtils.cpp index 0fef7d90301..2f96193f348 100644 --- a/mozilla/extensions/transformiix/source/net/URIUtils.cpp +++ b/mozilla/extensions/transformiix/source/net/URIUtils.cpp @@ -29,16 +29,24 @@ * -- 20000326 * -- added Mozilla integration code * - * $Id: URIUtils.cpp,v 1.10 2001-04-08 14:34:16 peterv%netscape.com Exp $ + * $Id: URIUtils.cpp,v 1.11 2001-04-12 10:13:15 peterv%netscape.com Exp $ */ #include "URIUtils.h" +#ifdef MOZ_XSL +#include "nsIServiceManager.h" +#include "nsIIOService.h" +#include "nsIURL.h" +#include "nsXPIDLString.h" +#include "nsNetCID.h" +#endif + /** * URIUtils * A set of utilities for handling URIs * @author Keith Visco - * @version $Revision: 1.10 $ $Date: 2001-04-08 14:34:16 $ + * @version $Revision: 1.11 $ $Date: 2001-04-12 10:13:15 $ **/ #ifndef MOZ_XSL @@ -97,7 +105,8 @@ void URIUtils::getDocumentBase(const String& href, String& dest) { nsCOMPtr pURL; nsresult result = NS_OK; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &result); + nsCOMPtr pService(do_GetService(NS_IOSERVICE_CONTRACTID, + &result)); if (NS_SUCCEEDED(result)) { // XXX This is ugly, there must be an easier (cleaner way). char *uriStr = (((String)href).getConstNSString()).ToNewCString(); @@ -150,7 +159,8 @@ void URIUtils::resolveHref(const String& href, const String& base, String& dest) nsCOMPtr pURL; nsresult result = NS_OK; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &result); + nsCOMPtr pService(do_GetService(NS_IOSERVICE_CONTRACTID, + &result)); if (NS_SUCCEEDED(result)) { // XXX This is ugly, there must be an easier (cleaner way). char *baseStr = (base.getConstNSString()).ToNewCString(); diff --git a/mozilla/extensions/transformiix/source/net/URIUtils.h b/mozilla/extensions/transformiix/source/net/URIUtils.h index 75e891140f7..595e61903e2 100644 --- a/mozilla/extensions/transformiix/source/net/URIUtils.h +++ b/mozilla/extensions/transformiix/source/net/URIUtils.h @@ -31,7 +31,7 @@ * -- 20000326 * -- added Mozilla integration code * - * $Id: URIUtils.h,v 1.12 2001-04-08 14:33:35 peterv%netscape.com Exp $ + * $Id: URIUtils.h,v 1.13 2001-04-12 10:13:12 peterv%netscape.com Exp $ */ #ifndef TRANSFRMX_URIUTILS_H @@ -41,14 +41,6 @@ #include "baseutils.h" #ifndef MOZ_XSL #include -#else -#include "nsIServiceManager.h" -#include "nsIIOService.h" -#include "nsIURL.h" -#include "nsXPIDLString.h" -#include "nsCOMPtr.h" - -static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); #endif @@ -56,7 +48,7 @@ static NS_DEFINE_CID(kIOServiceCID, NS_IOSERVICE_CID); * A utility class for URI handling * Not yet finished, only handles file URI at this point * @author Keith Visco - * @version $Revision: 1.12 $ $Date: 2001-04-08 14:33:35 $ + * @version $Revision: 1.13 $ $Date: 2001-04-12 10:13:12 $ * **/ diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp index 48ecb97f7c6..fb55a7b7b7c 100644 --- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp +++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/MozillaDocument.cpp @@ -275,9 +275,6 @@ Attr* Document::createAttributeNS(const String& aNamespaceURI, NSI_FROM_TX_NULL_CHECK(Document) nsCOMPtr attr; - if (nsDocument == NULL) - return NULL; - if (NS_SUCCEEDED(nsDocument->CreateAttributeNS( aNamespaceURI.getConstNSString(), aName.getConstNSString(), getter_AddRefs(attr)) == NS_OK)) diff --git a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp index ae3205a6543..9eee6640f6f 100644 --- a/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp +++ b/mozilla/extensions/transformiix/source/xml/parser/XMLParser.cpp @@ -34,13 +34,17 @@ * -- Removed a number of castings of XML_Char to DOM_CHAR since they * were not working on Windows properly * - * $Id: XMLParser.cpp,v 1.14 2001-03-06 00:12:18 Peter.VanderBeken%pandora.be Exp $ + * $Id: XMLParser.cpp,v 1.15 2001-04-12 10:13:07 peterv%netscape.com Exp $ */ #include "XMLParser.h" #ifdef MOZ_XSL #include "nsSyncLoader.h" #include "URIUtils.h" +#include "nsIIOService.h" +#include "nsIURL.h" +#include "nsNetCID.h" +#include "nsIServiceManager.h" #endif /** * Implementation of an In-Memory DOM based XML parser. The actual XML @@ -86,7 +90,8 @@ Document* XMLParser::getDocumentFromURI #ifdef MOZ_XSL nsresult rv = NS_OK; nsCOMPtr documentURI; - NS_WITH_SERVICE(nsIIOService, pService, kIOServiceCID, &rv); + nsCOMPtr pService(do_GetService(NS_IOSERVICE_CONTRACTID, + &rv)); if (NS_FAILED(rv)) return NULL; char *hrefStr = (documentURL.getConstNSString()).ToNewCString(); diff --git a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp index c2cb74aae08..0d3aa6ef233 100644 --- a/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp +++ b/mozilla/extensions/transformiix/source/xslt/XSLTProcessor.cpp @@ -38,7 +38,7 @@ * Olivier Gerardin * -- Changed behavior of passing parameters to templates * - * $Id: XSLTProcessor.cpp,v 1.40 2001-04-11 15:01:05 axel%pike.org Exp $ + * $Id: XSLTProcessor.cpp,v 1.41 2001-04-12 10:13:59 peterv%netscape.com Exp $ */ #include "XSLTProcessor.h" @@ -53,6 +53,8 @@ #include "URIUtils.h" #ifdef MOZ_XSL #include "nsIObserverService.h" +#include "nsIURL.h" +#include "nsIServiceManager.h" //#include "nslog.h" #else #include "printers.h" @@ -66,7 +68,7 @@ /** * XSLTProcessor is a class for Processing XSL stylesheets * @author Keith Visco - * @version $Revision: 1.40 $ $Date: 2001-04-11 15:01:05 $ + * @version $Revision: 1.41 $ $Date: 2001-04-12 10:13:59 $ **/ /**