xmlfix3: unoxml: refactor CNode initialization

28 files changed, 146 insertions, 108 deletions

diff --git a/unoxml/source/dom/attr.cxx b/unoxml/source/dom/attr.cxx
index 1bbd5234e6a0..4b552db74029 100644
--- a/unoxml/source/dom/attr.cxx
+++ b/unoxml/source/dom/attr.cxx
@@ -33,10 +33,10 @@
 namespace DOM
 {
     CAttr::CAttr(const xmlAttrPtr pAttr)
+        : CAttr_Base(
+                NodeType_ATTRIBUTE_NODE, reinterpret_cast<xmlNodePtr>(pAttr))
+        , m_aAttrPtr(pAttr)
     {
-        m_aAttrPtr = pAttr;
-        m_aNodeType = NodeType_ATTRIBUTE_NODE;
-        init_node((xmlNodePtr)pAttr);
     }
 
     OUString SAL_CALL CAttr::getNodeName()
diff --git a/unoxml/source/dom/attr.hxx b/unoxml/source/dom/attr.hxx
index b79927b46037..2b47061c9dd7 100644
--- a/unoxml/source/dom/attr.hxx
+++ b/unoxml/source/dom/attr.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _ATTR_HXX
-#define _ATTR_HXX
+#ifndef DOM_ATTR_HXX
+#define DOM_ATTR_HXX
 
 #include <cppuhelper/implbase1.hxx>
 #include <com/sun/star/uno/Reference.h>
@@ -42,7 +42,10 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CAttr : public cppu::ImplInheritanceHelper1< CNode, XAttr >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XAttr > CAttr_Base;
+
+    class CAttr
+        : public CAttr_Base
     {
         friend class CNode;
         friend class CElement;
diff --git a/unoxml/source/dom/cdatasection.cxx b/unoxml/source/dom/cdatasection.cxx
index 7c775484770c..9f166b8cacf7 100644
--- a/unoxml/source/dom/cdatasection.cxx
+++ b/unoxml/source/dom/cdatasection.cxx
@@ -32,9 +32,8 @@
 namespace DOM
 {
     CCDATASection::CCDATASection(const xmlNodePtr aNodePtr)
+        : CCDATASection_Base(NodeType_CDATA_SECTION_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_CDATA_SECTION_NODE;
-        init_text(aNodePtr);
     }
 
     void SAL_CALL CCDATASection::saxify(
diff --git a/unoxml/source/dom/cdatasection.hxx b/unoxml/source/dom/cdatasection.hxx
index 400b2a6a02d3..f32773a4fe4d 100644
--- a/unoxml/source/dom/cdatasection.hxx
+++ b/unoxml/source/dom/cdatasection.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _CDATASECTION_HXX
-#define _CDATASECTION_HXX
+#ifndef DOM_CDATASECTION_HXX
+#define DOM_CDATASECTION_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -40,7 +40,11 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CCDATASection : public cppu::ImplInheritanceHelper1< CText, XCDATASection >
+    typedef ::cppu::ImplInheritanceHelper1< CText, XCDATASection >
+        CCDATASection_Base;
+
+    class CCDATASection
+        : public CCDATASection_Base
     {
         friend class CNode;
     protected:
diff --git a/unoxml/source/dom/characterdata.cxx b/unoxml/source/dom/characterdata.cxx
index 8a8407678272..cc76c203114f 100644
--- a/unoxml/source/dom/characterdata.cxx
+++ b/unoxml/source/dom/characterdata.cxx
@@ -33,8 +33,11 @@
 namespace DOM
 {
 
-    CCharacterData::CCharacterData()
-    {}
+    CCharacterData::CCharacterData(
+            NodeType const& reNodeType, xmlNodePtr const& rpNode)
+        : CCharacterData_Base(reNodeType, rpNode)
+    {
+    }
 
     void CCharacterData::_dispatchEvent(const OUString& prevValue, const OUString& newValue)
     {
@@ -49,11 +52,6 @@ namespace DOM
         dispatchSubtreeModified();
     }
 
-    void CCharacterData::init_characterdata(const xmlNodePtr aNodePtr)
-    {
-        init_node(aNodePtr);
-    }
-
     /**
     Append the string to the end of the character data of the node.
     */
diff --git a/unoxml/source/dom/characterdata.hxx b/unoxml/source/dom/characterdata.hxx
index 4ff1da570f7c..962749a4527a 100644
--- a/unoxml/source/dom/characterdata.hxx
+++ b/unoxml/source/dom/characterdata.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _CHARACTERDATA_HXX
-#define _CHARACTERDATA_HXX
+#ifndef DOM_CHARACTERDATA_HXX
+#define DOM_CHARACTERDATA_HXX
 
 #include <sal/types.h>
 #include <cppuhelper/implbase1.hxx>
@@ -45,13 +45,15 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CCharacterData : public cppu::ImplInheritanceHelper1< CNode, XCharacterData >
-    {
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XCharacterData >
+        CCharacterData_Base;
 
+    class CCharacterData
+        : public CCharacterData_Base
+    {
 
     protected:
-        CCharacterData();
-        void init_characterdata(const xmlNodePtr aNodePtr);
+        CCharacterData(NodeType const& reNodeType, xmlNodePtr const& rpNode);
         void _dispatchEvent(const OUString& prevValue, const OUString& newValue);
 
     public:
diff --git a/unoxml/source/dom/comment.cxx b/unoxml/source/dom/comment.cxx
index f0f14a2d944a..f01e8ae75f9d 100644
--- a/unoxml/source/dom/comment.cxx
+++ b/unoxml/source/dom/comment.cxx
@@ -32,9 +32,8 @@
 namespace DOM
 {
     CComment::CComment(const xmlNodePtr aNodePtr)
+        : CComment_Base(NodeType_COMMENT_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_COMMENT_NODE;
-        init_node(aNodePtr);
     }
 
     void SAL_CALL CComment::saxify(
diff --git a/unoxml/source/dom/comment.hxx b/unoxml/source/dom/comment.hxx
index 196c7460399e..cd8169662fa9 100644
--- a/unoxml/source/dom/comment.hxx
+++ b/unoxml/source/dom/comment.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _COMMENT_HXX
-#define _COMMENT_HXX
+#ifndef DOM_COMMENT_HXX
+#define DOM_COMMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -39,9 +39,14 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CComment : public cppu::ImplInheritanceHelper1< CCharacterData, XComment >
+    typedef ::cppu::ImplInheritanceHelper1< CCharacterData, XComment >
+        CComment_Base;
+
+    class CComment
+        : public CComment_Base
     {
         friend class CNode;
+
     protected:
         CComment(const xmlNodePtr aNodePtr);
 
diff --git a/unoxml/source/dom/document.cxx b/unoxml/source/dom/document.cxx
index 6abf780d10d8..3cc5b4444f62 100644
--- a/unoxml/source/dom/document.cxx
+++ b/unoxml/source/dom/document.cxx
@@ -58,13 +58,12 @@ namespace DOM
         xmlFreeDoc(m_aDocPtr);
     }
 
-    CDocument::CDocument(xmlDocPtr aDocPtr):
-        m_aDocPtr(aDocPtr),
-        m_streamListeners()
+    CDocument::CDocument(xmlDocPtr aDocPtr)
+        : CDocument_Base(
+                NodeType_DOCUMENT_NODE, reinterpret_cast<xmlNodePtr>(aDocPtr))
+        , m_aDocPtr(aDocPtr)
+        , m_streamListeners()
     {
-        // init node base
-        m_aNodeType = NodeType_DOCUMENT_NODE;
-        init_node((xmlNodePtr)m_aDocPtr);
     }
 
     void SAL_CALL CDocument::saxify(
diff --git a/unoxml/source/dom/document.hxx b/unoxml/source/dom/document.hxx
index 3fe593ff2b24..92793cecc308 100644
--- a/unoxml/source/dom/document.hxx
+++ b/unoxml/source/dom/document.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _DOCUMENT_HXX
-#define _DOCUMENT_HXX
+#ifndef DOM_DOCUMENT_HXX
+#define DOM_DOCUMENT_HXX
 
 #include <list>
 #include <set>
@@ -66,10 +66,14 @@ using namespace com::sun::star::xml::dom::events;
 
 namespace DOM
 {
-
-    class CDocument : public cppu::ImplInheritanceHelper6<
-        CNode, XDocument, XDocumentEvent,
-        XActiveDataControl, XActiveDataSource, XSAXSerializable, XFastSAXSerializable>
+    typedef ::cppu::ImplInheritanceHelper6<
+            CNode, XDocument, XDocumentEvent,
+            XActiveDataControl, XActiveDataSource,
+            XSAXSerializable, XFastSAXSerializable>
+        CDocument_Base;
+
+    class CDocument
+        : public CDocument_Base
     {
         friend class CNode;
         typedef set< Reference< XStreamListener > > listenerlist_t;
diff --git a/unoxml/source/dom/documentfragment.cxx b/unoxml/source/dom/documentfragment.cxx
index a3f5ac40b5aa..e6ca5f140f27 100644
--- a/unoxml/source/dom/documentfragment.cxx
+++ b/unoxml/source/dom/documentfragment.cxx
@@ -30,10 +30,10 @@
 namespace DOM
 {
     CDocumentFragment::CDocumentFragment(const xmlNodePtr aNodePtr)
+        : CDocumentFragment_Base(NodeType_DOCUMENT_FRAGMENT_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_DOCUMENT_FRAGMENT_NODE;
-        init_node(aNodePtr);
     }
+
     OUString SAL_CALL CDocumentFragment::getNodeName()throw (RuntimeException)
     {
         return OUString::createFromAscii("#document-fragment");
diff --git a/unoxml/source/dom/documentfragment.hxx b/unoxml/source/dom/documentfragment.hxx
index 7649f6368c9a..8ea1e38a0d8a 100644
--- a/unoxml/source/dom/documentfragment.hxx
+++ b/unoxml/source/dom/documentfragment.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _DOCUMENTFRAGMENT_HXX
-#define _DOCUMENTFRAGMENT_HXX
+#ifndef DOM_DOCUMENTFRAGMENT_HXX
+#define DOM_DOCUMENTFRAGMENT_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -40,7 +40,11 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CDocumentFragment : public cppu::ImplInheritanceHelper1< CNode, XDocumentFragment >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XDocumentFragment >
+        CDocumentFragment_Base;
+
+    class CDocumentFragment
+        : public CDocumentFragment_Base
     {
         friend class CNode;
     protected:
diff --git a/unoxml/source/dom/documenttype.cxx b/unoxml/source/dom/documenttype.cxx
index bc5004dfd23c..132991781b5d 100644
--- a/unoxml/source/dom/documenttype.cxx
+++ b/unoxml/source/dom/documenttype.cxx
@@ -35,10 +35,10 @@ namespace DOM
 {
 
     CDocumentType::CDocumentType(const xmlDtdPtr aDtdPtr)
+        : CDocumentType_Base(
+            NodeType_DOCUMENT_TYPE_NODE, reinterpret_cast<xmlNodePtr>(aDtdPtr))
+        , m_aDtdPtr(aDtdPtr)
     {
-        m_aNodeType = NodeType_DOCUMENT_TYPE_NODE;
-        m_aDtdPtr = aDtdPtr;
-        init_node((xmlNodePtr)aDtdPtr);
     }
 
     /**
diff --git a/unoxml/source/dom/documenttype.hxx b/unoxml/source/dom/documenttype.hxx
index 4ea6d0c89219..fd4859ab0d2f 100644
--- a/unoxml/source/dom/documenttype.hxx
+++ b/unoxml/source/dom/documenttype.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _DOCUMENTTYPE_HXX
-#define _DOCUMENTTYPE_HXX
+#ifndef DOM_DOCUMENTTYPE_HXX
+#define DOM_DOCUMENTTYPE_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Reference.h>
@@ -45,7 +45,11 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CDocumentType : public cppu::ImplInheritanceHelper1< CNode, XDocumentType >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XDocumentType >
+        CDocumentType_Base;
+
+    class CDocumentType
+        : public CDocumentType_Base
     {
         friend class CNode;
     private:
diff --git a/unoxml/source/dom/element.cxx b/unoxml/source/dom/element.cxx
index 8006a4f5ef41..c0975e70875e 100644
--- a/unoxml/source/dom/element.cxx
+++ b/unoxml/source/dom/element.cxx
@@ -42,9 +42,8 @@ namespace DOM
 {
 
     CElement::CElement(const xmlNodePtr aNodePtr)
+        : CElement_Base(NodeType_ELEMENT_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_ELEMENT_NODE;
-        init_node(aNodePtr);
     }
 
     void SAL_CALL CElement::saxify(
diff --git a/unoxml/source/dom/element.hxx b/unoxml/source/dom/element.hxx
index d0df7102f12f..b708ed23617a 100644
--- a/unoxml/source/dom/element.hxx
+++ b/unoxml/source/dom/element.hxx
@@ -25,8 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _ELEMENT_HXX
-#define _ELEMENT_HXX
+#ifndef DOM_ELEMENT_HXX
+#define DOM_ELEMENT_HXX
+
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/xml/dom/XNode.hpp>
@@ -42,7 +43,10 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CElement : public cppu::ImplInheritanceHelper1<CNode, XElement >
+    typedef ::cppu::ImplInheritanceHelper1<CNode, XElement > CElement_Base;
+
+    class CElement
+        : public CElement_Base
     {
         friend class CNode;
     private:
diff --git a/unoxml/source/dom/entity.cxx b/unoxml/source/dom/entity.cxx
index de711ae62d8d..5af71fa896e3 100644
--- a/unoxml/source/dom/entity.cxx
+++ b/unoxml/source/dom/entity.cxx
@@ -33,10 +33,10 @@ namespace DOM
 {
 
     CEntity::CEntity(const xmlEntityPtr aEntityPtr)
+        : CEntity_Base(
+            NodeType_ENTITY_NODE, reinterpret_cast<xmlNodePtr>(aEntityPtr))
+        , m_aEntityPtr(aEntityPtr)
     {
-        m_aNodeType = NodeType_ENTITY_NODE;
-        m_aEntityPtr = aEntityPtr;
-        init_node((xmlNodePtr)aEntityPtr);
     }
 
     /**
diff --git a/unoxml/source/dom/entity.hxx b/unoxml/source/dom/entity.hxx
index 0343a13dda16..2c879e18ea9b 100644
--- a/unoxml/source/dom/entity.hxx
+++ b/unoxml/source/dom/entity.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _ENTITY_HXX
-#define _ENTITY_HXX
+#ifndef DOM_ENTITY_HXX
+#define DOM_ENTITY_HXX
 
 #include <sal/types.h>
 #include <com/sun/star/uno/Reference.h>
@@ -42,7 +42,10 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CEntity : public cppu::ImplInheritanceHelper1< CNode, XEntity >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XEntity > CEntity_Base;
+
+    class CEntity
+        : public CEntity_Base
     {
         friend class CNode;
     private:
diff --git a/unoxml/source/dom/entityreference.cxx b/unoxml/source/dom/entityreference.cxx
index 6cdce0c8ed3d..c6fc07fe6b88 100644
--- a/unoxml/source/dom/entityreference.cxx
+++ b/unoxml/source/dom/entityreference.cxx
@@ -30,11 +30,11 @@
 
 namespace DOM
 {
-  CEntityReference::CEntityReference(const xmlNodePtr aNodePtr)
+    CEntityReference::CEntityReference(const xmlNodePtr aNodePtr)
+        : CEntityReference_Base(NodeType_ENTITY_REFERENCE_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_ENTITY_REFERENCE_NODE;
-        init_node(aNodePtr);
     }
+
     OUString SAL_CALL CEntityReference::getNodeName()throw (RuntimeException)
     {
        OUString aName;
diff --git a/unoxml/source/dom/entityreference.hxx b/unoxml/source/dom/entityreference.hxx
index 1ab8217bc628..5ebe5cd7be0e 100644
--- a/unoxml/source/dom/entityreference.hxx
+++ b/unoxml/source/dom/entityreference.hxx
@@ -25,8 +25,9 @@
  *
  ************************************************************************/
 
-#ifndef _ENTITYREFERENCE_HXX
-#define _ENTITYREFERENCE_HXX
+#ifndef DOM_ENTITYREFERENCE_HXX
+#define DOM_ENTITYREFERENCE_HXX
+
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
 #include <com/sun/star/xml/dom/XEntityReference.hpp>
@@ -39,7 +40,11 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CEntityReference : public cppu::ImplInheritanceHelper1< CNode, XEntityReference >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XEntityReference >
+        CEntityReference_Base;
+
+    class CEntityReference
+        : public CEntityReference_Base
     {
         friend class CNode;
     protected:
diff --git a/unoxml/source/dom/node.cxx b/unoxml/source/dom/node.cxx
index f122b62dd9e2..776158bab190 100644
--- a/unoxml/source/dom/node.cxx
+++ b/unoxml/source/dom/node.cxx
@@ -277,20 +277,17 @@ namespace DOM
       return 0;
     }
 
-    CNode::CNode()
-        :   m_bUnlinked(false)
-        ,   m_aNodePtr(0)
-    {
-    }
-
-    void CNode::init_node(const xmlNodePtr aNode)
-    {
-        m_aNodePtr = aNode;
 
+    CNode::CNode(NodeType const& reNodeType, xmlNodePtr const& rpNode)
+        :   m_bUnlinked(false)
+        ,   m_aNodeType(reNodeType)
+        ,   m_aNodePtr(rpNode)
         // keep containing document alive
-        // (if we are not that document ourselves)
-        if (m_aNodePtr->type != XML_DOCUMENT_NODE)
-            m_rDocument = getOwnerDocument();
+        // (but not if this is a document; that would create a leak!)
+        ,   m_xDocument( (m_aNodePtr->type != XML_DOCUMENT_NODE)
+                ? getOwnerDocument() : 0 )
+    {
+        OSL_ASSERT(m_aNodePtr);
     }
 
     void CNode::invalidate()
diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx
index b61788649a37..45730f4bc6aa 100644
--- a/unoxml/source/dom/node.hxx
+++ b/unoxml/source/dom/node.hxx
@@ -127,14 +127,14 @@ namespace DOM
         bool m_bUnlinked; /// node has been removed from document
 
     protected:
-        NodeType m_aNodeType;
+        NodeType const m_aNodeType;
+        /// libxml node; NB: not const, because invalidate may reset it to 0!
         xmlNodePtr m_aNodePtr;
 
-        Reference< XDocument > m_rDocument;
+        Reference< XDocument > const m_xDocument;
 
         // for initialization by classes derived through ImplInheritanceHelper
-        CNode();
-        void init_node(const xmlNodePtr aNode);
+        CNode(NodeType const& reNodeType, xmlNodePtr const& rpNode);
         void invalidate();
 
         void dispatchSubtreeModified();
diff --git a/unoxml/source/dom/notation.cxx b/unoxml/source/dom/notation.cxx
index 9781b6877eef..f380b856ecf0 100644
--- a/unoxml/source/dom/notation.cxx
+++ b/unoxml/source/dom/notation.cxx
@@ -31,10 +31,10 @@
 namespace DOM
 {
     CNotation::CNotation(const xmlNotationPtr aNotationPtr)
+        : CNotation_Base(
+            NodeType_NOTATION_NODE, reinterpret_cast<xmlNodePtr>(aNotationPtr))
+        , m_aNotationPtr(aNotationPtr)
     {
-        m_aNodeType = NodeType_NOTATION_NODE;
-        m_aNotationPtr = aNotationPtr;
-        init_node((xmlNodePtr)aNotationPtr);
     }
 
     OUString SAL_CALL CNotation::getPublicId() throw (RuntimeException)
diff --git a/unoxml/source/dom/notation.hxx b/unoxml/source/dom/notation.hxx
index a8fdf7994fc4..d7ce54a64646 100644
--- a/unoxml/source/dom/notation.hxx
+++ b/unoxml/source/dom/notation.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _NOTATION_HXX
-#define _NOTATION_HXX
+#ifndef DOM_NOTATION_HXX
+#define DOM_NOTATION_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -40,7 +40,10 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CNotation : public cppu::ImplInheritanceHelper1< CNode, XNotation >
+    typedef cppu::ImplInheritanceHelper1< CNode, XNotation > CNotation_Base;
+
+    class CNotation
+        : public CNotation_Base
     {
         friend class CNode;
     private:
diff --git a/unoxml/source/dom/processinginstruction.cxx b/unoxml/source/dom/processinginstruction.cxx
index 37e52086cbd8..5f39174cf50f 100644
--- a/unoxml/source/dom/processinginstruction.cxx
+++ b/unoxml/source/dom/processinginstruction.cxx
@@ -32,9 +32,9 @@
 namespace DOM
 {
     CProcessingInstruction::CProcessingInstruction(const xmlNodePtr aNodePtr)
+        : CProcessingInstruction_Base(
+            NodeType_PROCESSING_INSTRUCTION_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_PROCESSING_INSTRUCTION_NODE;
-        init_node(aNodePtr);
     }
 
     void SAL_CALL CProcessingInstruction::saxify(
diff --git a/unoxml/source/dom/processinginstruction.hxx b/unoxml/source/dom/processinginstruction.hxx
index b794d31e159d..d8546d28a2c6 100644
--- a/unoxml/source/dom/processinginstruction.hxx
+++ b/unoxml/source/dom/processinginstruction.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _PROCESSINGINSTRUCTION_HXX
-#define _PROCESSINGINSTRUCTION_HXX
+#ifndef DOM_PROCESSINGINSTRUCTION_HXX
+#define DOM_PROCESSINGINSTRUCTION_HXX
 
 #include <com/sun/star/uno/Reference.h>
 #include <com/sun/star/uno/Exception.hpp>
@@ -40,7 +40,11 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CProcessingInstruction : public cppu::ImplInheritanceHelper1< CNode, XProcessingInstruction >
+    typedef ::cppu::ImplInheritanceHelper1< CNode, XProcessingInstruction >
+        CProcessingInstruction_Base;
+
+    class CProcessingInstruction
+        : public CProcessingInstruction_Base
     {
         friend class CNode;
 
diff --git a/unoxml/source/dom/text.cxx b/unoxml/source/dom/text.cxx
index d60fcf234ebf..5e8cf47225c2 100644
--- a/unoxml/source/dom/text.cxx
+++ b/unoxml/source/dom/text.cxx
@@ -26,12 +26,17 @@
  ************************************************************************/
 
 #include "text.hxx"
+
 namespace DOM
 {
+    CText::CText(NodeType const& reNodeType, xmlNodePtr const& rpNode)
+        : CText_Base(reNodeType, rpNode)
+    {
+    }
+
     CText::CText(const xmlNodePtr aNodePtr)
+        : CText_Base(NodeType_TEXT_NODE, aNodePtr)
     {
-        m_aNodeType = NodeType_TEXT_NODE;
-        init_characterdata(aNodePtr);
     }
 
     void SAL_CALL CText::saxify(
@@ -40,11 +45,6 @@ namespace DOM
         i_xHandler->characters(getData());
     }
 
-    void CText::init_text(const xmlNodePtr aNodePtr)
-    {
-        init_characterdata(aNodePtr);
-    }
-
   Reference< XText > SAL_CALL CText::splitText(sal_Int32 /*offset*/)
              throw (RuntimeException)
     {
diff --git a/unoxml/source/dom/text.hxx b/unoxml/source/dom/text.hxx
index a99f4ff2aa5d..58b7e16e7d59 100644
--- a/unoxml/source/dom/text.hxx
+++ b/unoxml/source/dom/text.hxx
@@ -25,8 +25,8 @@
  *
  ************************************************************************/
 
-#ifndef _TEXT_HXX
-#define _TEXT_HXX
+#ifndef DOM_TEXT_HXX
+#define DOM_TEXT_HXX
 
 #include <sal/types.h>
 #include <cppuhelper/implbase1.hxx>
@@ -45,14 +45,16 @@ using namespace com::sun::star::xml::dom;
 
 namespace DOM
 {
-    class CText : public cppu::ImplInheritanceHelper1< CCharacterData, XText >
+    typedef ::cppu::ImplInheritanceHelper1< CCharacterData, XText > CText_Base;
+
+    class CText
+        : public CText_Base
     {
         friend class CNode;
 
     protected:
-        CText(){}
+        CText(NodeType const& reNodeType, xmlNodePtr const& rpNode);
         CText(const xmlNodePtr aNodePtr);
-        void init_text(const xmlNodePtr aNodePtr);
 
     public: