You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dm...@apache.org on 2005/05/06 19:31:50 UTC
cvs commit: xml-xalan/c/src/xalanc/XSLT StylesheetExecutionContextDefault.cpp
dmitryh 2005/05/06 10:31:50
Modified: c/src/xalanc/XSLT StylesheetExecutionContextDefault.cpp
Log:
Fix for XALANC-480
Revision Changes Path
1.41 +10 -8 xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp
Index: StylesheetExecutionContextDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetExecutionContextDefault.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- StylesheetExecutionContextDefault.cpp 2 May 2005 19:33:48 -0000 1.40
+++ StylesheetExecutionContextDefault.cpp 6 May 2005 17:31:50 -0000 1.41
@@ -48,13 +48,12 @@
#include <xalanc/XMLSupport/FormatterToXML.hpp>
-#include <xalanc/XMLSupport/FormatterToXML_UTF8.hpp>
-#include <xalanc/XMLSupport/FormatterToXML_UTF16.hpp>
+#include <xalanc/XMLSupport/FormatterToXMLUnicode.hpp>
#include <xalanc/XMLSupport/FormatterToHTML.hpp>
#include <xalanc/XMLSupport/FormatterToText.hpp>
#include <xalanc/XMLSupport/XMLParserLiaison.hpp>
-
-
+#include <xalanc/XMLSupport/XalanUTF8Writer.hpp>
+#include <xalanc/XMLSupport/XalanUTF16Writer.hpp>
#include <xalanc/XalanSourceTree/FormatterToSourceTree.hpp>
#include <xalanc/XalanSourceTree/XalanSourceTreeDocument.hpp>
@@ -1398,8 +1397,9 @@
if (doIndent == false &&
(encoding.empty() == true || XalanTranscodingServices::encodingIsUTF8(encoding)))
{
- FormatterToXML_UTF8* const theFormatter =
- FormatterToXML_UTF8::create(
+ typedef FormatterToXMLUnicode<XalanUTF8Writer> FormatterXML;
+ FormatterXML* const theFormatter =
+ FormatterXML::create(
getMemoryManager(),
writer,
version,
@@ -1415,8 +1415,10 @@
}
else if (doIndent == false && XalanTranscodingServices::encodingIsUTF16(encoding))
{
- FormatterToXML_UTF16* const theFormatter =
- FormatterToXML_UTF16::create(
+ typedef FormatterToXMLUnicode<XalanUTF16Writer> FormatterXML;
+
+ FormatterXML* const theFormatter =
+ FormatterXML::create(
getMemoryManager(),
writer,
version,
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org