[Libreoffice-commits] core.git: unoxml/inc unoxml/source

2023-01-19 Thread Michael Stahl (via logerrit) 
 unoxml/inc/node.hxx|3 ++-
 unoxml/source/dom/attr.cxx |2 +-
 unoxml/source/dom/attr.hxx |3 ++-
 unoxml/source/dom/document.cxx |8 +---
 unoxml/source/dom/document.hxx |3 ++-
 unoxml/source/dom/documentfragment.cxx |2 +-
 unoxml/source/dom/documentfragment.hxx |3 ++-
 unoxml/source/dom/element.cxx  |2 +-
 unoxml/source/dom/element.hxx  |3 ++-
 unoxml/source/dom/entity.cxx   |2 +-
 unoxml/source/dom/entity.hxx   |3 ++-
 unoxml/source/dom/entityreference.cxx  |2 +-
 unoxml/source/dom/entityreference.hxx  |3 ++-
 unoxml/source/dom/node.cxx |8 
 14 files changed, 28 insertions(+), 19 deletions(-)

New commits:
commit 9b9bc7461e0513e2bb493e7f00f800b2463751e1
Author: Michael Stahl 
AuthorDate: Wed Jan 18 20:58:47 2023 +0100
Commit: Noel Grandin 
CommitDate: Thu Jan 19 11:28:50 2023 +

tdf#153039 unoxml: replace root element of CDocument throws

XForms replace doesn't work because:

CDocument::IsChildTypeAllowed() tests that the document node does not
already have an element child, because only one is allowed - but when
called from CNode::replaceChild(), the existing child will be removed,
so that needs to be allowed to proceed (check that removed child is
also element).

(regression from commit c5db3b93ee1058bd20ebcde2e757b52b9a67b74a)

Change-Id: I167de3462f4d1934dbf8404ad395349897cfd981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145757
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index c4933dbdc234..17e474bf9683 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -134,7 +134,8 @@ namespace DOM
 virtual void fastSaxify( Context& io_rContext );
 
 // constrains child relationship between nodes based on type
-virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const 
nodeType);
+virtual bool IsChildTypeAllowed(css::xml::dom::NodeType nodeType,
+css::xml::dom::NodeType const* pReplacedNodeType);
 
 //  DOM interfaces
 
diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 1a993e152bd7..4988aa4211ec 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -70,7 +70,7 @@ namespace DOM
 return pNs;
 }
 
