jdonohue 00/04/13 09:10:00
Modified: c/src/XMLSupport FormatterToHTML.cpp
Log:
Added XALAN_STATIC_UCODE_STRING wrappers
Revision Changes Path
1.12 +27 -27 xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp
Index: FormatterToHTML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XMLSupport/FormatterToHTML.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- FormatterToHTML.cpp 2000/04/12 19:40:49 1.11
+++ FormatterToHTML.cpp 2000/04/13 16:09:59 1.12
@@ -55,7 +55,7 @@
* <http://www.apache.org/>.
*/
/**
- * $Id: FormatterToHTML.cpp,v 1.11 2000/04/12 19:40:49 jdonohue Exp $
+ * $Id: FormatterToHTML.cpp,v 1.12 2000/04/13 16:09:59 jdonohue Exp $
*
* $State: Exp $
*
@@ -142,23 +142,23 @@
// specified
if((! isEmpty(m_doctypeSystem)) || (! isEmpty(m_doctypePublic)))
{
- m_writer.write("<!DOCTYPE HTML");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("<!DOCTYPE
HTML"));
if(! isEmpty(m_doctypePublic))
{
- m_writer.write(" PUBLIC \"");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("
PUBLIC \""));
m_writer.write(m_doctypePublic);
- m_writer.write("\"");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
if(! isEmpty(m_doctypeSystem))
{
if(isEmpty(m_doctypePublic))
- m_writer.write(" SYSTEM \"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING(" SYSTEM \""));
else
- m_writer.write(" \"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING(" \""));
m_writer.write(m_doctypeSystem);
- m_writer.write("\"");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
m_writer.write(m_lineSep);
}
}
@@ -195,24 +195,24 @@
{
if((! isEmpty(m_doctypeSystem)) || (!
isEmpty(m_doctypePublic)))
{
- m_writer.write("<!DOCTYPE ");
+
m_writer.write(XALAN_STATIC_UCODE_STRING("<!DOCTYPE "));
m_writer.write(name);
if(! isEmpty(m_doctypePublic))
{
- m_writer.write(" PUBLIC \"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING(" PUBLIC \""));
m_writer.write(m_doctypePublic);
- m_writer.write("\"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
if(! isEmpty(m_doctypeSystem))
{
if(isEmpty(m_doctypePublic))
- m_writer.write(" SYSTEM \"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING(" SYSTEM \""));
else
- m_writer.write(" \"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING(" \""));
m_writer.write(m_doctypeSystem);
- m_writer.write("\"");
+
m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
m_writer.write(m_lineSep);
}
}
@@ -314,24 +314,24 @@
{
if (shouldIndent == true)
indent(m_writer, m_currentIndent);
- m_writer.write("</");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("</"));
m_writer.write(name);
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
}
else
{
if(s_empties.find(toUpperCase(name)) == s_empties.end())
{
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
if (shouldIndent)
indent(m_writer, m_currentIndent);
- m_writer.write("</");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("</"));
m_writer.write(name);
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
}
else
{
- m_writer.write(">");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(">"));
}
}
/*
@@ -485,9 +485,9 @@
{
try
{
- m_writer.write("&");
+ m_writer.write(XALAN_STATIC_UCODE_STRING("&"));
m_writer.write(name);
- m_writer.write(";");
+ m_writer.write(XALAN_STATIC_UCODE_STRING(";"));
}
catch(...)
{
@@ -588,15 +588,15 @@
if(s_attrempties.find(aname) == s_attrempties.end())
{
- m_writer.write(' ');
+ m_writer.write(XALAN_STATIC_UCODE_STRING(" "));
m_writer.write(name);
m_writer.write(XALAN_STATIC_UCODE_STRING("=\""));
m_writer.write(pval);
- m_writer.write('\"');
+ m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
else
{
- m_writer.write(' ');
+ m_writer.write(XALAN_STATIC_UCODE_STRING(" "));
if((pval.length() == 0) ||
equalsIgnoreCase(pval, aname))
{
m_writer.write(name);
@@ -606,7 +606,7 @@
m_writer.write(name);
m_writer.write(XALAN_STATIC_UCODE_STRING("=\""));
m_writer.write(pval);
- m_writer.write('\"');
+
m_writer.write(XALAN_STATIC_UCODE_STRING("\""));
}
}
}
