dbertoni 00/12/30 09:55:34
Modified: c/src/DOMSupport DOMSupport.hpp DOMSupportDefault.cpp
DOMSupportDefault.hpp
Log:
Removed unused functions for expanding element and attribute names.
Revision Changes Path
1.6 +0 -18 xml-xalan/c/src/DOMSupport/DOMSupport.hpp
Index: DOMSupport.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupport.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMSupport.hpp 2000/12/15 23:25:54 1.5
+++ DOMSupport.hpp 2000/12/30 17:55:33 1.6
@@ -106,24 +106,6 @@
getNamespaceOfNode(const XalanNode& theNode) const = 0;
/**
- * Retrieves expanded name of a DOM element, including namespace
- *
- * @param elem DOM element queried
- * @return expanded name corresponding to 'elem'
- */
- virtual const XalanDOMString&
- getExpandedElementName(const XalanElement& elem) const = 0;
-
- /**
- * Retrieves expanded name of a DOM attribute, including namespace
- *
- * @param attr DOM attribute queried
- * @return expanded name corresponding to 'attr'
- */
- virtual const XalanDOMString&
- getExpandedAttributeName(const XalanAttr& attr) const = 0;
-
- /**
* Retrieves the URI of the named unparsed entity
* from the supplied document.
*
1.8 +0 -53 xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp
Index: DOMSupportDefault.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DOMSupportDefault.cpp 2000/12/15 23:25:54 1.7
+++ DOMSupportDefault.cpp 2000/12/30 17:55:33 1.8
@@ -110,59 +110,6 @@
const XalanDOMString&
-DOMSupportDefault::getExpandedElementName(const XalanElement& elem)
const
-{
- return getExpandedName(elem);
-}
-
-
-
-const XalanDOMString&
-DOMSupportDefault::getExpandedAttributeName(const XalanAttr& attr) const
-{
- return getExpandedName(attr);
-}
-
-
-
-const XalanDOMString&
-DOMSupportDefault::getExpandedName(const XalanNode& node) const
-{
- const XalanDOMString& theNamespace = getNamespaceOfNode(node);
-
- const unsigned int theNamespaceLength =
length(theNamespace);
-
- if (0 == theNamespaceLength)
- {
- return DOMServices::getLocalNameOfNode(node);
- }
- else
- {
- const XalanDOMString& theLocalName =
DOMServices::getLocalNameOfNode(node);
-
- XalanDOMString theResult;
-
- reserve(
- theResult,
- theNamespaceLength +
DOMServices::s_XMLNamespaceSeparatorStringLength + length(theLocalName) + 1);
-
- theResult = theNamespace;
-
- append(theResult, DOMServices::s_XMLNamespaceSeparatorString);
-
- append(theResult, theLocalName);
-
-#if defined(XALAN_NO_MUTABLE)
- return ((DOMSupportDefault*)this)->m_pool.get(theResult);
-#else
- return m_pool.get(theResult);
-#endif
- }
-}
-
-
-
-const XalanDOMString&
DOMSupportDefault::getUnparsedEntityURI(
const XalanDOMString& theName,
const XalanDocument& theDocument) const
1.6 +0 -9 xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp
Index: DOMSupportDefault.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/DOMSupport/DOMSupportDefault.hpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DOMSupportDefault.hpp 2000/12/15 23:25:54 1.5
+++ DOMSupportDefault.hpp 2000/12/30 17:55:33 1.6
@@ -92,20 +92,11 @@
getNamespaceOfNode(const XalanNode& theNode) const;
virtual const XalanDOMString&
- getExpandedElementName(const XalanElement& elem) const;
-
- virtual const XalanDOMString&
- getExpandedAttributeName(const XalanAttr& attr) const;
-
- virtual const XalanDOMString&
getUnparsedEntityURI(
const XalanDOMString& theName,
const XalanDocument& theDocument) const;
private:
-
- const XalanDOMString&
- getExpandedName(const XalanNode& node) const;
NamespaceResolver m_resolver;