xmlfix3: unoxml: cleanup friend declarations

8 files changed, 10 insertions, 23 deletions

diff --git a/unoxml/source/dom/attributesmap.cxx b/unoxml/source/dom/attributesmap.cxx
index fbd613fcc2fb..229324823f63 100644
--- a/unoxml/source/dom/attributesmap.cxx
+++ b/unoxml/source/dom/attributesmap.cxx
@@ -50,7 +50,7 @@ namespace DOM
         ::osl::MutexGuard const g(m_rMutex);
 
         sal_Int32 count = 0;
-        xmlNodePtr pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             xmlAttrPtr cur = pNode->properties;
@@ -72,7 +72,7 @@ namespace DOM
         ::osl::MutexGuard const g(m_rMutex);
 
         Reference< XNode > aNode;
-        xmlNodePtr pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8);
@@ -104,7 +104,7 @@ namespace DOM
         ::osl::MutexGuard const g(m_rMutex);
 
         Reference< XNode > aNode;
-        xmlNodePtr pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8);
@@ -138,7 +138,7 @@ namespace DOM
         ::osl::MutexGuard const g(m_rMutex);
 
         Reference< XNode > aNode;
-        xmlNodePtr pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             xmlAttrPtr cur = pNode->properties;
@@ -168,7 +168,7 @@ namespace DOM
     {
         ::osl::MutexGuard const g(m_rMutex);
 
-        xmlNodePtr const pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr const pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             OString o1 = OUStringToOString(name, RTL_TEXTENCODING_UTF8);
@@ -201,7 +201,7 @@ namespace DOM
     {
         ::osl::MutexGuard const g(m_rMutex);
 
-        xmlNodePtr const pNode = m_pElement->m_aNodePtr;
+        xmlNodePtr const pNode = m_pElement->GetNodePtr();
         if (pNode != NULL)
         {
             OString o1 = OUStringToOString(localName, RTL_TEXTENCODING_UTF8);
diff --git a/unoxml/source/dom/childlist.cxx b/unoxml/source/dom/childlist.cxx
index bb1f4962aff1..3c80c664204e 100644
--- a/unoxml/source/dom/childlist.cxx
+++ b/unoxml/source/dom/childlist.cxx
@@ -52,7 +52,7 @@ namespace DOM
         sal_Int32 length = 0;
         if (m_pNode != NULL)
         {
-            xmlNodePtr cur = m_pNode->m_aNodePtr;
+            xmlNodePtr cur = m_pNode->GetNodePtr();
             if (0 != cur) {
                 cur = cur->children;
             }
@@ -75,7 +75,7 @@ namespace DOM
 
         if (m_pNode != NULL)
         {
-            xmlNodePtr cur = m_pNode->m_aNodePtr;
+            xmlNodePtr cur = m_pNode->GetNodePtr();
             if (0 != cur) {
                 cur = cur->children;
             }
diff --git a/unoxml/source/dom/elementlist.cxx b/unoxml/source/dom/elementlist.cxx
index 6ee0e3fce3ab..d2df2f1d7b90 100644
--- a/unoxml/source/dom/elementlist.cxx
+++ b/unoxml/source/dom/elementlist.cxx
@@ -116,7 +116,7 @@ namespace DOM
         ::osl::MutexGuard const g(m_rMutex);
 
         // this has to be 'live'
-        buildlist(static_cast<const CNode*>(m_pElement.get())->m_aNodePtr);
+        buildlist(m_pElement->GetNodePtr());
         return m_nodevector.size();
     }
     /**
@@ -129,7 +129,7 @@ namespace DOM
 
         ::osl::MutexGuard const g(m_rMutex);
 
-        buildlist(static_cast<const CNode*>(m_pElement.get())->m_aNodePtr);
+        buildlist(m_pElement->GetNodePtr());
         if (m_nodevector.size() <= static_cast<size_t>(index)) {
             throw RuntimeException();
         }
diff --git a/unoxml/source/dom/node.hxx b/unoxml/source/dom/node.hxx
index 0e6a4834a33e..37051d4f2f82 100644
--- a/unoxml/source/dom/node.hxx
+++ b/unoxml/source/dom/node.hxx
@@ -118,10 +118,6 @@ namespace DOM
         friend class CDocument;
         friend class CElement;
         friend class CAttributesMap;
-        friend class CChildList;
-        friend class CElementList;
-        friend class CEntitiesMap;
-        friend class CNotationsMap;
 
     private:
         bool m_bUnlinked; /// node has been removed from document
diff --git a/unoxml/source/events/event.hxx b/unoxml/source/events/event.hxx
index dd6619542feb..0336be16412f 100644
--- a/unoxml/source/events/event.hxx
+++ b/unoxml/source/events/event.hxx
@@ -50,12 +50,6 @@ namespace DOM {namespace events
 class CEvent : public cppu::WeakImplHelper1< XEvent >
 {
 friend class CEventDispatcher;
-friend class CNode;
-friend class CDocument;
-friend class CElement;
-friend class CText;
-friend class CCharacterData;
-friend class CAttr;
 
 protected:
     ::osl::Mutex m_Mutex;
diff --git a/unoxml/source/events/mouseevent.hxx b/unoxml/source/events/mouseevent.hxx
index 483ea3a6650c..0bbcbf7698b7 100644
--- a/unoxml/source/events/mouseevent.hxx
+++ b/unoxml/source/events/mouseevent.hxx
@@ -46,7 +46,6 @@ typedef ::cppu::ImplInheritanceHelper1< CUIEvent, XMouseEvent >
 class CMouseEvent
     : public CMouseEvent_Base
 {
-    friend class CEventDispatcher;
 protected:
     sal_Int32 m_screenX;
     sal_Int32 m_screenY;
diff --git a/unoxml/source/events/mutationevent.hxx b/unoxml/source/events/mutationevent.hxx
index 89c484a57e85..20b8dbf4523a 100644
--- a/unoxml/source/events/mutationevent.hxx
+++ b/unoxml/source/events/mutationevent.hxx
@@ -51,7 +51,6 @@ typedef ::cppu::ImplInheritanceHelper1< CEvent, XMutationEvent >
 class CMutationEvent
     : public CMutationEvent_Base
 {
-    friend class CEventDispatcher;
 protected:
     Reference< XNode > m_relatedNode;
     OUString m_prevValue;
diff --git a/unoxml/source/events/uievent.hxx b/unoxml/source/events/uievent.hxx
index 2a33c5d696c5..2f1c6f28dc3d 100644
--- a/unoxml/source/events/uievent.hxx
+++ b/unoxml/source/events/uievent.hxx
@@ -49,7 +49,6 @@ typedef ::cppu::ImplInheritanceHelper1< CEvent, XUIEvent > CUIEvent_Base;
 class CUIEvent
     : public CUIEvent_Base
 {
-    friend class CEventDispatcher;
 protected:
     sal_Int32 m_detail;
     Reference< XAbstractView > m_view;