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 2001/11/29 16:24:09 UTC
cvs commit: xml-xalan/c/src/XercesParserLiaison XercesAttrBridge.cpp XercesBridgeNavigator.cpp XercesBridgeNavigator.hpp XercesCDATASectionBridge.cpp XercesCommentBridge.cpp XercesDocumentBridge.cpp XercesDocumentBridge.hpp XercesDocumentFragmentBridge.cpp XercesDocumentTypeBridge.cpp XercesElementBridge.cpp XercesEntityBridge.cpp XercesEntityReferenceBridge.cpp XercesNotationBridge.cpp XercesParserLiaison.cpp XercesProcessingInstructionBridge.cpp XercesTextBridge.cpp
dbertoni 01/11/29 07:24:09
Modified: c/src/XercesParserLiaison XercesAttrBridge.cpp
XercesBridgeNavigator.cpp XercesBridgeNavigator.hpp
XercesCDATASectionBridge.cpp
XercesCommentBridge.cpp XercesDocumentBridge.cpp
XercesDocumentBridge.hpp
XercesDocumentFragmentBridge.cpp
XercesDocumentTypeBridge.cpp
XercesElementBridge.cpp XercesEntityBridge.cpp
XercesEntityReferenceBridge.cpp
XercesNotationBridge.cpp XercesParserLiaison.cpp
XercesProcessingInstructionBridge.cpp
XercesTextBridge.cpp
Log:
Fixed problems with non-terminated strings.
Revision Changes Path
1.4 +7 -7 xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp
Index: XercesAttrBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesAttrBridge.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesAttrBridge.cpp 2000/11/02 01:46:42 1.3
+++ XercesAttrBridge.cpp 2001/11/29 15:24:08 1.4
@@ -95,7 +95,7 @@
const XalanDOMString&
XercesAttrBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -103,7 +103,7 @@
const XalanDOMString&
XercesAttrBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -276,7 +276,7 @@
const XalanDOMString&
XercesAttrBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -284,7 +284,7 @@
const XalanDOMString&
XercesAttrBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -292,7 +292,7 @@
const XalanDOMString&
XercesAttrBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -324,7 +324,7 @@
const XalanDOMString&
XercesAttrBridge::getName() const
{
- return m_navigator.getPooledString(m_xercesNode.getName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getName());
}
@@ -340,7 +340,7 @@
const XalanDOMString&
XercesAttrBridge::getValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getValue());
}
1.8 +2 -10 xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp
Index: XercesBridgeNavigator.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.cpp,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XercesBridgeNavigator.cpp 2001/11/20 20:14:11 1.7
+++ XercesBridgeNavigator.cpp 2001/11/29 15:24:08 1.8
@@ -382,15 +382,7 @@
const XalanDOMString&
-XercesBridgeNavigator::getPooledString(const XalanDOMString& theString) const
+XercesBridgeNavigator:: getPooledString(const DOMString& theString) const
{
- return m_ownerDocument->getPooledString(theString);
-}
-
-
-
-const XalanDOMString&
-XercesBridgeNavigator:: getPooledString(const XalanDOMChar* theString) const
-{
- return m_ownerDocument->getPooledString(theString);
+ return m_ownerDocument->getPooledString(theString.rawBuffer(), theString.length());
}
1.7 +2 -11 xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp
Index: XercesBridgeNavigator.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesBridgeNavigator.hpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- XercesBridgeNavigator.hpp 2000/11/02 01:46:43 1.6
+++ XercesBridgeNavigator.hpp 2001/11/29 15:24:08 1.7
@@ -79,6 +79,7 @@
class XalanNode;
class XalanText;
class DOM_Text;
+class DOMString;
@@ -252,17 +253,7 @@
* @return A const reference to the pooled string.
*/
const XalanDOMString&
- getPooledString(const XalanDOMString& theString) const;
-
- /**
- * Get a pooled string. If the string is not in the pool,
- * add it.
- *
- * @param theString The string to pool.
- * @return A const reference to the pooled string.
- */
- const XalanDOMString&
- getPooledString(const XalanDOMChar* theString) const;
+ getPooledString(const DOMString& theString) const;
private:
1.5 +8 -6 xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp
Index: XercesCDATASectionBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCDATASectionBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesCDATASectionBridge.cpp 2000/11/02 01:46:43 1.4
+++ XercesCDATASectionBridge.cpp 2001/11/29 15:24:08 1.5
@@ -92,7 +92,7 @@
const XalanDOMString&
XercesCDATASectionBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -100,7 +100,7 @@
const XalanDOMString&
XercesCDATASectionBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -279,7 +279,9 @@
const XalanDOMString&
XercesCDATASectionBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ const DOMString theString();
+
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -287,7 +289,7 @@
const XalanDOMString&
XercesCDATASectionBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -295,7 +297,7 @@
const XalanDOMString&
XercesCDATASectionBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -328,7 +330,7 @@
const XalanDOMString&
XercesCDATASectionBridge::getData() const
{
- return m_navigator.getPooledString(m_xercesNode.getData().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getData());
}
1.4 +6 -6 xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp
Index: XercesCommentBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesCommentBridge.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesCommentBridge.cpp 2000/11/02 01:46:43 1.3
+++ XercesCommentBridge.cpp 2001/11/29 15:24:08 1.4
@@ -88,7 +88,7 @@
const XalanDOMString&
XercesCommentBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -96,7 +96,7 @@
const XalanDOMString&
XercesCommentBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -274,7 +274,7 @@
const XalanDOMString&
XercesCommentBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -282,7 +282,7 @@
const XalanDOMString&
XercesCommentBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -290,7 +290,7 @@
const XalanDOMString&
XercesCommentBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -322,7 +322,7 @@
const XalanDOMString&
XercesCommentBridge::getData() const
{
- return m_navigator.getPooledString(m_xercesNode.getData().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getData());
}
1.19 +21 -9 xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp
Index: XercesDocumentBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- XercesDocumentBridge.cpp 2001/08/06 01:37:47 1.18
+++ XercesDocumentBridge.cpp 2001/11/29 15:24:08 1.19
@@ -964,7 +964,9 @@
const XalanDOMString&
XercesDocumentBridge::getNodeName() const
{
- return getPooledString(m_xercesDocument.getNodeName().rawBuffer());
+ assert(m_navigator != 0);
+
+ return m_navigator->getPooledString(m_xercesDocument.getNodeName());
}
@@ -972,7 +974,9 @@
const XalanDOMString&
XercesDocumentBridge::getNodeValue() const
{
- return getPooledString(m_xercesDocument.getNodeValue().rawBuffer());
+ assert(m_navigator != 0);
+
+ return m_navigator->getPooledString(m_xercesDocument.getNodeValue());
}
@@ -1165,7 +1169,9 @@
const XalanDOMString&
XercesDocumentBridge::getNamespaceURI() const
{
- return getPooledString(m_xercesDocument.getNamespaceURI().rawBuffer());
+ assert(m_navigator != 0);
+
+ return m_navigator->getPooledString(m_xercesDocument.getNamespaceURI());
}
@@ -1173,7 +1179,9 @@
const XalanDOMString&
XercesDocumentBridge::getPrefix() const
{
- return getPooledString(m_xercesDocument.getPrefix().rawBuffer());
+ assert(m_navigator != 0);
+
+ return m_navigator->getPooledString(m_xercesDocument.getPrefix());
}
@@ -1181,7 +1189,9 @@
const XalanDOMString&
XercesDocumentBridge::getLocalName() const
{
- return getPooledString(m_xercesDocument.getLocalName().rawBuffer());
+ assert(m_navigator != 0);
+
+ return m_navigator->getPooledString(m_xercesDocument.getLocalName());
}
@@ -1448,11 +1458,11 @@
XalanNode* importedNode,
bool deep)
{
- // $$$ToDo: Fix this....
+ // $$$ToDo: Fix this...
// The problem is that we must get the Xerces node that corresponds to the
// importedNode parameter. We could assume that it is indeed a node from
// another XercesDocumentBridge, but I'm not sure that we should do that.
- throw XercesDOMException(XercesDOMException::NO_MODIFICATION_ALLOWED_ERR);
+ throw XercesDOMException(XercesDOMException::NOT_SUPPORTED_ERR);
return 0;
}
@@ -1798,7 +1808,9 @@
const XalanDOMString&
-XercesDocumentBridge::getPooledString(const XalanDOMChar* theString) const
+XercesDocumentBridge::getPooledString(
+ const XalanDOMChar* theString,
+ XalanDOMString::size_type theLength) const
{
- return m_stringPool->get(theString);
+ return m_stringPool->get(theString, theLength);
}
1.16 +4 -1 xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp
Index: XercesDocumentBridge.hpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentBridge.hpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- XercesDocumentBridge.hpp 2001/08/06 01:37:47 1.15
+++ XercesDocumentBridge.hpp 2001/11/29 15:24:08 1.16
@@ -447,10 +447,13 @@
* add it.
*
* @param theString The string to pool.
+ * @param theLength The length of the string. If XalanDOMString::npos, the string is assumed to be null-terminated.
* @return A const reference to the pooled string.
*/
const XalanDOMString&
- getPooledString(const XalanDOMChar* theString) const;
+ getPooledString(
+ const XalanDOMChar* theString,
+ XalanDOMString::size_type theLength /* = XalanDOMString::npos */) const;
private:
1.5 +5 -5 xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp
Index: XercesDocumentFragmentBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentFragmentBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDocumentFragmentBridge.cpp 2000/11/02 01:46:43 1.4
+++ XercesDocumentFragmentBridge.cpp 2001/11/29 15:24:08 1.5
@@ -93,7 +93,7 @@
const XalanDOMString&
XercesDocumentFragmentBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -101,7 +101,7 @@
const XalanDOMString&
XercesDocumentFragmentBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -271,7 +271,7 @@
const XalanDOMString&
XercesDocumentFragmentBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -279,7 +279,7 @@
const XalanDOMString&
XercesDocumentFragmentBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -287,7 +287,7 @@
const XalanDOMString&
XercesDocumentFragmentBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
1.5 +9 -9 xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp
Index: XercesDocumentTypeBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesDocumentTypeBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesDocumentTypeBridge.cpp 2000/11/02 01:46:43 1.4
+++ XercesDocumentTypeBridge.cpp 2001/11/29 15:24:08 1.5
@@ -92,7 +92,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -100,7 +100,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -282,7 +282,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -290,7 +290,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -298,7 +298,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -330,7 +330,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getName() const
{
- return m_navigator.getPooledString(m_xercesNode.getName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getName());
}
@@ -354,7 +354,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getPublicId() const
{
- return m_navigator.getPooledString(m_xercesNode.getPublicId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPublicId());
}
@@ -362,7 +362,7 @@
const XalanDOMString&
XercesDocumentTypeBridge::getSystemId() const
{
- return m_navigator.getPooledString(m_xercesNode.getSystemId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getSystemId());
}
@@ -370,5 +370,5 @@
const XalanDOMString&
XercesDocumentTypeBridge::getInternalSubset() const
{
- return m_navigator.getPooledString(m_xercesNode.getInternalSubset().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getInternalSubset());
}
1.6 +8 -8 xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp
Index: XercesElementBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesElementBridge.cpp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XercesElementBridge.cpp 2000/11/30 22:16:51 1.5
+++ XercesElementBridge.cpp 2001/11/29 15:24:08 1.6
@@ -97,7 +97,7 @@
const XalanDOMString&
XercesElementBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeNameImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeNameImpl());
}
@@ -105,7 +105,7 @@
const XalanDOMString&
XercesElementBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValueImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValueImpl());
}
@@ -275,7 +275,7 @@
const XalanDOMString&
XercesElementBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURIImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURIImpl());
}
@@ -283,7 +283,7 @@
const XalanDOMString&
XercesElementBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefixImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefixImpl());
}
@@ -291,7 +291,7 @@
const XalanDOMString&
XercesElementBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalNameImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalNameImpl());
}
@@ -323,7 +323,7 @@
const XalanDOMString&
XercesElementBridge::getTagName() const
{
- return m_navigator.getPooledString(m_xercesNode.getTagNameImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getTagNameImpl());
}
@@ -331,7 +331,7 @@
const XalanDOMString&
XercesElementBridge::getAttribute(const XalanDOMString& name) const
{
- return m_navigator.getPooledString(m_xercesNode.getAttributeImpl(c_wstr(name)).rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getAttributeImpl(c_wstr(name)));
}
@@ -450,7 +450,7 @@
const XalanDOMString& namespaceURI,
const XalanDOMString& localName) const
{
- return m_navigator.getPooledString(m_xercesNode.getAttributeNSImpl(c_wstr(namespaceURI), c_wstr(localName)).rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getAttributeNSImpl(c_wstr(namespaceURI), c_wstr(localName)));
}
1.5 +8 -8 xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp
Index: XercesEntityBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesEntityBridge.cpp 2000/11/02 01:46:44 1.4
+++ XercesEntityBridge.cpp 2001/11/29 15:24:08 1.5
@@ -90,7 +90,7 @@
const XalanDOMString&
XercesEntityBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -98,7 +98,7 @@
const XalanDOMString&
XercesEntityBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -268,7 +268,7 @@
const XalanDOMString&
XercesEntityBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -276,7 +276,7 @@
const XalanDOMString&
XercesEntityBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -284,7 +284,7 @@
const XalanDOMString&
XercesEntityBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -316,7 +316,7 @@
const XalanDOMString&
XercesEntityBridge::getPublicId() const
{
- return m_navigator.getPooledString(m_xercesNode.getPublicId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPublicId());
}
@@ -324,7 +324,7 @@
const XalanDOMString&
XercesEntityBridge::getSystemId() const
{
- return m_navigator.getPooledString(m_xercesNode.getSystemId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getSystemId());
}
@@ -332,5 +332,5 @@
const XalanDOMString&
XercesEntityBridge::getNotationName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNotationName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNotationName());
}
1.4 +5 -5 xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp
Index: XercesEntityReferenceBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesEntityReferenceBridge.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesEntityReferenceBridge.cpp 2000/11/02 01:46:44 1.3
+++ XercesEntityReferenceBridge.cpp 2001/11/29 15:24:08 1.4
@@ -89,7 +89,7 @@
const XalanDOMString&
XercesEntityReferenceBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -97,7 +97,7 @@
const XalanDOMString&
XercesEntityReferenceBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -268,7 +268,7 @@
const XalanDOMString&
XercesEntityReferenceBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -276,7 +276,7 @@
const XalanDOMString&
XercesEntityReferenceBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -284,7 +284,7 @@
const XalanDOMString&
XercesEntityReferenceBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
1.4 +7 -7 xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp
Index: XercesNotationBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesNotationBridge.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesNotationBridge.cpp 2000/11/02 01:46:44 1.3
+++ XercesNotationBridge.cpp 2001/11/29 15:24:08 1.4
@@ -87,7 +87,7 @@
const XalanDOMString&
XercesNotationBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -95,7 +95,7 @@
const XalanDOMString&
XercesNotationBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -265,7 +265,7 @@
const XalanDOMString&
XercesNotationBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -273,7 +273,7 @@
const XalanDOMString&
XercesNotationBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -281,7 +281,7 @@
const XalanDOMString&
XercesNotationBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -313,7 +313,7 @@
const XalanDOMString&
XercesNotationBridge::getPublicId() const
{
- return m_navigator.getPooledString(m_xercesNode.getPublicId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPublicId());
}
@@ -321,5 +321,5 @@
const XalanDOMString&
XercesNotationBridge::getSystemId() const
{
- return m_navigator.getPooledString(m_xercesNode.getSystemId().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getSystemId());
}
1.40 +3 -3 xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp
Index: XercesParserLiaison.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesParserLiaison.cpp,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- XercesParserLiaison.cpp 2001/11/07 04:07:06 1.39
+++ XercesParserLiaison.cpp 2001/11/29 15:24:08 1.40
@@ -213,9 +213,11 @@
theParser->parse(reader);
- const DOM_Document theXercesDocument =
+ DOM_Document theXercesDocument =
theParser->getDocument();
+ theXercesDocument.normalize();
+
XercesDocumentBridge* theNewDocument = 0;
if (theXercesDocument.isNull() == false)
@@ -537,8 +539,6 @@
XercesParserLiaison::CreateDOMParser()
{
DOMParser* const theParser = new DOMParser;
-
- theParser->setExpandEntityReferences(true);
theParser->setDoValidation(m_useValidation);
1.4 +7 -7 xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp
Index: XercesProcessingInstructionBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesProcessingInstructionBridge.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- XercesProcessingInstructionBridge.cpp 2000/11/02 01:46:44 1.3
+++ XercesProcessingInstructionBridge.cpp 2001/11/29 15:24:08 1.4
@@ -88,7 +88,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -96,7 +96,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValue().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -274,7 +274,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURI().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -282,7 +282,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefix().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefix());
}
@@ -290,7 +290,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalName().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalName());
}
@@ -322,7 +322,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getTarget() const
{
- return m_navigator.getPooledString(m_xercesNode.getTarget().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getTarget());
}
@@ -330,7 +330,7 @@
const XalanDOMString&
XercesProcessingInstructionBridge::getData() const
{
- return m_navigator.getPooledString(m_xercesNode.getData().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getData());
}
1.5 +6 -6 xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp
Index: XercesTextBridge.cpp
===================================================================
RCS file: /home/cvs/xml-xalan/c/src/XercesParserLiaison/XercesTextBridge.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- XercesTextBridge.cpp 2000/11/02 01:46:44 1.4
+++ XercesTextBridge.cpp 2001/11/29 15:24:08 1.5
@@ -94,7 +94,7 @@
const XalanDOMString&
XercesTextBridge::getNodeName() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeNameImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeName());
}
@@ -102,7 +102,7 @@
const XalanDOMString&
XercesTextBridge::getNodeValue() const
{
- return m_navigator.getPooledString(m_xercesNode.getNodeValueImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNodeValue());
}
@@ -280,7 +280,7 @@
const XalanDOMString&
XercesTextBridge::getNamespaceURI() const
{
- return m_navigator.getPooledString(m_xercesNode.getNamespaceURIImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getNamespaceURI());
}
@@ -288,7 +288,7 @@
const XalanDOMString&
XercesTextBridge::getPrefix() const
{
- return m_navigator.getPooledString(m_xercesNode.getPrefixImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getPrefixImpl());
}
@@ -296,7 +296,7 @@
const XalanDOMString&
XercesTextBridge::getLocalName() const
{
- return m_navigator.getPooledString(m_xercesNode.getLocalNameImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getLocalNameImpl());
}
@@ -328,7 +328,7 @@
const XalanDOMString&
XercesTextBridge::getData() const
{
- return m_navigator.getPooledString(m_xercesNode.getDataImpl().rawBuffer());
+ return m_navigator.getPooledString(m_xercesNode.getDataImpl());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org