dbertoni 00/12/05 14:31:48
Modified: c/src/XSLT NamespacesHandler.cpp
Log:
Fixed problem with default namespace.
Revision Changes Path
1.5 +4 -24 xml-xalan/c/src/XSLT/NamespacesHandler.cpp
Index: NamespacesHandler.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XSLT/NamespacesHandler.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- NamespacesHandler.cpp 2000/11/02 01:46:27 1.4
+++ NamespacesHandler.cpp 2000/12/05 22:31:47 1.5
@@ -124,8 +124,8 @@
if(shouldExcludeResultNamespaceNode(
theXSLTNamespaceURI,
- stylesheetNamespacesHandler,
- theNamespace) == false)
+ thePrefix,
+ theURI) == false)
{
if (m_namespaceDeclarations.count(thePrefix) ==
0)
{
@@ -312,7 +312,7 @@
}
// Figure out the prefix of the owning element, to make sure we
- // don't exclude it's prefix.
+ // don't exclude its prefix.
const unsigned int indexOfNSSep = indexOf(theElementName,
XalanUnicode::charColon);
const XalanDOMString thePrefix = indexOfNSSep <
length(theElementName) ?
@@ -430,27 +430,8 @@
}
else
{
- // $$$ ToDo: Ask Scott what this code does...
-#if 0
- const ElemTemplateElement* elem = this;
-
- while(0 != elem)
- {
- elem = elem->getParentNodeElem();
-
- if(0 == elem)
- {
- return
getStylesheet().shouldExcludeResultNamespace(prefix);
- }
- }
- }
-
- return false;
-#else
-
return
stylesheetNamespacesHandler.hasExcludedPrefix(theNamespace.getPrefix());
}
-#endif
}
@@ -560,8 +541,7 @@
// We can never exclude the prefix of our owner
element, so
// check that first...
- if ((isEmpty(thePrefix) ||
- equals(thePrefix, theElementPrefix) == false)
&&
+ if (equals(thePrefix, theElementPrefix) == false &&
(m_excludedResultPrefixes.find(thePrefix) !=
m_excludedResultPrefixes.end() ||
m_extensionNamespaceURIs.find(theURI) !=
m_extensionNamespaceURIs.end()))
{