-bool CAttr::IsChildTypeAllowed(NodeType const nodeType)
+bool CAttr::IsChildTypeAllowed(NodeType const nodeType, NodeType 
const*const)
 {
 switch (nodeType) {
 case NodeType_TEXT_NODE:
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index 30c0aa25bb34..f30b25896158 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -52,7 +52,8 @@ namespace DOM
 /// return the libxml namespace corresponding to m_pNamespace on pNode
 xmlNsPtr GetNamespace(xmlNodePtr const pNode);
 
-virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const 
nodeType) override;
+virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const nodeType,
+css::xml::dom::NodeType const*) override;
 
 /**
 Returns the name of this attribute.
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 49c524b5ee99..413f764815e5 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -291,7 +291,7 @@ namespace DOM
 rContext.mxDocHandler->endDocument();
 }
 
-bool CDocument::IsChildTypeAllowed(NodeType const nodeType)
+bool CDocument::IsChildTypeAllowed(NodeType const nodeType, NodeType 
const*const pReplacedNodeType)
 {
 switch (nodeType) {
 case NodeType_PROCESSING_INSTRUCTION_NODE:
@@ -299,10 +299,12 @@ namespace DOM
 return true;
 case NodeType_ELEMENT_NODE:
  // there may be only one!
-return nullptr == lcl_getDocumentRootPtr(m_aDocPtr);
+return (pReplacedNodeType && *pReplacedNodeType == nodeType)
+|| nullptr == lcl_getDocumentRootPtr(m_aDocPtr);
 case NodeType_DOCUMENT_TYPE_NODE:
  // there may be only one!
-return nullptr == lcl_getDocumentType(m_aDocPtr);
+return (pReplacedNodeType && *pReplacedNodeType == nodeType)
+|| nullptr == lcl_getDocumentType(m_aDocPtr);
 default:
 return false;
 }
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx
index 291535ebf8e5..450b9200f86f 100644
--- a/unoxml/source/dom/document.hxx
+++ b/unoxml/source/dom/document.hxx
@@ -114,7 +114,8 @@ namespace DOM
 
 virtual void fastSaxify( Context& rContext ) override;
 
-virtual bool IsChildTypeAllowed(css::xml::dom::NodeType const 
nodeType) override;
+

[Libreoffice-commits] core.git: unoxml/inc unoxml/source

2023-01-15 Thread Noel Grandin (via logerrit) 
 unoxml/inc/node.hxx  |   10 ++
 unoxml/source/dom/element.cxx|5 ++---
 unoxml/source/dom/node.cxx   |   26 ++
 unoxml/source/xpath/xpathapi.cxx |7 +++
 4 files changed, 13 insertions(+), 35 deletions(-)

New commits:
commit d04c197b436094844abfa5fb7c12e095165d2bca
Author: Noel Grandin 
AuthorDate: Fri Jan 13 09:32:47 2023 +0200
Commit: Noel Grandin 
CommitDate: Sun Jan 15 18:36:44 2023 +

XUnoTunnel->dynamic_cast in CNode

Change-Id: Ifcedcb6fc4e20da6351e4ccf035a3fe06d607961
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145507
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index 852bcd1ae972..c4933dbdc234 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -32,7 +32,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -89,7 +88,8 @@ namespace DOM
 
 class CDocument;
 
-class CNode : public cppu::WeakImplHelper< css::xml::dom::XNode, 
css::lang::XUnoTunnel, css::xml::dom::events::XEventTarget >
+class SAL_LOPLUGIN_ANNOTATE("crosscast") CNode
+: public cppu::WeakImplHelper< css::xml::dom::XNode, 
css::xml::dom::events::XEventTarget >
 {
 friend class CDocument;
 friend class CElement;
@@ -123,8 +123,6 @@ namespace DOM
 
 virtual ~CNode() override;
 
-static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() 
noexcept;
-
 xmlNodePtr GetNodePtr() { return m_aNodePtr; }
 
 virtual CDocument & GetOwnerDocument();
@@ -290,10 +288,6 @@ namespace DOM
 sal_Bool useCapture) override;
 
 virtual sal_Bool SAL_CALL dispatchEvent(const css::uno::Reference< 
css::xml::dom::events::XEvent >& evt) override;
-
-// --- XUnoTunnel
-virtual ::sal_Int64 SAL_CALL
-getSomething(css::uno::Sequence< ::sal_Int8 > const& rId) override;
 };
 
 /// eliminate redundant namespace declarations
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 757ac1c17de4..06917c1f400e 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -470,7 +470,7 @@ namespace DOM
 }
 
 ::rtl::Reference const pCNode(
-comphelper::getFromUnoTunnel(Reference(oldAttr)));
+dynamic_cast(oldAttr.get()));
 if (!pCNode.is()) { throw RuntimeException(); }
 
 xmlNodePtr const pNode = pCNode->GetNodePtr();
@@ -529,8 +529,7 @@ namespace DOM
 }
 
 // get the implementation
-CAttr *const pCAttr = dynamic_cast(
-comphelper::getFromUnoTunnel(xNewAttr));
+CAttr *const pCAttr = dynamic_cast(xNewAttr.get());
 if (!pCAttr) { throw RuntimeException(); }
 xmlAttrPtr const pAttr =
 reinterpret_cast(pCAttr->GetNodePtr());
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index f5bd99aef475..c60c5e9a0bb3 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -161,12 +161,6 @@ namespace DOM
 }
 }
 
-const css::uno::Sequence< sal_Int8 > & CNode::getUnoTunnelId() noexcept
-{
-static const comphelper::UnoIdInit theCNodeUnoTunnelId;
-return theCNodeUnoTunnelId.getSeq();
-}
-
 CDocument & CNode::GetOwnerDocument()
 {
 OSL_ASSERT(m_xDocument.is());
@@ -300,7 +294,7 @@ namespace DOM
 
 if (nullptr == m_aNodePtr) { return nullptr; }
 
-CNode *const pNewChild(comphelper::getFromUnoTunnel(xNewChild));
+CNode *const pNewChild(dynamic_cast(xNewChild.get()));
 if (!pNewChild) { throw RuntimeException(); }
 xmlNodePtr const cur = pNewChild->GetNodePtr();
 if (!cur) { throw RuntimeException(); }
@@ -639,8 +633,8 @@ namespace DOM
 
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
-CNode *const pNewNode(comphelper::getFromUnoTunnel(newChild));
-CNode *const pRefNode(comphelper::getFromUnoTunnel(refChild));
+CNode *const pNewNode(dynamic_cast(newChild.get()));
+CNode *const pRefNode(dynamic_cast(refChild.get()));
 if (!pNewNode || !pRefNode) { throw RuntimeException(); }
 xmlNodePtr const pNewChild(pNewNode->GetNodePtr());
 xmlNodePtr const pRefChild(pRefNode->GetNodePtr());
@@ -740,7 +734,7 @@ namespace DOM
 
 Reference xReturn( xOldChild );
 
-::rtl::Reference const 
pOld(comphelper::getFromUnoTunnel(xOldChild));
+::rtl::Reference const 
pOld(dynamic_cast(xOldChild.get()));
 if (!pOld.is()) { throw RuntimeException(); }
 xmlNodePtr const old = pOld->GetNodePtr();
 if (!old) { throw RuntimeException(); }
@@ -808,10 +802,8 @@ namespace DOM
 
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
-::rtl::Reference const pOldNode(
-comphelper::getFromUnoTunnel(xOldChild));
-::rtl::Reference const pNewNode(
-

[Libreoffice-commits] core.git: unoxml/inc unoxml/source

2022-06-20 Thread Hannah Meeks (via logerrit) 
 unoxml/inc/node.hxx|6 
 unoxml/source/dom/node.cxx |   67 +++--
 2 files changed, 41 insertions(+), 32 deletions(-)

New commits:
commit a1c6d24aac530d7374cf0fdc5c62570d86e30996
Author: Hannah Meeks 
AuthorDate: Sat Jun 18 16:06:44 2022 +0100
Commit: Noel Grandin 
CommitDate: Mon Jun 20 18:53:27 2022 +0200

Simplify checks with functions.

Change-Id: I55fbab5d8184a743ace3cfec884b0364536ee6fa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136088
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index e6974271f83a..852bcd1ae972 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -113,6 +113,12 @@ namespace DOM
 
 void dispatchSubtreeModified();
 
+void checkNoParent(css::uno::Reference< css::xml::dom::XNode >const& 
xNode);
+
+static void checkNoParent(const xmlNodePtr pNode);
+
+void checkSameOwner(css::uno::Reference< css::xml::dom::XNode >const& 
xNode);
+
 public:
 
 virtual ~CNode() override;
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index 235af0bc5e0d..f5bd99aef475 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -268,6 +268,28 @@ namespace DOM
 return false;
 }
 
+void CNode::checkNoParent(Referenceconst& xNode){
+if (xNode->getParentNode() != Reference(this)){
+DOMException e;
+e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
+throw e;
+}
+}
+void CNode::checkNoParent(const xmlNodePtr pNode){
+if (pNode->parent != nullptr){
+DOMException e;
+e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
+throw e;
+}
+}
+void CNode::checkSameOwner(Referenceconst& xNode){
+if (xNode->getOwnerDocument() != getOwnerDocument()) {
+DOMException e;
+e.Code = DOMExceptionType_WRONG_DOCUMENT_ERR;
+throw e;
+}
+}
+
 /**
 Adds the node newChild to the end of the list of children of this node.
 */
