dbertoni 2004/01/08 23:07:46
Modified: c/src/xalanc/NLS/en_US XalanMsg_en_US.xlf
c/src/xalanc/XMLSupport FormatterToXML.cpp
c/src/xalanc/XPath XPathExpression.cpp
c/src/xalanc/XSLT StylesheetExecutionContextDefault.cpp
StylesheetRoot.cpp
Log:
Patch for Bugzilla 24567.
Revision Changes Path
1.3 +1 -1 xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf
Index: XalanMsg_en_US.xlf
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/NLS/en_US/XalanMsg_en_US.xlf,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XalanMsg_en_US.xlf 31 Dec 2003 19:11:21 -0000 1.2
+++ XalanMsg_en_US.xlf 9 Jan 2004 07:07:46 -0000 1.3
@@ -4,7 +4,7 @@
<!DOCTYPE xliff PUBLIC "-//XLIFF//DTD XLIFF//EN"
"../xliff.dtd" >
<xliff version="1.1">
- <file source-language="en_US" target-language="en_US" datatype="cpp"
original="XalanC source files" product-name="XalanC" product-version="1.6.0">
+ <file source-language="en_US" target-language="en_US" datatype="cpp"
original="XalanC source files" product-name="XalanC" product-version="1.7.0">
<header></header>
<body>
1.7 +3 -3 xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp
Index: FormatterToXML.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XMLSupport/FormatterToXML.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- FormatterToXML.cpp 6 Jan 2004 02:41:31 -0000 1.6
+++ FormatterToXML.cpp 9 Jan 2004 07:07:46 -0000 1.7
@@ -754,9 +754,9 @@
void
FormatterToXML::throwInvalidUTF16SurrogateException(XalanDOMChar ch)
{
- const XalanDOMString theMessage(TranscodeFromLocalCodePage("Invalid
UTF-16 surrogate detected: ") +
-
UnsignedLongToHexDOMString(ch) +
-
TranscodeFromLocalCodePage(" ?"));
+ const XalanDOMString chStr = UnsignedLongToHexDOMString(ch);
+ const XalanDOMString theMessage =
XalanMessageLoader::getMessage(XalanMessages::InvalidSurrogate_1Param,chStr);
+
throw SAXException(c_wstr(theMessage));
}
1.5 +1 -1 xml-xalan/c/src/xalanc/XPath/XPathExpression.cpp
Index: XPathExpression.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XPath/XPathExpression.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XPathExpression.cpp 6 Jan 2004 02:41:32 -0000 1.4
+++ XPathExpression.cpp 9 Jan 2004 07:07:46 -0000 1.5
@@ -282,7 +282,7 @@
int theExpectedCount,
int theSuppliedCount)
{
- XalanDOMString theResult("An invalid number of arguments for op code
");
+ XalanDOMString theResult;
LongToDOMString(theOpCode, theResult);
1.15 +1 -3
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.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- StylesheetExecutionContextDefault.cpp 6 Jan 2004 02:41:36 -0000
1.14
+++ StylesheetExecutionContextDefault.cpp 9 Jan 2004 07:07:46 -0000
1.15
@@ -1969,9 +1969,7 @@
XalanDOMString& theString = theGuard.get();
- theString = XALAN_STATIC_UCODE_STRING("The variable '");
- theString += name.getLocalPart();
- theString += XALAN_STATIC_UCODE_STRING("' is not defined.");
+ theString =
XalanMessageLoader::getMessage(XalanMessages::VariableIsNotDefined_1Param,name.getLocalPart());
error(
theString,
1.12 +1 -1 xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- StylesheetRoot.cpp 6 Jan 2004 02:41:36 -0000 1.11
+++ StylesheetRoot.cpp 9 Jan 2004 07:07:46 -0000 1.12
@@ -948,7 +948,7 @@
if (i == m_attributeSetsMap.end())
{
theExecutionContext.error(
- "Unknown xsl:attribute-set",
+
XalanMessageLoader::getMessage(XalanMessages::UnknownNodeType_1Param,Constants::ELEMNAME_ATTRIBUTESET_WITH_PREFIX_STRING),
theExecutionContext.getCurrentNode(),
theLocator);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
