From 0019c2e121552d112ee07319982f3df9cd03d9c7 Mon Sep 17 00:00:00 2001
From: "peterv%propagandism.org"
 <peterv%propagandism.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 18 May 2004 13:15:56 +0000
Subject: [PATCH] Bug 243520 (Remove txNamespaceManager ifdef's). r=Pike,
 sr=jst.

git-svn-id: svn://10.0.0.236/trunk@156527 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../build/XSLTProcessorModule.cpp             |  6 ++--
 .../source/base/txNamespaceMap.cpp            |  6 +---
 .../transformiix/source/main/txTestExpr.cpp   |  2 ++
 .../source/xml/dom/standalone/Attr.cpp        |  2 +-
 .../source/xml/dom/standalone/Document.cpp    | 10 ------
 .../source/xml/dom/standalone/Element.cpp     |  7 ++--
 .../xml/dom/standalone/NodeDefinition.cpp     |  9 ++---
 .../source/xml/dom/standalone/dom.h           |  7 ++--
 .../source/xpath/NodeSetFunctionCall.cpp      |  3 --
 .../source/xpath/txMozillaXPathTreeWalker.cpp |  2 --
 .../transformiix/source/xpath/txNodeSet.h     |  3 --
 .../transformiix/source/xpath/txXPathNode.h   | 35 +++++++++++++++++++
 .../source/xpath/txXPathTreeWalker.h          |  1 -
 .../source/xslt/txExecutionState.cpp          |  4 ---
 .../source/xslt/txInstructions.cpp            | 18 +++-------
 .../source/xslt/txMozillaXMLOutput.h          |  1 +
 .../source/xslt/txMozillaXSLTProcessor.cpp    |  2 +-
 .../transformiix/source/xslt/txRtfHandler.cpp |  3 +-
 .../source/xslt/txXMLEventHandler.h           |  3 --
 .../source/xslt/txXSLTPatterns.cpp            |  1 -
 .../source/xslt/txXSLTProcessor.cpp           |  4 +--
 21 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp
index c93be3b754d..1d7edf3dfb4 100755
--- a/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp
+++ b/mozilla/extensions/transformiix/build/XSLTProcessorModule.cpp
@@ -38,6 +38,9 @@
 
 #include "nsICategoryManager.h"
 #include "nsIDOMClassInfo.h"
+#include "nsIDOMXPathExpression.h"
+#include "nsIDOMXPathNSResolver.h"
+#include "nsIDOMXPathResult.h"
 #include "nsIErrorService.h"
 #include "nsIExceptionService.h"
 #include "nsIGenericFactory.h"
@@ -46,9 +49,6 @@
 #include "nsIServiceManager.h"
 #include "nsXPathEvaluator.h"
 #include "nsXPathException.h"
-#include "nsXPathExpression.h"
-#include "nsXPathNSResolver.h"
-#include "nsXPathResult.h"
 #include "nsXPIDLString.h"
 #include "txAtoms.h"
 #include "txMozillaXSLTProcessor.h"
diff --git a/mozilla/extensions/transformiix/source/base/txNamespaceMap.cpp b/mozilla/extensions/transformiix/source/base/txNamespaceMap.cpp
index cba7bef98f8..b40871900f3 100644
--- a/mozilla/extensions/transformiix/source/base/txNamespaceMap.cpp
+++ b/mozilla/extensions/transformiix/source/base/txNamespaceMap.cpp
@@ -60,12 +60,8 @@ txNamespaceMap::addNamespace(nsIAtom* aPrefix, const nsAString& aNamespaceURI)
         nsId = kNameSpaceID_None;
     }
     else {
-#ifdef TX_EXE
         nsId = txNamespaceManager::getNamespaceID(aNamespaceURI);
-#else
-        NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
-        gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, nsId);
-#endif
+        NS_ENSURE_FALSE(nsId == kNameSpaceID_Unknown, NS_ERROR_FAILURE);
     }
 
     // Check if the mapping already exists
diff --git a/mozilla/extensions/transformiix/source/main/txTestExpr.cpp b/mozilla/extensions/transformiix/source/main/txTestExpr.cpp
index f0d1f49887a..946c442a964 100644
--- a/mozilla/extensions/transformiix/source/main/txTestExpr.cpp
+++ b/mozilla/extensions/transformiix/source/main/txTestExpr.cpp
@@ -96,12 +96,14 @@ static void doTest(const nsASingleFragmentString& aExpr)
         cout << NS_LossyConvertUTF16toASCII(StringTail(aExpr, aExpr.Length()-ct.mOff)).get();
         cout << endl << endl;
     }
