dbertoni 2003/08/26 13:56:00
Modified: c/src/xalanc/XMLSupport FormatterToText.cpp
Log:
Really fixed bugzilla 22729.
Revision Changes Path
1.3 +10 -10 xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.cpp
Index: FormatterToText.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToText.cpp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FormatterToText.cpp 26 Aug 2003 18:58:46 -0000 1.2
+++ FormatterToText.cpp 26 Aug 2003 20:56:00 -0000 1.3
@@ -218,12 +218,16 @@
}
else
{
- // Normalize LF to CR/LF...
- if (chars[i] == XalanUnicode::charLF &&
+ // Normalize LF and CR/LF to the appropriate line
ending sequence.
+ if (chars[i] == XalanUnicode::charLF)
+ {
+ m_writer->write(m_newlineString, 0,
m_newlineStringLength);
+ }
+ else if (chars[i] == XalanUnicode::charCR &&
(i + 1 < length &&
- chars[i + 1] == XalanUnicode::charCR))
+ chars[i + 1] == XalanUnicode::charLF))
{
- m_writer->write(m_newlineString,
m_newlineStringLength);
+ m_writer->write(m_newlineString, 0,
m_newlineStringLength);
++i;
}
@@ -309,10 +313,6 @@
-static const XalanDOMChar s_newlineChar = XalanUnicode::charLF;
-
-
-
void
FormatterToText::update(bool fNormalizationOnly)
{
@@ -322,8 +322,8 @@
if (theStream == 0)
{
- m_newlineString = &s_newlineChar;
- m_newlineStringLength = 1;
+ m_newlineString = XalanOutputStream::defaultNewlineString();
+ m_newlineStringLength = length(m_newlineString);
if (fNormalizationOnly == false)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
