dbertoni 2003/02/04 21:41:52
Modified: c/src/XalanTransformer XalanTransformer.cpp
XalanTransformer.hpp
Log:
New overload for transform(). Patch from Berin Lautenbach.
Revision Changes Path
1.66 +3 -16 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.65
retrieving revision 1.66
diff -u -r1.65 -r1.66
--- XalanTransformer.cpp 10 Jan 2003 05:01:30 -0000 1.65
+++ XalanTransformer.cpp 5 Feb 2003 05:41:50 -0000 1.66
@@ -133,8 +133,9 @@
XALAN_CPP_NAMESPACE_BEGIN
+const XSLTInputSource XalanTransformer::s_emptyInputSource;
-const XSLTInit* XalanTransformer::s_xsltInit = 0;
+const XSLTInit* XalanTransformer::s_xsltInit = 0;
@@ -349,20 +350,6 @@
int
XalanTransformer::transform(
- const XSLTInputSource& theInputSource,
- const XSLTResultTarget& theResultTarget)
-{
- // Do the transformation...
- return transform(
- theInputSource,
- XSLTInputSource(),
- theResultTarget);
-}
-
-
-
-int
-XalanTransformer::transform(
const XSLTInputSource& theInputSource,
const XSLTInputSource& theStylesheetSource,
void* theOutputHandle,
@@ -426,7 +413,7 @@
// Do the transformation...
return transform(
theInputSource,
- XSLTInputSource(),
+ s_emptyInputSource,
theResultTarget);
}
1.47 +29 -3 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.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- XalanTransformer.hpp 10 Jan 2003 05:01:30 -0000 1.46
+++ XalanTransformer.hpp 5 Feb 2003 05:41:52 -0000 1.47
@@ -2,7 +2,7 @@
* The Apache Software License, Version 1.1
*
*
- * Copyright (c) 2001-2002 The Apache Software Foundation. All rights
+ * Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -209,6 +209,24 @@
}
/**
+ * Transform will apply the stylesheet provided as a PI in the
+ * XML of the parsed xml source and write the transformation output to
+ * the target.
+ *
+ * @param theParsedXML the parsed input source
+ * @param theResultTarget output source tree
+ * @return 0 for success
+ */
+ int
+ transform(
+ const XalanParsedSource& theParsedXML,
+ const XSLTResultTarget& theResultTarget)
+ {
+
+ return transform(theParsedXML, s_emptyInputSource, theResultTarget);
+ }
+
+ /**
* Transform will apply the stylesheet source to the input source
* and write the transformation output to the target. The input
* source and result target can be a file name, a stream or a root
@@ -237,8 +255,14 @@
*/
int
transform(
- const XSLTInputSource& theInputSource,
- const XSLTResultTarget& theResultTarget);
+ const XSLTInputSource& theInputSource,
+ const XSLTResultTarget& theResultTarget)
+ {
+ return transform(
+ theInputSource,
+ s_emptyInputSource,
+ theResultTarget);
+ }
/**
* Transform will apply the stylesheet source to the input source
@@ -922,6 +946,8 @@
// This should always be the latest data member!!!
StylesheetExecutionContextDefault* m_stylesheetExecutionContext;
+
+ static const XSLTInputSource s_emptyInputSource;
static const XSLTInit* s_xsltInit;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
