You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by db...@apache.org on 2005/08/09 19:12:06 UTC
cvs commit: xml-xalan/c/src/xalanc/XSLT XSLTProcessorEnvSupportDefault.cpp
dbertoni 2005/08/09 10:12:06
Modified: c/src/xalanc/XSLT XSLTProcessorEnvSupportDefault.cpp
Log:
Further fix for XALANC-455.
Revision Changes Path
1.8 +10 -6 xml-xalan/c/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp
Index: XSLTProcessorEnvSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/xalanc/XSLT/XSLTProcessorEnvSupportDefault.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSLTProcessorEnvSupportDefault.cpp 22 Apr 2005 20:52:41 -0000 1.7
+++ XSLTProcessorEnvSupportDefault.cpp 9 Aug 2005 17:12:06 -0000 1.8
@@ -156,20 +156,24 @@
EntityResolverType* const theResolver =
parserLiaison.getEntityResolver();
- XalanDOMString theEmptyString(theManager);
+ const XalanDOMString theEmptyString(theManager);
if (theResolver == 0)
{
- const XSLTInputSource inputSource(c_wstr(urlText), theManager);
+ const XSLTInputSource inputSource(urlText.c_str(), theManager);
theDocument = parserLiaison.parseXMLStream(inputSource, theEmptyString);
}
else
{
- typedef XalanMemMgrAutoPtr<InputSourceType, true> AutoPtr;
+ XALAN_USING_XERCES(InputSource)
- const AutoPtr resolverInputSource(theManager,
- theResolver->resolveEntity(0, c_wstr(urlText)));
+ typedef XalanAutoPtr<InputSource> AutoPtrType;
+
+ const AutoPtrType resolverInputSource(
+ theResolver->resolveEntity(
+ 0,
+ urlText.c_str()));
if (resolverInputSource.get() != 0)
{
@@ -177,7 +181,7 @@
}
else
{
- const XSLTInputSource inputSource(c_wstr(urlText), theManager);
+ const XSLTInputSource inputSource(urlText.c_str(), theManager);
theDocument = parserLiaison.parseXMLStream(inputSource, theEmptyString);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org