dbertoni 01/03/05 09:27:40
Modified: c/src/XSLT ElemPI.cpp ElemTemplateElement.cpp
XSLTEngineImpl.cpp
Log:
Replaced embedded string, and changed toCharArray() to c_wstr().
Revision Changes Path
1.11 +2 -2 xml-xalan/c/src/XSLT/ElemPI.cpp
Index: ElemPI.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemPI.cpp,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ElemPI.cpp 2001/03/02 15:35:40 1.10
+++ ElemPI.cpp 2001/03/05 17:27:37 1.11
@@ -141,7 +141,7 @@
m_nameAVT->evaluate(piName, sourceNode, *this, executionContext);
- if(equalsIgnoreCase(piName, XALAN_STATIC_UCODE_STRING("xml")))
+ if(equalsIgnoreCase(piName, Constants::ATTRVAL_OUTPUT_METHOD_XML))
{
error("processing-instruction name can not be 'xml'");
}
@@ -158,7 +158,7 @@
mode,
theResult.get());
- executionContext.processingInstruction(toCharArray(piName),
toCharArray(theResult.get()));
+ executionContext.processingInstruction(c_wstr(piName),
c_wstr(theResult.get()));
}
1.49 +1 -1 xml-xalan/c/src/XSLT/ElemTemplateElement.cpp
Index: ElemTemplateElement.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/ElemTemplateElement.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- ElemTemplateElement.cpp 2001/03/03 19:57:37 1.48
+++ ElemTemplateElement.cpp 2001/03/05 17:27:37 1.49
@@ -1013,7 +1013,7 @@
{
XalanDOMString errMsg("ElemTemplateElement error: " + msg);
- throw SAXException(toCharArray(errMsg));
+ throw SAXException(c_wstr(errMsg));
}
1.93 +5 -4 xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp
Index: XSLTEngineImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/XSLTEngineImpl.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- XSLTEngineImpl.cpp 2001/03/02 19:11:39 1.92
+++ XSLTEngineImpl.cpp 2001/03/05 17:27:38 1.93
@@ -2085,7 +2085,7 @@
const XalanDOMString& theData = theComment.getData();
- comment(toCharArray(theData));
+ comment(c_wstr(theData));
}
break;
@@ -2098,7 +2098,8 @@
case XalanNode::ENTITY_REFERENCE_NODE:
{
const XalanDOMString & theName = node.getNodeName();
- entityReference(toCharArray(theName));
+
+ entityReference(c_wstr(theName));
}
break;
@@ -2114,8 +2115,8 @@
const XalanDOMString& theTarget = pi.getTarget();
const XalanDOMString& theData = pi.getData();
- processingInstruction(toCharArray(theTarget),
-
toCharArray(theData));
+ processingInstruction(c_wstr(theTarget),
+
c_wstr(theData));
}
break;
