From 872ea881fa54d708795d69562c2c353f63ad0f99 Mon Sep 17 00:00:00 2001 From: APTX Date: Fri, 6 Apr 2012 11:54:15 -0400 Subject: [PATCH] Xerces fixes --- apps/xml/CGITransform/CGIFerrisTransform.cpp | 8 ++++---- apps/xml/XSLTransform/XSLTransform.cpp | 4 ++-- plugins/context/xsltfs/libferrisxsltfs.cpp | 12 ++++++------ xsltfunctions/FerrisXalanTransform.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/apps/xml/CGITransform/CGIFerrisTransform.cpp b/apps/xml/CGITransform/CGIFerrisTransform.cpp index fba034d..1b28138 100644 --- 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 6d61079..924fbef 100644 --- 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 c822c8c..e9d4aaa 100644 --- 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 655ab35..487c1f3 100644 --- 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( -- 2.52.0