diff --git a/mozilla/extensions/transformiix/build/Makefile.in b/mozilla/extensions/transformiix/build/Makefile.in
index ac7ec282dd4..d8a2d518bc1 100644
--- a/mozilla/extensions/transformiix/build/Makefile.in
+++ b/mozilla/extensions/transformiix/build/Makefile.in
@@ -50,6 +50,7 @@ OBJS =../source/base/ArrayList.o \
   ../source/base/Tokenizer.o \
   ../source/base/MozillaString.o \
   ../source/net/URIUtils.o \
+  ../source/xml/dom/mozImpl/MozillaObjectWrapper.o \
   ../source/xml/dom/mozImpl/MozillaAttr.o \
   ../source/xml/dom/mozImpl/MozillaCDATASection.o \
   ../source/xml/dom/mozImpl/MozillaCharacterData.o \
diff --git a/mozilla/extensions/transformiix/source/xml/NamespaceResolver.h b/mozilla/extensions/transformiix/source/xml/NamespaceResolver.h
index 82a6ea33749..f8d784ba640 100644
--- a/mozilla/extensions/transformiix/source/xml/NamespaceResolver.h
+++ b/mozilla/extensions/transformiix/source/xml/NamespaceResolver.h
@@ -16,7 +16,7 @@
  * Peter Van der Beken, Peter.VanderBeken@pandora.be
  *   -- original author.
  *
- * $Id: NamespaceResolver.h,v 1.1 2000-08-27 05:58:56 kvisco%ziplink.net Exp $
+ * $Id: NamespaceResolver.h,v 1.2 2000-09-04 16:25:24 axel%pike.org Exp $
  */
 
 
@@ -35,7 +35,7 @@ public:
     /**
      * Returns the namespace URI for the given name
     **/ 
-    virtual void getNameSpaceURI(String& name, String& nameSpaceURI) = 0;
+    virtual void getNameSpaceURI(const String& name, String& nameSpaceURI) = 0;
 
 }; //-- NamespaceResolver
 
diff --git a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
index cb92de073aa..5d46153c0ea 100644
--- a/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
+++ b/mozilla/extensions/transformiix/source/xml/XMLDOMUtils.cpp
@@ -21,13 +21,13 @@
  * Keith Visco 
  *    -- original author.
  *
- * $Id: XMLDOMUtils.cpp,v 1.5 2000-08-26 04:41:12 Peter.VanderBeken%pandora.be Exp $
+ * $Id: XMLDOMUtils.cpp,v 1.6 2000-09-04 16:25:25 axel%pike.org Exp $
  */
 
 /**
  * XMLDOMUtils
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2000-08-26 04:41:12 $
+ * @version $Revision: 1.6 $ $Date: 2000-09-04 16:25:25 $
 **/
 
 #include "XMLDOMUtils.h"
@@ -98,7 +98,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
                 for ( i = 0; i < attList->getLength(); i++ ) {
                     Attr* attr = (Attr*) attList->item(i);
 #ifdef MOZ_XSL
-                    resolver->getNameSpaceURI(attr->getName(), nameSpaceURI);
+		    resolver->getNameSpaceURI(attr->getName(), nameSpaceURI);
                     newElement->setAttributeNS(nameSpaceURI, attr->getName(), attr->getValue());
 #else
                     newElement->setAttribute(attr->getName(), attr->getValue());
diff --git a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
index c3e2766dd43..6ea7f029d9b 100644
--- a/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
+++ b/mozilla/extensions/transformiix/source/xml/dom/mozImpl/mozilladom.h
@@ -101,8 +101,8 @@ class MozillaObjectWrapper : public MITREObject
         MozillaObjectWrapper(nsISupports* aNsObject, Document* aaOwner);
         ~MozillaObjectWrapper();
 
-        virtual void setNSObj(nsISupports* aNsObject);
-        virtual void setNSObj(nsISupports* aNsObject, Document* aaOwner);
+        void setNSObj(nsISupports* aNsObject);
+        void setNSObj(nsISupports* aNsObject, Document* aaOwner);
 
         void* getKey() const;
    
diff --git a/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp b/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp
index 0a711af85e6..bc315491d79 100644
--- a/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp
+++ b/mozilla/extensions/transformiix/source/xslt/ProcessorState.cpp
@@ -25,13 +25,13 @@
  *   -- added code in ::resolveFunctionCall to support the
  *      document() function.
  *
- * $Id: ProcessorState.cpp,v 1.6 2000-08-26 04:28:27 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ProcessorState.cpp,v 1.7 2000-09-04 16:25:27 axel%pike.org Exp $
  */
 
 /**
  * Implementation of ProcessorState
  * Much of this code was ported from XSL:P
- * @version $Revision: 1.6 $ $Date: 2000-08-26 04:28:27 $
+ * @version $Revision: 1.7 $ $Date: 2000-09-04 16:25:27 $
 **/
 
 #include "ProcessorState.h"
@@ -180,7 +180,7 @@ MBool ProcessorState::addToResultTree(Node* node) {
             Attr* attr = (Attr*)node;
 #ifdef MOZ_XSL
             String nameSpaceURI;
-            getNameSpaceURI(attr->getName(), nameSpaceURI);
+	    getNameSpaceURI(attr->getName() , nameSpaceURI);
             element->setAttributeNS(nameSpaceURI, attr->getName(), attr->getValue());
 #else
             element->setAttribute(attr->getName(),attr->getValue());
@@ -405,7 +405,7 @@ Element* ProcessorState::getNamedTemplate(String& name) {
 /**
  * Returns the namespace URI for the given name
 **/
-void ProcessorState::getNameSpaceURI(String& name, String& nameSpaceURI) {
+void ProcessorState::getNameSpaceURI(const String& name, String& nameSpaceURI) {
     String prefix;
 
     XMLUtils::getNameSpace(name, prefix);
diff --git a/mozilla/extensions/transformiix/source/xslt/ProcessorState.h b/mozilla/extensions/transformiix/source/xslt/ProcessorState.h
index ab687da8b5a..68439909976 100644
--- a/mozilla/extensions/transformiix/source/xslt/ProcessorState.h
+++ b/mozilla/extensions/transformiix/source/xslt/ProcessorState.h
@@ -21,7 +21,7 @@
  * Keith Visco, kvisco@ziplink.net
  *    -- original author.
  *
- * $Id: ProcessorState.h,v 1.5 2000-08-26 04:28:28 Peter.VanderBeken%pandora.be Exp $
+ * $Id: ProcessorState.h,v 1.6 2000-09-04 16:25:27 axel%pike.org Exp $
  */
 
 
@@ -50,7 +50,7 @@
 /**
  * Class used for keeping the current state of the XSL Processor
  * @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
- * @version $Revision: 1.5 $ $Date: 2000-08-26 04:28:28 $
+ * @version $Revision: 1.6 $ $Date: 2000-09-04 16:25:27 $
 **/
 class ProcessorState : public ContextState,
                        public NamespaceResolver
@@ -291,7 +291,7 @@ public:
     /**
      * Returns the namespace URI for the given name
     **/ 
-    void getNameSpaceURI(String& name, String& nameSpaceURI);
+    void getNameSpaceURI(const String& name, String& nameSpaceURI);
 
 private: