3 files changed, 12 insertions, 13 deletions
diff --git a/sw/inc/htmltbl.hxx b/sw/inc/htmltbl.hxx
index 622557ab81e2..8f289c39d35d 100644
--- a/sw/inc/htmltbl.hxx
+++ b/sw/inc/htmltbl.hxx
@@ -233,7 +233,7 @@ class SwHTMLTableLayout
 
     const SwStartNode *GetAnyBoxStartNode() const;
     SwFrameFormat *FindFlyFrameFormat() const;
-    const SwDoc *GetDoc() const { return GetAnyBoxStartNode()->GetDoc(); }
+    const SwDoc *GetDoc() const { return &GetAnyBoxStartNode()->GetDoc(); }
 
     void Resize_( sal_uInt16 nAbsAvail, bool bRecalc );
 
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index d3cb879275de..c8c1c704f00f 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -207,8 +207,16 @@ public:
     /// Node is in which nodes-array/doc?
     inline          SwNodes& GetNodes();
     inline const  SwNodes& GetNodes() const;
-    inline            SwDoc* GetDoc();
-    inline const  SwDoc* GetDoc() const;
+
+    SwDoc& GetDoc()
+    {
+        return GetNodes().GetDoc();
+    }
+
+    const SwDoc& GetDoc() const
+    {
+        return GetNodes().GetDoc();
+    }
 
     /** Provides access to the document setting interface
      */
@@ -699,15 +707,6 @@ inline const SwNodes& SwNode::GetNodes() const
     return static_cast<SwNodes&>(GetArray());
 }
 
-inline SwDoc* SwNode::GetDoc()
-{
-    return &GetNodes().GetDoc();
-}
-inline const SwDoc* SwNode::GetDoc() const
-{
-    return &GetNodes().GetDoc();
-}
-
 inline SwFormatColl* SwContentNode::GetCondFormatColl() const
 {
     return m_pCondColl;
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index f94c796d1bfb..6c87f3559b78 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -240,7 +240,7 @@ public:
     void Normalize(bool bPointFirst = true);
 
     /// @return the document (SwDoc) at which the PaM is registered
-    SwDoc* GetDoc() const   { return m_pPoint->nNode.GetNode().GetDoc(); }
+    SwDoc* GetDoc() const   { return &m_pPoint->nNode.GetNode().GetDoc(); }
 
           SwPosition& GetBound( bool bOne = true )
                             { return bOne ? m_Bound1 : m_Bound2; }