dbertoni 00/10/07 08:26:12
Modified: c/src/XSLT StylesheetExecutionContext.hpp
StylesheetExecutionContextDefault.cpp
StylesheetExecutionContextDefault.hpp
StylesheetRoot.cpp
Log:
Changes for transcoding support in FormatterToText.
Revision Changes Path
1.33 +7 -4 xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp
Index: StylesheetExecutionContext.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContext.hpp,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- StylesheetExecutionContext.hpp 2000/09/27 16:39:51 1.32
+++ StylesheetExecutionContext.hpp 2000/10/07 15:26:09 1.33
@@ -1299,7 +1299,7 @@
* @param version version of the output method
* @param doIndent true if output is to be indented
* @param indent number of spaces to indent at each nesting
level
- * @param encoding character encoding in use by
<VAR>writer</VAR>
+ * @param encoding character encoding for the
writer
* @param mediaType media type (MIME content type) of the data
* @param doctypeSystem system identifier to be used in the document
* type declaration
@@ -1334,7 +1334,7 @@
* owns the instance and will delete it when reset.
*
* @param writer character output stream to use
- * @param encoding character encoding in use by
<VAR>writer</VAR>
+ * @param encoding character encoding for the
writer
* @param mediaType media type (MIME content type) of the data
* @param doctypeSystem system identifier to be used in the document
* type declaration
@@ -1392,10 +1392,13 @@
/**
* FormatterToText instance constructor.
*
- * @param pw print writer for output
+ * @param writer writer for output
+ * @param encoding character encoding for the writer
*/
virtual FormatterToText*
- createFormatterToText(Writer& writer) = 0;
+ createFormatterToText(
+ Writer& writer,
+ const XalanDOMString& encoding) = 0;
typedef XalanAutoPtr<XalanNumberFormat>
XalanNumberFormatAutoPtr;
1.37 +4 -2
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -r1.36 -r1.37
--- StylesheetExecutionContextDefault.cpp 2000/09/27 16:39:51 1.36
+++ StylesheetExecutionContextDefault.cpp 2000/10/07 15:26:10 1.37
@@ -1137,10 +1137,12 @@
FormatterToText*
-StylesheetExecutionContextDefault::createFormatterToText(Writer& writer)
+StylesheetExecutionContextDefault::createFormatterToText(
+ Writer& writer,
+ const XalanDOMString& encoding)
{
FormatterToText* const theFormatter =
- new FormatterToText(writer);
+ new FormatterToText(writer, encoding);
m_formatterListeners.insert(theFormatter);
1.34 +3 -2
xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp
Index: StylesheetExecutionContextDefault.hpp
===================================================================
RCS file:
/home/cvs/xml-xalan/c/src/XSLT/StylesheetExecutionContextDefault.hpp,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- StylesheetExecutionContextDefault.hpp 2000/09/27 16:39:51 1.33
+++ StylesheetExecutionContextDefault.hpp 2000/10/07 15:26:10 1.34
@@ -455,8 +455,9 @@
XalanElement* elem);
virtual FormatterToText*
- createFormatterToText(Writer& writer);
-
+ createFormatterToText(
+ Writer& writer,
+ const XalanDOMString& encoding);
virtual XalanNumberFormatAutoPtr
createXalanNumberFormat();
1.26 +1 -1 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- StylesheetRoot.cpp 2000/09/27 16:39:54 1.25
+++ StylesheetRoot.cpp 2000/10/07 15:26:10 1.26
@@ -312,7 +312,7 @@
break;
case FormatterListener::OUTPUT_METHOD_TEXT:
- flistener = executionContext.createFormatterToText(*pw);
+ flistener = executionContext.createFormatterToText(*pw,
m_encoding);
break;
case FormatterListener::OUTPUT_METHOD_NONE:
