amassari 2004/12/12 07:59:24
Modified: c/src/xercesc/dom/impl DOMTreeWalkerImpl.cpp
Log:
Take into account the fExpandEntityReferences setting [jira# 1303]
Revision Changes Path
1.10 +13 -1 xml-xerces/c/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp
Index: DOMTreeWalkerImpl.cpp
===================================================================
RCS file: /home/cvs/xml-xerces/c/src/xercesc/dom/impl/DOMTreeWalkerImpl.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DOMTreeWalkerImpl.cpp 8 Sep 2004 13:55:52 -0000 1.9
+++ DOMTreeWalkerImpl.cpp 12 Dec 2004 15:59:24 -0000 1.10
@@ -132,6 +132,9 @@
if (!fCurrentNode) return 0;
+ if(!fExpandEntityReferences &&
fCurrentNode->getNodeType()==DOMNode::ENTITY_REFERENCE_NODE)
+ return 0;
+
DOMNode* node = getFirstChild(fCurrentNode);
if (node != 0) {
@@ -149,6 +152,9 @@
if (!fCurrentNode) return 0;
+ if(!fExpandEntityReferences &&
fCurrentNode->getNodeType()==DOMNode::ENTITY_REFERENCE_NODE)
+ return 0;
+
DOMNode* node = getLastChild(fCurrentNode);
if (node != 0) {
fCurrentNode = node;
@@ -386,6 +392,9 @@
if (!node) return 0;
+ if(!fExpandEntityReferences &&
node->getNodeType()==DOMNode::ENTITY_REFERENCE_NODE)
+ return 0;
+
DOMNode* newNode = node->getFirstChild();
if (!newNode) return 0;
@@ -413,6 +422,9 @@
DOMNode* DOMTreeWalkerImpl::getLastChild (DOMNode* node) {
if (!node) return 0;
+
+ if(!fExpandEntityReferences &&
node->getNodeType()==DOMNode::ENTITY_REFERENCE_NODE)
+ return 0;
DOMNode* newNode = node->getLastChild();
if (!newNode) return 0;
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