+#ifdef TX_TO_STRING
     else {
         nsAutoString expr;
         expression->toString(expr);
         cout << "parsed expression: ";
         cout << NS_LossyConvertUTF16toASCII(expr).get() << endl << endl;
     }
+#endif
 }
 
 int main(int argc, char** argv)
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/Attr.cpp b/mozilla/extensions/transformiix/source/xml/dom/standalone/Attr.cpp
index 32679ac1324..1f1c818c508 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/Attr.cpp
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/Attr.cpp
@@ -83,7 +83,7 @@ Attr::Attr(const nsAString& aNamespaceURI,
  if (aNamespaceURI.IsEmpty())
     mNamespaceID = kNameSpaceID_None;
   else
-    mNamespaceID = txNamespaceManager::getNamespaceID(aNamespaceURI);
+    mNamespaceID = txStandaloneNamespaceManager::getNamespaceID(aNamespaceURI);
 
   mLocalName = do_GetAtom(XMLUtils::getLocalPart(nodeName));
 }
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/Document.cpp b/mozilla/extensions/transformiix/source/xml/dom/standalone/Document.cpp
index b613c68adf9..e75f8302853 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/Document.cpp
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/Document.cpp
@@ -203,13 +203,3 @@ nsresult Document::getBaseURI(nsAString& aURI)
   aURI = documentBaseURI;
   return NS_OK;
 }
-
-PRInt32 Document::namespaceURIToID(const nsAString& aNamespaceURI)
-{
-  return txNamespaceManager::getNamespaceID(aNamespaceURI);
-}
-
-void Document::namespaceIDToURI(PRInt32 aNamespaceID, nsAString& aNamespaceURI)
-{
-  txNamespaceManager::getNamespaceURI(aNamespaceID, aNamespaceURI);
-}
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/Element.cpp b/mozilla/extensions/transformiix/source/xml/dom/standalone/Element.cpp
index c5922fe6260..e80a43f7725 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/Element.cpp
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/Element.cpp
@@ -75,7 +75,7 @@ Element::Element(const nsAString& aNamespaceURI,
   if (aNamespaceURI.IsEmpty())
     mNamespaceID = kNameSpaceID_None;
   else
-    mNamespaceID = txNamespaceManager::getNamespaceID(aNamespaceURI);
+    mNamespaceID = txStandaloneNamespaceManager::getNamespaceID(aNamespaceURI);
 }
 
 //