@@ -296,11 +318,8 @@ namespace DOM
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
 throw e;
 }
-if (cur->parent != nullptr) {
-DOMException e;
-e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
-throw e;
-}
+checkNoParent(cur);
+
 if (!IsChildTypeAllowed(pNewChild->m_aNodeType)) {
 DOMException e;
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
@@ -610,11 +629,8 @@ namespace DOM
 {
 if (!newChild.is() || !refChild.is()) { throw RuntimeException(); }
 
-if (newChild->getOwnerDocument() != getOwnerDocument()) {
-DOMException e;
-e.Code = DOMExceptionType_WRONG_DOCUMENT_ERR;
-throw e;
-}
+checkSameOwner(newChild);
+
 if (refChild->getParentNode() != Reference< XNode >(this)) {
 DOMException e;
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
@@ -636,12 +652,8 @@ namespace DOM
 throw e;
 }
 // already has parent
-if (pNewChild->parent != nullptr)
-{
-DOMException e;
-e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
-throw e;
-}
+checkNoParent(pNewChild);
+
 if (!IsChildTypeAllowed(pNewNode->m_aNodeType)) {
 DOMException e;
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
@@ -714,11 +726,8 @@ namespace DOM
 throw RuntimeException();
 }
 
-if (xOldChild->getOwnerDocument() != getOwnerDocument()) {
-DOMException e;
-e.Code = DOMExceptionType_WRONG_DOCUMENT_ERR;
-throw e;
-}
+checkSameOwner(xOldChild);
+
 if (xOldChild->getParentNode() != Reference< XNode >(this)) {
 DOMException e;
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
@@ -784,16 +793,13 @@ namespace DOM
 Reference< XNode > SAL_CALL CNode::replaceChild(
 Reference< XNode > const& xNewChild,
 Reference< XNode > const& xOldChild)
-{
+ {
 if (!xOldChild.is() || !xNewChild.is()) {
 throw RuntimeException();
 }
 
-if (xNewChild->getOwnerDocument() != getOwnerDocument()) {
-DOMException e;
-e.Code = DOMExceptionType_WRONG_DOCUMENT_ERR;
-throw e;
-}
+checkSameOwner(xNewChild);
+
 if (xOldChild->getParentNode() != Reference< XNode >(this)) {
 DOMException e;
 e.Code = DOMExceptionType_HIERARCHY_REQUEST_ERR;
@@ -817,11 +823,8 @@ namespace DOM
 throw e;
 }
 // already has parent
-if (pNew->parent != nullptr) {
-DOMException e;
-e.Code = DOMExceptionType_HIERARC

[Libreoffice-commits] core.git: unoxml/inc unoxml/source

2019-06-18 Thread Arkadiy Illarionov (via logerrit) 
 unoxml/inc/node.hxx  |3 +--
 unoxml/source/dom/element.cxx|5 +++--
 unoxml/source/dom/node.cxx   |   24 +---
 unoxml/source/xpath/xpathapi.cxx |7 ---
 4 files changed, 17 insertions(+), 22 deletions(-)

New commits:
commit cc0dc723c7d8354b5203310ef1381bbf54258eba
Author: Arkadiy Illarionov 
AuthorDate: Tue Jun 18 00:10:57 2019 +0300
Commit: Michael Stahl 
CommitDate: Tue Jun 18 12:50:43 2019 +0200

tdf#39593 Remove DOM::CNode::GetImplementation

Replace with comphelper::getUnoTunnelImplementation.

Change-Id: If98801fd85bf0967c54e1924a04b6de371868942
Reviewed-on: https://gerrit.libreoffice.org/74234
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/unoxml/inc/node.hxx b/unoxml/inc/node.hxx
index 216f80eda3d5..e35ab3aafda5 100644
--- a/unoxml/inc/node.hxx
+++ b/unoxml/inc/node.hxx
@@ -119,8 +119,7 @@ namespace DOM
 
 virtual ~CNode() override;
 
-static CNode * GetImplementation(css::uno::Reference<
-css::uno::XInterface> const& xNode);
+static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId() throw();
 
 xmlNodePtr GetNodePtr() { return m_aNodePtr; }
 
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index f7cae19fdbdc..6ed9ba1ebd1e 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -29,6 +29,7 @@
 #include 
 
 #include 
+#include 
 
 #include 
 #include "attr.hxx"
@@ -472,7 +473,7 @@ namespace DOM
 }
 
 ::rtl::Reference const pCNode(
-CNode::GetImplementation(Reference(oldAttr.get(;
+
comphelper::getUnoTunnelImplementation(Reference(oldAttr.get(;
 if (!pCNode.is()) { throw RuntimeException(); }
 
 xmlNodePtr const pNode = pCNode->GetNodePtr();
@@ -532,7 +533,7 @@ namespace DOM
 
 // get the implementation
 CAttr *const pCAttr = dynamic_cast(
-CNode::GetImplementation(xNewAttr));
+comphelper::getUnoTunnelImplementation(xNewAttr));
 if (!pCAttr) { throw RuntimeException(); }
 xmlAttrPtr const pAttr =
 reinterpret_cast(pCAttr->GetNodePtr());
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index f486182eca83..7171e6c2f791 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -168,15 +168,9 @@ namespace DOM
 }
 }
 
-CNode *
-CNode::GetImplementation(uno::Reference const& xNode)
+const css::uno::Sequence< sal_Int8 > & CNode::getUnoTunnelId() throw()
 {
-uno::Reference const xUnoTunnel(xNode, UNO_QUERY);
-if (!xUnoTunnel.is()) { return nullptr; }
-CNode *const pCNode( reinterpret_cast< CNode* >(
-::sal::static_int_cast< sal_IntPtr >(
-
xUnoTunnel->getSomething(theCNodeUnoTunnelId::get().getSeq();
-return pCNode;
+return theCNodeUnoTunnelId::get().getSeq();
 }
 
 CDocument & CNode::GetOwnerDocument()
@@ -290,7 +284,7 @@ namespace DOM
 
 if (nullptr == m_aNodePtr) { return nullptr; }
 
-CNode *const pNewChild(CNode::GetImplementation(xNewChild));
+CNode *const 
pNewChild(comphelper::getUnoTunnelImplementation(xNewChild));
 if (!pNewChild) { throw RuntimeException(); }
 xmlNodePtr const cur = pNewChild->GetNodePtr();
 if (!cur) { throw RuntimeException(); }
@@ -645,8 +639,8 @@ namespace DOM
 
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
-CNode *const pNewNode(CNode::GetImplementation(newChild));
-CNode *const pRefNode(CNode::GetImplementation(refChild));
+CNode *const 
pNewNode(comphelper::getUnoTunnelImplementation(newChild));
+CNode *const 
pRefNode(comphelper::getUnoTunnelImplementation(refChild));
 if (!pNewNode || !pRefNode) { throw RuntimeException(); }
 xmlNodePtr const pNewChild(pNewNode->GetNodePtr());
 xmlNodePtr const pRefChild(pRefNode->GetNodePtr());
@@ -753,7 +747,7 @@ namespace DOM
 
 Reference xReturn( xOldChild );
 
-::rtl::Reference const 
pOld(CNode::GetImplementation(xOldChild));
+::rtl::Reference const 
pOld(comphelper::getUnoTunnelImplementation(xOldChild));
 if (!pOld.is()) { throw RuntimeException(); }
 xmlNodePtr const old = pOld->GetNodePtr();
 if (!old) { throw RuntimeException(); }
@@ -825,9 +819,9 @@ namespace DOM
 ::osl::ClearableMutexGuard guard(m_rMutex);
 
 ::rtl::Reference const pOldNode(
-CNode::GetImplementation(xOldChild));
+comphelper::getUnoTunnelImplementation(xOldChild));
 ::rtl::Reference const pNewNode(
-CNode::GetImplementation(xNewChild));
+comphelper::getUnoTunnelImplementation(xNewChild));
 if (!pOldNode.is() || !pNewNode.is()) { throw RuntimeException(); }
 xmlNodePtr const pOld = pO

[Libreoffice-commits] core.git: unoxml/inc unoxml/source

2017-10-17 Thread Stephan Bergmann 
 unoxml/inc/event.hxx|4 ++--
 unoxml/inc/eventdispatcher.hxx  |4 ++--
 unoxml/inc/mouseevent.hxx   |4 ++--
 unoxml/inc/mutationevent.hxx|4 ++--
 unoxml/inc/uievent.hxx  |4 ++--
 unoxml/source/dom/characterdata.cxx |2 +-
 unoxml/source/dom/document.cxx  |   10 +-
 unoxml/source/dom/element.cxx   |2 +-
 unoxml/source/dom/node.cxx  |4 ++--
 9 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit acfdfdf28a98b5841e4f8f669d9b6efe195926d9
Author: Stephan Bergmann 
Date:   Mon Oct 16 23:42:34 2017 +0200

Move unoxml/source/events include files to common include directory

...that are included from various source directories.  Change done in
preparation of loplugin:includeform.

Change-Id: I186ab7581ee7896c54a600e5cde8721a97b26425
Reviewed-on: https://gerrit.libreoffice.org/43444
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/unoxml/source/events/event.hxx b/unoxml/inc/event.hxx
similarity index 96%
rename from unoxml/source/events/event.hxx
rename to unoxml/inc/event.hxx
index ed07d59f2639..598f8702e985 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/inc/event.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_EVENT_HXX
+#define INCLUDED_UNOXML_INC_EVENT_HXX
 
 #include 
 
diff --git a/unoxml/source/events/eventdispatcher.hxx 
b/unoxml/inc/eventdispatcher.hxx
similarity index 95%
rename from unoxml/source/events/eventdispatcher.hxx
rename to unoxml/inc/eventdispatcher.hxx
index d992ff30d8d3..ee8bec567590 100644
--- a/unoxml/source/events/eventdispatcher.hxx
+++ b/unoxml/inc/eventdispatcher.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_EVENTDISPATCHER_HXX
+#ifndef INCLUDED_UNOXML_INC_EVENTDISPATCHER_HXX
+#define INCLUDED_UNOXML_INC_EVENTDISPATCHER_HXX
 
 #include 
 #include 
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/inc/mouseevent.hxx
similarity index 97%
rename from unoxml/source/events/mouseevent.hxx
rename to unoxml/inc/mouseevent.hxx
index 87ea75a2bb66..3f6788e89f13 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/inc/mouseevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MOUSEEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_MOUSEEVENT_HXX
+#define INCLUDED_UNOXML_INC_MOUSEEVENT_HXX
 
 #include 
 #include 
diff --git a/unoxml/source/events/mutationevent.hxx 
b/unoxml/inc/mutationevent.hxx
similarity index 96%
rename from unoxml/source/events/mutationevent.hxx
rename to unoxml/inc/mutationevent.hxx
index c8dfc3aed1a0..5499b5a93633 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/inc/mutationevent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_MUTATIONEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_MUTATIONEVENT_HXX
+#define INCLUDED_UNOXML_INC_MUTATIONEVENT_HXX
 
 #include 
 
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/inc/uievent.hxx
similarity index 96%
rename from unoxml/source/events/uievent.hxx
rename to unoxml/inc/uievent.hxx
index c82e600c24c6..7f7d4397a218 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/inc/uievent.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
-#define INCLUDED_UNOXML_SOURCE_EVENTS_UIEVENT_HXX
+#ifndef INCLUDED_UNOXML_INC_UIEVENT_HXX
+#define INCLUDED_UNOXML_INC_UIEVENT_HXX
 
 #include 
 
diff --git a/unoxml/source/dom/characterdata.cxx 
b/unoxml/source/dom/characterdata.cxx
index e8ac2aee7c23..0e929522546b 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -27,7 +27,7 @@
 
 #include 
 
-#include "../events/mutationevent.hxx"
+#include "mutationevent.hxx"
 
 using namespace css::uno;
 using namespace css::xml::dom;
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index bc2969c7abec..580926273758 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -34,11 +34,11 @@
 #include 
 #include 
 
-#include "../events/event.hxx"
-#include "../events/mutationevent.hxx"
-#include "../events/uievent.hxx"
-#include "../events/mouseevent.hxx"
-#include "../events/eventdispatcher.hxx"
+#include "event.hxx"
+#include "mutationevent.hxx"
+#include "uievent.hxx"
+#include "mouseevent.hxx"
+#include "eventdispatcher.hxx"
 
 #include 
 
diff --git a/unoxml/source/dom/element.cxx b/unoxml/