dbertoni 01/08/16 07:44:58
Modified: c/src/XalanTransformer XalanTransformer.hpp
XalanTransformer.cpp
Log:
Removed unnecessary include files. Made StylesheetExecutionContextDefault a
pointer for better binary compatibility.
Revision Changes Path
1.29 +3 -7 xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp
Index: XalanTransformer.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.hpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XalanTransformer.hpp 2001/08/13 17:09:08 1.28
+++ XalanTransformer.hpp 2001/08/16 14:44:58 1.29
@@ -72,17 +72,13 @@
-#include <XSLT/StylesheetExecutionContextDefault.hpp>
#include <XSLT/XSLTInputSource.hpp>
#include <XSLT/XSLTResultTarget.hpp>
-#include <XalanTransformer/XalanTransformerOutputStream.hpp>
-
-
-
class Function;
+class StylesheetExecutionContextDefault;
class XSLTInit;
class XalanDocumentBuilder;
class XalanCompiledStylesheet;
@@ -533,8 +529,6 @@
friend class EnsureReset;
- StylesheetExecutionContextDefault
m_stylesheetExecutionContext;
-
CompiledStylesheetPtrVectorType m_compiledStylesheets;
ParsedSourcePtrVectorType m_parsedSources;
@@ -544,6 +538,8 @@
FunctionParamPairVectorType m_functionPairs;
CharVectorType
m_errorMessage;
+
+ StylesheetExecutionContextDefault*
m_stylesheetExecutionContext;
static XSLTInit*
s_xsltInit;
};
1.27 +26 -25 xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp
Index: XalanTransformer.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XalanTransformer/XalanTransformer.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- XalanTransformer.cpp 2001/08/13 17:09:08 1.26
+++ XalanTransformer.cpp 2001/08/16 14:44:58 1.27
@@ -70,12 +70,9 @@
-#include <PlatformSupport/XalanOutputStreamPrintWriter.hpp>
-#include <PlatformSupport/DOMStringPrintWriter.hpp>
-
-
-
#include <PlatformSupport/DOMStringHelper.hpp>
+#include <PlatformSupport/DOMStringPrintWriter.hpp>
+#include <PlatformSupport/XalanOutputStreamPrintWriter.hpp>
@@ -86,6 +83,7 @@
#include <XSLT/StylesheetConstructionContextDefault.hpp>
+#include <XSLT/StylesheetExecutionContextDefault.hpp>
#include <XSLT/StylesheetRoot.hpp>
#include <XSLT/XSLTEngineImpl.hpp>
#include <XSLT/XSLTInit.hpp>
@@ -101,6 +99,7 @@
#include "XalanCompiledStylesheetDefault.hpp"
#include "XalanDefaultDocumentBuilder.hpp"
#include "XalanDefaultParsedSource.hpp"
+#include "XalanTransformerOutputStream.hpp"
#include "XercesDOMParsedSource.hpp"
@@ -110,12 +109,12 @@
XalanTransformer::XalanTransformer():
- m_stylesheetExecutionContext(),
m_compiledStylesheets(),
m_parsedSources(),
m_paramPairs(),
m_functionPairs(),
- m_errorMessage(1, '\0')
+ m_errorMessage(1, '\0'),
+ m_stylesheetExecutionContext(new StylesheetExecutionContextDefault)
{
}
@@ -143,6 +142,8 @@
}
m_functionPairs.clear();
+
+ delete m_stylesheetExecutionContext;
}
@@ -219,7 +220,7 @@
theProcessor.setProblemListener(&theProblemListener);
-
theParserLiaison.setExecutionContext(m_stylesheetExecutionContext);
+
theParserLiaison.setExecutionContext(*m_stylesheetExecutionContext);
// Create a stylesheet construction context,
// using the stylesheet's factory support objects.
@@ -234,13 +235,13 @@
const EnsureReset theReset(*this);
// Set up the stylesheet execution context.
-
m_stylesheetExecutionContext.setXPathEnvSupport(&theXSLTProcessorEnvSupport);
+
m_stylesheetExecutionContext->setXPathEnvSupport(&theXSLTProcessorEnvSupport);
- m_stylesheetExecutionContext.setDOMSupport(&theDOMSupport);
+ m_stylesheetExecutionContext->setDOMSupport(&theDOMSupport);
-
m_stylesheetExecutionContext.setXObjectFactory(&theXObjectFactory);
+
m_stylesheetExecutionContext->setXObjectFactory(&theXObjectFactory);
- m_stylesheetExecutionContext.setXSLTProcessor(&theProcessor);
+ m_stylesheetExecutionContext->setXSLTProcessor(&theProcessor);
// Set the parameters if any.
for (ParamPairVectorType::size_type i = 0; i <
m_paramPairs.size(); ++i)
@@ -265,7 +266,7 @@
theStylesheetSource,
tempResultTarget,
theStylesheetConstructionContext,
- m_stylesheetExecutionContext);
+ *m_stylesheetExecutionContext);
}
catch (XSLException& e)
{
@@ -390,16 +391,16 @@
const EnsureReset theReset(*this);
// Set up the stylesheet execution context.
-
m_stylesheetExecutionContext.setXPathEnvSupport(&theXSLTProcessorEnvSupport);
+
m_stylesheetExecutionContext->setXPathEnvSupport(&theXSLTProcessorEnvSupport);
- m_stylesheetExecutionContext.setDOMSupport(&theDOMSupport);
+ m_stylesheetExecutionContext->setDOMSupport(&theDOMSupport);
-
m_stylesheetExecutionContext.setXObjectFactory(&theXObjectFactory);
+
m_stylesheetExecutionContext->setXObjectFactory(&theXObjectFactory);
- m_stylesheetExecutionContext.setXSLTProcessor(&theProcessor);
+ m_stylesheetExecutionContext->setXSLTProcessor(&theProcessor);
// Set the compiled stylesheet.
-
m_stylesheetExecutionContext.setStylesheetRoot(theCompiledStylesheet->getStylesheetRoot());
+
m_stylesheetExecutionContext->setStylesheetRoot(theCompiledStylesheet->getStylesheetRoot());
// Set the parameters if any.
for (ParamPairVectorType::size_type i = 0; i <
m_paramPairs.size(); ++i)
@@ -422,7 +423,7 @@
theProcessor.process(
theParsedXML.getDocument(),
tempResultTarget,
- m_stylesheetExecutionContext);
+ *m_stylesheetExecutionContext);
}
catch (XSLException& e)
{
@@ -1005,15 +1006,15 @@
try
{
// Reset objects.
- m_stylesheetExecutionContext.setXPathEnvSupport(0);
+ m_stylesheetExecutionContext->setXPathEnvSupport(0);
- m_stylesheetExecutionContext.setDOMSupport(0);
+ m_stylesheetExecutionContext->setDOMSupport(0);
- m_stylesheetExecutionContext.setXObjectFactory(0);
+ m_stylesheetExecutionContext->setXObjectFactory(0);
- m_stylesheetExecutionContext.setXSLTProcessor(0);
+ m_stylesheetExecutionContext->setXSLTProcessor(0);
- m_stylesheetExecutionContext.reset();
+ m_stylesheetExecutionContext->reset();
// Clear the ParamPairVectorType.
m_paramPairs.clear();
@@ -1028,7 +1029,7 @@
XalanTransformer::EnsureReset::~EnsureReset()
{
- m_transformer.m_stylesheetExecutionContext.reset();
+ m_transformer.m_stylesheetExecutionContext->reset();
m_transformer.reset();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