@@ -139,7 +139,7 @@ PRInt32 Element::getNamespaceID()
                                     nsURI)) {
         // xmlns = "" sets the default namespace ID to kNameSpaceID_None;
         if (!nsURI.IsEmpty()) {
-          mNamespaceID = txNamespaceManager::getNamespaceID(nsURI);
+          mNamespaceID = txStandaloneNamespaceManager::getNamespaceID(nsURI);
         }
         else {
           mNamespaceID = kNameSpaceID_None;
@@ -189,7 +189,8 @@ void Element::setAttributeNS(const nsAString& aNamespaceURI,
 {
   // Check to see if an attribute with this name already exists. If it does
   // overwrite its value, if not, add it.
-  PRInt32 namespaceID = txNamespaceManager::getNamespaceID(aNamespaceURI);
+  PRInt32 namespaceID =
+      txStandaloneNamespaceManager::getNamespaceID(aNamespaceURI);
   nsCOMPtr<nsIAtom> localName = do_GetAtom(XMLUtils::getLocalPart(aName));
 
   Attr* foundNode = 0;
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/NodeDefinition.cpp b/mozilla/extensions/transformiix/source/xml/dom/standalone/NodeDefinition.cpp
index 5969bf22c74..1e1999fc2e1 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/NodeDefinition.cpp
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/NodeDefinition.cpp
@@ -292,7 +292,8 @@ MBool NodeDefinition::getLocalName(nsIAtom** aLocalName)
 
 nsresult NodeDefinition::getNamespaceURI(nsAString& aNSURI)
 {
-  return txNamespaceManager::getNamespaceURI(getNamespaceID(), aNSURI);
+  return txStandaloneNamespaceManager::getNamespaceURI(getNamespaceID(),
+                                                       aNSURI);
 }
 
 PRInt32 NodeDefinition::getNamespaceID()
@@ -309,11 +310,11 @@ PRInt32 NodeDefinition::getNamespaceID()
 PRInt32 NodeDefinition::lookupNamespaceID(nsIAtom* aPrefix)
 {
   // this is http://www.w3.org/2000/xmlns/,
-  // ID = kNameSpaceID_XMLNS, see txNamespaceManager::Init
+  // ID = kNameSpaceID_XMLNS, see txStandaloneNamespaceManager::Init
   if (aPrefix == txXMLAtoms::xmlns)
     return kNameSpaceID_XMLNS; 
   // this is http://www.w3.org/XML/1998/namespace,
-  // ID = kNameSpaceID_XML, see txNamespaceManager::Init
+  // ID = kNameSpaceID_XML, see txStandaloneNamespaceManager::Init
   if (aPrefix == txXMLAtoms::xml)
     return kNameSpaceID_XML; 
 
@@ -343,7 +344,7 @@ PRInt32 NodeDefinition::lookupNamespaceID(nsIAtom* aPrefix)
        */
       nsAutoString nsURI;
       xmlns->getNodeValue(nsURI);
-      return txNamespaceManager::getNamespaceID(nsURI);
+      return txStandaloneNamespaceManager::getNamespaceID(nsURI);
     }
     node = node->getXPathParent();
   }
diff --git a/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h b/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
index a040c2ec775..9cf22169874 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/standalone/dom.h
@@ -433,9 +433,6 @@ class Document : public NodeDefinition
     //Override to return documentBaseURI
     nsresult getBaseURI(nsAString& aURI);
 
-    PRInt32 namespaceURIToID(const nsAString& aNamespaceURI);
-    void namespaceIDToURI(PRInt32 aNamespaceID, nsAString& aNamespaceURI);
-
   private:
     PRBool setElementID(const nsAString& aID, Element* aElement);
 
@@ -551,7 +548,7 @@ class ProcessingInstruction : public NodeDefinition
     nsCOMPtr<nsIAtom> mLocalName;
 };
 
-class txNamespaceManager
+class txStandaloneNamespaceManager
 {
 public:
     static PRInt32 getNamespaceID(const nsAString& aURI)
@@ -625,6 +622,6 @@ private:
 };
 
 #define TX_IMPL_DOM_STATICS \
-    nsStringArray* txNamespaceManager::mNamespaces = 0
+    nsStringArray* txStandaloneNamespaceManager::mNamespaces = 0
 
 #endif
diff --git a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
index d7201a9643a..7fb9d260334 100644
--- a/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/NodeSetFunctionCall.cpp
@@ -47,9 +47,6 @@
 #include "txAtoms.h"
 #include "txIXPathContext.h"
 #include "txTokenizer.h"
-#ifndef TX_EXE
-#include "nsIDOMNode.h"
-#endif
 
 /*
  * Creates a NodeSetFunctionCall of the given type
diff --git a/mozilla/extensions/transformiix/source/xpath/txMozillaXPathTreeWalker.cpp b/mozilla/extensions/transformiix/source/xpath/txMozillaXPathTreeWalker.cpp
index 1588dc204bc..43d2647a1c8 100644
--- a/mozilla/extensions/transformiix/source/xpath/txMozillaXPathTreeWalker.cpp
+++ b/mozilla/extensions/transformiix/source/xpath/txMozillaXPathTreeWalker.cpp
@@ -532,7 +532,6 @@ txXPathNodeUtils::getNamespaceID(const txXPathNode& aNode)
 void
 txXPathNodeUtils::getNamespaceURI(const txXPathNode& aNode, nsAString& aURI)
 {
-    extern nsINameSpaceManager* gTxNameSpaceManager;
     gTxNameSpaceManager->GetNameSpaceURI(getNamespaceID(aNode), aURI);
 }
 
@@ -984,7 +983,6 @@ txXPathNativeNode::getNode(const txXPathNode& aNode, nsIDOMNode** aResult)
                                   getter_AddRefs(prefix));
 
     nsAutoString namespaceURI, localname;
-    extern nsINameSpaceManager* gTxNameSpaceManager;
     gTxNameSpaceManager->GetNameSpaceURI(namespaceID, namespaceURI);
     name->ToString(localname);
 
diff --git a/mozilla/extensions/transformiix/source/xpath/txNodeSet.h b/mozilla/extensions/transformiix/source/xpath/txNodeSet.h
index 3ac797cf42c..43d6ac4182c 100644
--- a/mozilla/extensions/transformiix/source/xpath/txNodeSet.h
+++ b/mozilla/extensions/transformiix/source/xpath/txNodeSet.h
@@ -51,9 +51,6 @@
 class txNodeSet : public txAExprResult
 {
 public:
-    // XXX TEMP
-    txNodeSet();
-
     /**
      * Creates a new empty NodeSet
      */
diff --git a/mozilla/extensions/transformiix/source/xpath/txXPathNode.h b/mozilla/extensions/transformiix/source/xpath/txXPathNode.h
index fedce2499fc..cbc7e214102 100644
--- a/mozilla/extensions/transformiix/source/xpath/txXPathNode.h
+++ b/mozilla/extensions/transformiix/source/xpath/txXPathNode.h
@@ -117,4 +117,39 @@ private:
 #endif
 };
 
+class txNamespaceManager
+{
+public:
+    static PRInt32 getNamespaceID(const nsAString& aNamespaceURI);
+    static nsresult getNamespaceURI(const PRInt32 aID, nsAString& aResult);
+};
+
+/* static */
+inline PRInt32
+txNamespaceManager::getNamespaceID(const nsAString& aNamespaceURI)
+{
+#ifdef TX_EXE
+    return txStandaloneNamespaceManager::getNamespaceID(aNamespaceURI);
+#else
+    NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
+
+    PRInt32 namespaceID = kNameSpaceID_Unknown;
+    gTxNameSpaceManager->RegisterNameSpace(aNamespaceURI, namespaceID);
+    return namespaceID;
+#endif
+}
+
+/* static */
+inline nsresult
+txNamespaceManager::getNamespaceURI(const PRInt32 aID, nsAString& aResult)
+{
+#ifdef TX_EXE
+    return txStandaloneNamespaceManager::getNamespaceURI(aID, aResult);
+#else
+    NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
+
+    return gTxNameSpaceManager->GetNameSpaceURI(aID, aResult);
+#endif
+}
+
 #endif /* txXPathNode_h__ */
diff --git a/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h b/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
index b052a738b95..bcff158e558 100644
--- a/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
+++ b/mozilla/extensions/transformiix/source/xpath/txXPathTreeWalker.h
@@ -40,7 +40,6 @@
 #define txXPathTreeWalker_h__
 
 #include "baseutils.h"
-#include "TxObject.h"
 #include "txXPathNode.h"
 
 class nsAString;
diff --git a/mozilla/extensions/transformiix/source/xslt/txExecutionState.cpp b/mozilla/extensions/transformiix/source/xslt/txExecutionState.cpp
index 878a18c78f8..552204d350d 100644
--- a/mozilla/extensions/transformiix/source/xslt/txExecutionState.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txExecutionState.cpp
@@ -47,10 +47,6 @@
 #include "txURIUtils.h"
 #include "txXMLParser.h"
 
-#ifndef TX_EXE
-#include "nsIDOMDocument.h"
-#endif
-
 const PRInt32 txExecutionState::kMaxRecursionDepth = 20000;
 
 nsresult txLoadedDocumentsHash::init(txXPathNode* aSourceDocument)
diff --git a/mozilla/extensions/transformiix/source/xslt/txInstructions.cpp b/mozilla/extensions/transformiix/source/xslt/txInstructions.cpp
index 0efb2dc068c..649ad92f578 100644
--- a/mozilla/extensions/transformiix/source/xslt/txInstructions.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txInstructions.cpp
@@ -165,13 +165,9 @@ txAttribute::execute(txExecutionState& aEs)
             exprRes->stringValue(nspace);
 
             if (!nspace.IsEmpty()) {
-#ifdef TX_EXE
                 nsId = txNamespaceManager::getNamespaceID(nspace);
-#else
-                NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
-                rv = gTxNameSpaceManager->RegisterNameSpace(nspace, nsId);
-                NS_ENSURE_SUCCESS(rv, rv);
-#endif
+                NS_ENSURE_FALSE(nsId == kNameSpaceID_Unknown,
+                                NS_ERROR_FAILURE);
             }
         }
         else if (prefix) {
@@ -937,13 +933,9 @@ txStartElement::execute(txExecutionState& aEs)
             exprRes->stringValue(nspace);
 
             if (!nspace.IsEmpty()) {
-#ifdef TX_EXE
                 nsId = txNamespaceManager::getNamespaceID(nspace);
-#else
-                NS_ASSERTION(gTxNameSpaceManager, "No namespace manager");
-                rv = gTxNameSpaceManager->RegisterNameSpace(nspace, nsId);
-                NS_ENSURE_SUCCESS(rv, rv);
-#endif
+                NS_ENSURE_FALSE(nsId == kNameSpaceID_Unknown,
+                                NS_ERROR_FAILURE);
             }
         }
         else {
@@ -953,7 +945,7 @@ txStartElement::execute(txExecutionState& aEs)
             }
             nsId = mMappings->lookupNamespace(prefix);
             if (nsId == kNameSpaceID_Unknown) {
-                // tunkate name to indicate failure
+                // truncate name to indicate failure
                 name.Truncate();
             }
         }
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
index 1c09e69dcaf..eb00e8fc982 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaXMLOutput.h
@@ -54,6 +54,7 @@ class nsIDOMDocumentFragment;
 class nsIDOMElement;
 class nsIStyleSheet;
 class nsIDOMNode;
