dbertoni 02/03/11 21:41:04
Modified: c/src/XSLT StylesheetRoot.cpp XSLTEngineImpl.cpp
Log:
Make sure the default namespace is used for cdata-section-elements attribute of
xsl:output.
Revision Changes Path
1.56 +4 -1 xml-xalan/c/src/XSLT/StylesheetRoot.cpp
Index: StylesheetRoot.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/StylesheetRoot.cpp,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- StylesheetRoot.cpp 23 Feb 2002 04:23:16 -0000 1.55
+++ StylesheetRoot.cpp 12 Mar 2002 05:41:04 -0000 1.56
@@ -481,13 +481,16 @@
XalanDOMString theToken;
+ const Locator* const theLocator =
constructionContext.getLocatorFromStack();
+
while(theTokenCount > 0)
{
theTokenizer.nextToken(theToken);
--theTokenCount;
-
m_cdataSectionElems.push_back(XalanQNameByValue(theToken, getNamespaces()));
+ m_cdataSectionElems.push_back(
+ XalanQNameByValue(theToken, getNamespaces(),
theLocator, true));
}
assert(theTokenizer.hasMoreTokens() == false);
1.134 +11 -1 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.133
retrieving revision 1.134
diff -u -r1.133 -r1.134
--- XSLTEngineImpl.cpp 23 Feb 2002 04:23:16 -0000 1.133
+++ XSLTEngineImpl.cpp 12 Mar 2002 05:41:04 -0000 1.134
@@ -2513,7 +2513,17 @@
if(indexOfNSSep == length(elementName))
{
- fResult =
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(s_emptyString,
elementName));
+ const XalanDOMString* const elemNS =
+ getResultNamespaceForPrefix(s_emptyString);
+
+ if (elemNS != 0)
+ {
+ fResult =
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(*elemNS,
elementName));
+ }
+ else
+ {
+ fResult =
m_stylesheetRoot->isCDATASectionElementName(XalanQNameByReference(s_emptyString,
elementName));
+ }
}
else
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
