dbertoni 02/03/01 23:18:17
Modified: c/src/XPath ElementPrefixResolverProxy.cpp
ElementPrefixResolverProxy.hpp
Log:
Fixed bug 6814.
Revision Changes Path
1.7 +15 -4 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp
Index: ElementPrefixResolverProxy.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ElementPrefixResolverProxy.cpp 14 May 2001 01:01:15 -0000 1.6
+++ ElementPrefixResolverProxy.cpp 2 Mar 2002 07:18:17 -0000 1.7
@@ -67,6 +67,7 @@
+#include <DOMSupport/DOMServices.hpp>
#include <DOMSupport/DOMSupport.hpp>
@@ -80,8 +81,18 @@
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport) :
m_namespaceContext(namespaceContext),
+ m_envSupport(&envSupport),
+ m_uri()
+{
+}
+
+
+
+ElementPrefixResolverProxy::ElementPrefixResolverProxy(
+ const XalanElement* namespaceContext,
+ const XPathEnvSupport* envSupport) :
+ m_namespaceContext(namespaceContext),
m_envSupport(envSupport),
- m_domSupport(domSupport),
m_uri()
{
}
@@ -103,7 +114,7 @@
}
else
{
- return m_domSupport.getNamespaceForPrefix(prefix,
*m_namespaceContext);
+ return DOMServices::getNamespaceForPrefix(prefix,
*m_namespaceContext);
}
}
@@ -112,14 +123,14 @@
const XalanDOMString&
ElementPrefixResolverProxy::getURI() const
{
- if (m_namespaceContext != 0 && length(m_uri) == 0)
+ if (m_envSupport != 0 && m_namespaceContext != 0 && length(m_uri) == 0)
{
#if defined(XALAN_NO_MUTABLE)
((ElementPrefixResolverProxy*)this)->m_uri =
#else
m_uri =
#endif
-
m_envSupport.findURIFromDoc(m_namespaceContext->getOwnerDocument());
+
m_envSupport->findURIFromDoc(m_namespaceContext->getOwnerDocument());
}
return m_uri;
1.10 +16 -3 xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp
Index: ElementPrefixResolverProxy.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XPath/ElementPrefixResolverProxy.hpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- ElementPrefixResolverProxy.hpp 29 Jun 2001 18:47:54 -0000 1.9
+++ ElementPrefixResolverProxy.hpp 2 Mar 2002 07:18:17 -0000 1.10
@@ -89,12 +89,27 @@
* @param namespaceContext context object for namespace resolution
* @param envSupport XPath environment support class instance
* @param domSupport DOMSupport class instance
+ *
+ * @deprecated
*/
ElementPrefixResolverProxy(
const XalanElement* namespaceContext,
const XPathEnvSupport& envSupport,
const DOMSupport& domSupport);
+ /**
+ * Construct an instance of an element prefix resolver proxy
+ *
+ * @param namespaceContext context object for namespace resolution
+ * @param envSupport XPath environment support class instance
+ * @param domSupport DOMSupport class instance
+ *
+ * @deprecated
+ */
+ ElementPrefixResolverProxy(
+ const XalanElement* namespaceContext,
+ const XPathEnvSupport* envSupport = 0);
+
virtual
~ElementPrefixResolverProxy();
@@ -110,9 +125,7 @@
const XalanElement* const m_namespaceContext;
- const XPathEnvSupport& m_envSupport;
-
- const DOMSupport& m_domSupport;
+ const XPathEnvSupport* m_envSupport;
mutable XalanDOMString m_uri;
};
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