+class nsITransformObserver;
 
 class txTransformNotifier : public nsIScriptLoaderObserver,
                             public nsICSSLoaderObserver
diff --git a/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
index f85e231af00..92afc19a3cd 100644
--- a/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txMozillaXSLTProcessor.cpp
@@ -125,7 +125,7 @@ txToDocHandlerFactory::createHandlerWith(txOutputFormat* aFormat,
 
         case eHTMLOutput:
         {
-            *aHandler = new txMozillaXMLOutput(nsString(),
+            *aHandler = new txMozillaXMLOutput(EmptyString(),
                                                kNameSpaceID_None,
                                                aFormat, mSourceDocument,
                                                mResultDocument, mObserver);
diff --git a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp
index 1fcda063c77..c68b827c56f 100644
--- a/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txRtfHandler.cpp
@@ -40,7 +40,8 @@
 #include "txRtfHandler.h"
 
 txResultTreeFragment::txResultTreeFragment(nsAutoPtr<txResultBuffer>& aBuffer)
-    : txAExprResult(nsnull), mBuffer(aBuffer)
+    : txAExprResult(nsnull),
+      mBuffer(aBuffer)
 {
 }
 
diff --git a/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h b/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
index 006d383fc55..05fc0b46590 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
+++ b/mozilla/extensions/transformiix/source/xslt/txXMLEventHandler.h
@@ -51,10 +51,7 @@ class txOutputFormat;
 #define kTXNameSpaceURI "http://www.mozilla.org/TransforMiix"
 #define kTXWrapper "transformiix:result"
 
-class nsIContent;
 class nsIDOMDocument;
-class nsIDOMHTMLScriptElement;
-class nsITransformObserver;
 #endif
 
 /**
diff --git a/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp b/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp
index 60e24a39369..f5f64c65b22 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txXSLTPatterns.cpp
@@ -45,7 +45,6 @@
 #include "XSLTFunctions.h"
 #ifndef TX_EXE
 #include "nsIContent.h"
-#include "nsINodeInfo.h"
 #endif
 
 /*
diff --git a/mozilla/extensions/transformiix/source/xslt/txXSLTProcessor.cpp b/mozilla/extensions/transformiix/source/xslt/txXSLTProcessor.cpp
index 79d83c68b05..3885a55d5d9 100644
--- a/mozilla/extensions/transformiix/source/xslt/txXSLTProcessor.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/txXSLTProcessor.cpp
@@ -56,7 +56,7 @@ txXSLTProcessor::init()
     TX_LG_CREATE;
 
 #ifdef TX_EXE
-    if (!txNamespaceManager::init())
+    if (!txStandaloneNamespaceManager::init())
         return MB_FALSE;
 
     if (NS_FAILED(txHTMLOutput::init())) {
@@ -80,7 +80,7 @@ void
 txXSLTProcessor::shutdown()
 {
 #ifdef TX_EXE
-    txNamespaceManager::shutdown();
+    txStandaloneNamespaceManager::shutdown();
     txHTMLOutput::shutdown();
 #endif