Xerces fixes

diff --git a/apps/xml/CGITransform/CGIFerrisTransform.cpp b/apps/xml/CGITransform/CGIFerrisTransform.cpp
index fba034d234c758ce1b4c724bbc3da501e3800488..1b28138bcb95c9baff44edcea887531b579637cd 100644 (file)
--- a/apps/xml/CGITransform/CGIFerrisTransform.cpp
+++ b/apps/xml/CGITransform/CGIFerrisTransform.cpp
@@ -272,8 +272,8 @@ public:
                        const XSLTInputSource& XSLTURL,
                        const XSLTResultTarget& theOut )
         {
-            XercesDOMSupport theDOMSupport;
-            XercesParserLiaison theParserLiaison(theDOMSupport);
+            XercesParserLiaison theParserLiaison;
+            XercesDOMSupport theDOMSupport(theParserLiaison);
         
             DG() << "Creating the parsed source..." << endl;
             const XercesDOMWrapperParsedSource parsedSource(
@@ -303,8 +303,8 @@ public:
                                                      0 );
             DOMElement* root_element = doc->getDocumentElement();
             
-            XercesDOMSupport theDOMSupport;
-            XercesParserLiaison theParserLiaison(theDOMSupport);
+            XercesParserLiaison theParserLiaison;
+            XercesDOMSupport theDOMSupport(theParserLiaison);
 
             FormatterToXercesDOM theFormatter( doc, root_element );
             XSLTResultTarget theDOMResultTarget( theFormatter );

diff --git a/apps/xml/XSLTransform/XSLTransform.cpp b/apps/xml/XSLTransform/XSLTransform.cpp
index 6d61079a9a70d42fb4ff125e959fcd7ea0ba16be..924fbefae8a1b73fb05b81865fbc016aad9952e6 100644 (file)
--- a/apps/xml/XSLTransform/XSLTransform.cpp
+++ b/apps/xml/XSLTransform/XSLTransform.cpp
@@ -595,8 +595,8 @@ int main( int argc, const char** argv )
         
 //        theDOM->normalize();
 
-        XercesDOMSupport theDOMSupport;
-        XercesParserLiaison theParserLiaison(theDOMSupport);
+        XercesParserLiaison theParserLiaison;
+        XercesDOMSupport theDOMSupport(theParserLiaison);
         
         cerr << "Creating the parsed source..." << endl;
         const XercesDOMWrapperParsedSource parsedSource(

diff --git a/plugins/context/xsltfs/libferrisxsltfs.cpp b/plugins/context/xsltfs/libferrisxsltfs.cpp
index c822c8ca9c8f89098826cecf698f15ccc3349de4..e9d4aaa59e06178a310a4c4bd3092958bef0a37a 100644 (file)
--- a/plugins/context/xsltfs/libferrisxsltfs.cpp
+++ b/plugins/context/xsltfs/libferrisxsltfs.cpp
@@ -399,8 +399,8 @@ namespace Ferris
                 }
 
                 
-                XercesDOMSupport theDOMSupport;
-                XercesParserLiaison theParserLiaison(theDOMSupport);
+                XercesParserLiaison theParserLiaison;
+                XercesDOMSupport theDOMSupport(theParserLiaison);
 
                 const XercesDOMWrapperParsedSource parsedSource(
                     GetImpl(inputDOM), theParserLiaison, theDOMSupport );
@@ -803,8 +803,8 @@ namespace Ferris
                     
                 LG_XSLTFS_D << "xmlContext:" << xmlContext->getURL() << endl;
                     
-                XercesDOMSupport theDOMSupport;
-                XercesParserLiaison theParserLiaison(theDOMSupport);
+                XercesParserLiaison theParserLiaison;
+                XercesDOMSupport theDOMSupport(theParserLiaison);
 
                 const XercesDOMWrapperParsedSource parsedSource(
                     GetImpl(theDOM), theParserLiaison, theDOMSupport );
@@ -1360,8 +1360,8 @@ namespace Ferris
                     
 //                 LG_XSLTFS_D << "xmlContext:" << xmlContext->getURL() << endl;
                     
-//                 XercesDOMSupport theDOMSupport;
-//                 XercesParserLiaison theParserLiaison(theDOMSupport);
+//                 XercesParserLiaison theParserLiaison;
+//                 XercesDOMSupport theDOMSupport(theParserLiaison);
 
 //                 const XercesDOMWrapperParsedSource parsedSource(
 //                     GetImpl(theDOM), theParserLiaison, theDOMSupport );

diff --git a/xsltfunctions/FerrisXalanTransform.cpp b/xsltfunctions/FerrisXalanTransform.cpp
index 655ab3585ae95de31bed869f2bd0eac3123d57c3..487c1f3f6397923ad837e7930ad3d1d930382385 100644 (file)
--- a/xsltfunctions/FerrisXalanTransform.cpp
+++ b/xsltfunctions/FerrisXalanTransform.cpp
@@ -124,8 +124,8 @@ int main( int argc, char** argv )
             fh_domdoc theDOM = Factory::makeDOM( xmlContext );
             cerr << "have the DOM" << endl;
             
-            XercesDOMSupport theDOMSupport;
-            XercesParserLiaison theParserLiaison(theDOMSupport);
+            XercesParserLiaison theParserLiaison;
+            XercesDOMSupport theDOMSupport(theParserLiaison);
             cerr << "about to make ParsedSource..." << endl;
 
             const XercesDOMWrapperParsedSource parsedSource(