dbertoni 2004/11/01 21:36:42
Modified: c/src/xalanc/XSLT ProblemListenerDefault.cpp
Log:
Use static UTF-16 strings, rather than rely on code page transcoding.
Revision Changes Path
1.8 +57 -8 xml-xalan/c/src/xalanc/XSLT/ProblemListenerDefault.cpp
Index: ProblemListenerDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/ProblemListenerDefault.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- ProblemListenerDefault.cpp 19 Apr 2004 14:47:18 -0000 1.7
+++ ProblemListenerDefault.cpp 2 Nov 2004 05:36:42 -0000 1.8
@@ -43,14 +43,61 @@
-static const char* const xslHeader = "XSLT ";
-static const char* const xmlHeader = "XML ";
-static const char* const xpathHeader = "XPath ";
+static const XalanDOMChar xsltHeader[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_S,
+ XalanUnicode::charLetter_L,
+ XalanUnicode::charLetter_T,
+ XalanUnicode::charSpace,
+ 0
+};
-static const char* const uriHeader = "";
+static const XalanDOMChar xmlHeader[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_M,
+ XalanUnicode::charLetter_L,
+ XalanUnicode::charSpace,
+ 0
+};
+
+static const XalanDOMChar xpathHeader[] =
+{
+ XalanUnicode::charLetter_X,
+ XalanUnicode::charLetter_P,
+ XalanUnicode::charLetter_a,
+ XalanUnicode::charLetter_t,
+ XalanUnicode::charLetter_h,
+ XalanUnicode::charSpace,
+ 0
+};
+
+static const XalanDOMChar uriHeader[] =
+{
+ 0
+};
+
+static const XalanDOMChar uriSeparator[] =
+{
+ XalanUnicode::charComma,
+ XalanUnicode::charSpace,
+ 0
+};
+
+static const XalanDOMChar locationOpen[] =
+{
+ XalanUnicode::charSpace,
+ XalanUnicode::charLeftParenthesis,
+ 0
+};
+
+static const XalanDOMChar locationClose[] =
+{
+ XalanUnicode::charRightParenthesis,
+ 0
+};
-static const char* const locationOpen = " (";
-static const char* const locationClose = ")";
ProblemListenerDefault::ProblemListenerDefault(PrintWriter* pw) :
@@ -116,7 +163,7 @@
}
else
{
- pw.print(xslHeader);
+ pw.print(xsltHeader);
}
if (eERROR == classification)
@@ -132,6 +179,8 @@
pw.print(XalanMessageLoader::getMessage(XalanMessages::Message_1Param, msg));
}
+ pw.write(XalanDOMChar(XalanUnicode::charSpace));
+
if (0 != styleNode)
{
pw.print(XalanMessageLoader::getMessage(XalanMessages::StyleTreeNode_1Param,
styleNode->getElementName()));
@@ -146,8 +195,8 @@
if (0 != uri)
{
- pw.print(uriHeader);
pw.print(uri);
+ pw.print(uriSeparator);
}
const XalanDOMString lineNoString = LongToDOMString(lineNo);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
