View | Details | Raw Unified | Return to bug 222400 | Differences between
and this patch

Collapse All | Expand All

(-)b/textproc/xqilla/files/patch-src_dom-api_impl_XPathDocumentImpl.cpp (+14 lines)
Added Link Here
1 
--- src/dom-api/impl/XPathDocumentImpl.cpp.orig	2017-09-03 19:24:35 UTC
2 
+++ src/dom-api/impl/XPathDocumentImpl.cpp
3 
@@ -62,7 +62,11 @@ DOMNode *XPathDocumentImpl::insertBefore
4 
     if (thisNodeImpl->isReadOnly())
5 
         throw DOMException(DOMException::NO_MODIFICATION_ALLOWED_ERR, 0, getMemoryManager());
6
7 
+#if _XERCES_VERSION >= 30200
8 
+    DOMNode* thisNode = fParent.fContainingNode;
9 
+#else
10 
     DOMNode* thisNode = castToNode(&fParent);
11 
+#endif
12 
     if (newChild->getOwnerDocument() != thisNode)
13 
         throw DOMException(DOMException::WRONG_DOCUMENT_ERR, 0, getMemoryManager());
14
(-)b/textproc/xqilla/files/patch-src_dom-api_impl_XPathNamespaceImpl.cpp (-1 / +41 lines)
Added Link Here
0 
-
1 
--- src/dom-api/impl/XPathNamespaceImpl.cpp.orig	2017-09-03 20:26:37 UTC
2 
+++ src/dom-api/impl/XPathNamespaceImpl.cpp
3 
@@ -33,7 +33,11 @@ XERCES_CPP_NAMESPACE_USE;
4
5 
 XPathNamespaceImpl::XPathNamespaceImpl(const XMLCh* const nsPrefix,
6 
 		const XMLCh* const nsUri, DOMElement *owner, DOMDocument *docOwner)
7 
+#if _XERCES_VERSION >= 30200
8 
+	: fNode(this, docOwner)
9 
+#else
10 
 	: fNode(docOwner)
11 
+#endif
12 
 {
13 
     DOMNodeImpl *argImpl = castToNodeImpl(this);
14
15 
@@ -54,7 +58,13 @@ XPathNamespaceImpl::XPathNamespaceImpl(c
16 
 }
17
18 
 XPathNamespaceImpl::XPathNamespaceImpl(const XPathNamespaceImpl &other)
19 
-	: fNode(other.fNode), uri(other.uri), prefix(other.prefix)
20 
+#if _XERCES_VERSION >= 30200
21 
+	: fNode(this, other.fNode),
22 
+#else
23 
+	: fNode(other.fNode),
24 
+
25 
+#endif
26 
+	  uri(other.uri), prefix(other.prefix)
27 
 {
28 
 }
29
30 
@@ -196,7 +206,11 @@ short            XPathNamespaceImpl::com
31
32 
     //if it is a custom node and bigger than us we must ask it for the order
33 
     if(otherType > DOMXPathNamespace::XPATH_NAMESPACE_NODE) {
34 
+#if _XERCES_VERSION >= 30200
35 
+        DOMNodeImpl tmp(const_cast<XPathNamespaceImpl *>(this), 0);
36 
+#else
37 
         DOMNodeImpl tmp(0);
38 
+#endif
39 
 #if _XERCES_VERSION >= 30000
40 
         return tmp.reverseTreeOrderBitPattern(other->compareDocumentPosition(this));
41 
 #else

Return to bug 222400