loplugin:staticmethods

Change-Id: I90dd921077bbfc57200e398e7959306f26c65cfe

22 files changed, 57 insertions, 61 deletions

diff --git a/sw/source/core/doc/CntntIdxStore.cxx b/sw/source/core/doc/CntntIdxStore.cxx
index 25d4ca3ec8f1..79bf10cd1897 100644
--- a/sw/source/core/doc/CntntIdxStore.cxx
+++ b/sw/source/core/doc/CntntIdxStore.cxx
@@ -183,9 +183,9 @@ namespace
             inline void RestoreUnoCrsrs(updater_t& rUpdater);
             inline void SaveShellCrsrs(SwDoc* pDoc, sal_uLong nNode, sal_Int32 nCntnt);
             inline void RestoreShellCrsrs(updater_t& rUpdater);
-            inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
+            static inline const SwPosition& GetRightMarkPos(::sw::mark::IMark* pMark, bool bOther)
                 { return bOther ? pMark->GetOtherMarkPos() : pMark->GetMarkPos(); };
-            inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
+            static inline void SetRightMarkPos(MarkBase* pMark, bool bOther, const SwPosition* const pPos)
                 { bOther ? pMark->SetOtherMarkPos(*pPos) : pMark->SetMarkPos(*pPos); };
     };
     static inline void lcl_ChkPaM( std::vector<PaMEntry>& rPaMEntries, const sal_uLong nNode, const sal_Int32 nCntnt, SwPaM& rPaM, const bool bPoint)
diff --git a/sw/source/core/doc/DocumentContentOperationsManager.cxx b/sw/source/core/doc/DocumentContentOperationsManager.cxx
index e940caf60a96..562b54ebb628 100644
--- a/sw/source/core/doc/DocumentContentOperationsManager.cxx
+++ b/sw/source/core/doc/DocumentContentOperationsManager.cxx
@@ -1653,7 +1653,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
         {
             ::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
-            SwStartNode* pSttNd = pDoc->GetNodes().MakeEmptySection(
+            SwStartNode* pSttNd = SwNodes::MakeEmptySection(
                                 SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ));
             aPam.GetPoint()->nNode = *pSttNd->EndOfSectionNode();
             // copy without Frames
@@ -1661,8 +1661,7 @@ DocumentContentOperationsManager::CopyRange( SwPaM& rPam, SwPosition& rPos, cons
 
             aPam.GetPoint()->nNode = pDoc->GetNodes().GetEndOfAutotext();
             aPam.SetMark();
-            SwCntntNode* pNode =
-                pDoc->GetNodes().GoPrevious( &aPam.GetMark()->nNode );
+            SwCntntNode* pNode = SwNodes::GoPrevious( &aPam.GetMark()->nNode );
             pNode->MakeEndIndex( &aPam.GetMark()->nContent );
 
             aPam.GetPoint()->nNode = *aPam.GetNode().StartOfSectionNode();
@@ -1727,7 +1726,7 @@ void DocumentContentOperationsManager::DeleteSection( SwNode *pNode )
     {
         // move all Crsr/StkCrsr/UnoCrsr out of the to-be-deleted area
         SwNodeIndex aMvStt( aSttIdx, 1 );
-        m_rDoc.CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true );
+        SwDoc::CorrAbs( aMvStt, aEndIdx, SwPosition( aSttIdx ), true );
     }
 
     m_rDoc.GetNodes().DelNodes( aSttIdx, aEndIdx.GetIndex() - aSttIdx.GetIndex() + 1 );
@@ -1841,7 +1840,7 @@ bool DocumentContentOperationsManager::DelFullPara( SwPaM& rPam )
         }
         else
         {
-            m_rDoc.CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true );
+            SwDoc::CorrAbs( aRg.aStart, aRg.aEnd, *rPam.GetPoint(), true );
         }
 
             // What's with Flys?
@@ -2571,7 +2570,7 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg,
 {
     if( !pFrmFmt )
         pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
-    SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode(
+    SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfName, rFltName, pGraphic,
                             m_rDoc.GetDfltGrfFmtColl() );
@@ -2587,7 +2586,7 @@ SwFlyFrmFmt* DocumentContentOperationsManager::Insert( const SwPaM &rRg, const G
 {
     if( !pFrmFmt )
         pFrmFmt = m_rDoc.getIDocumentStylePoolAccess().GetFrmFmtFromPool( RES_POOLFRM_GRAPHIC );
-    SwGrfNode* pSwGrfNode = m_rDoc.GetNodes().MakeGrfNode(
+    SwGrfNode* pSwGrfNode = SwNodes::MakeGrfNode(
                             SwNodeIndex( m_rDoc.GetNodes().GetEndOfAutotext() ),
                             rGrfObj, m_rDoc.GetDfltGrfFmtColl() );
     SwFlyFrmFmt* pSwFlyFrmFmt = _InsNoTxtNode( *rRg.GetPoint(), pSwGrfNode,
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index 847a96b1d0b5..a3fe65064e19 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1330,9 +1330,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
                     {
                         bChgd = true;
                         SwAuthorField* pAuthorFld = static_cast<SwAuthorField*>(pFmtFld->GetField());
-                        pAuthorFld->SetExpansion( static_cast<SwAuthorFieldType*>(
-                                    pAuthorFld->GetTyp())->Expand(
-                                                pAuthorFld->GetFormat() ) );
+                        pAuthorFld->SetExpansion( SwAuthorFieldType::Expand( pAuthorFld->GetFormat() ) );
                     }
                     break;
 
@@ -1341,8 +1339,7 @@ void DocumentFieldsManager::SetFixFields( bool bOnlyTimeDate, const DateTime* pN
                     {
                         bChgd = true;
                         SwExtUserField* pExtUserFld = static_cast<SwExtUserField*>(pFmtFld->GetField());
-                        pExtUserFld->SetExpansion( static_cast<SwExtUserFieldType*>(
-                                    pExtUserFld->GetTyp())->Expand(
+                        pExtUserFld->SetExpansion( SwExtUserFieldType::Expand(
                                             pExtUserFld->GetSubType(),
                                             pExtUserFld->GetFormat()));
                     }
diff --git a/sw/source/core/doc/DocumentLayoutManager.cxx b/sw/source/core/doc/DocumentLayoutManager.cxx
index fbb264665d4a..ad23762a0c85 100644
--- a/sw/source/core/doc/DocumentLayoutManager.cxx
+++ b/sw/source/core/doc/DocumentLayoutManager.cxx
@@ -399,7 +399,7 @@ SwFrmFmt *DocumentLayoutManager::CopyLayoutFmt(
         SwNodeRange aRg( rCSttNd, 1, *rCSttNd.EndOfSectionNode() );
 
         SwNodeIndex aIdx( m_rDoc.GetNodes().GetEndOfAutotext() );
-        SwStartNode* pSttNd = m_rDoc.GetNodes().MakeEmptySection( aIdx, SwFlyStartNode );
+        SwStartNode* pSttNd = SwNodes::MakeEmptySection( aIdx, SwFlyStartNode );
 
         // Set the Anchor/CntntIndex first.
         // Within the copying part, we can access the values (DrawFmt in Headers and Footers)
diff --git a/sw/source/core/doc/DocumentRedlineManager.cxx b/sw/source/core/doc/DocumentRedlineManager.cxx
index 38918b0320c0..eda520584d73 100644
--- a/sw/source/core/doc/DocumentRedlineManager.cxx
+++ b/sw/source/core/doc/DocumentRedlineManager.cxx
@@ -2347,7 +2347,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
         if( !pEnd->nNode.GetNode().IsCntntNode() )
         {
             SwNodeIndex aTmp( pEnd->nNode );
-            SwCntntNode* pCNd = m_rDoc.GetNodes().GoPrevSection( &aTmp );
+            SwCntntNode* pCNd = SwNodes::GoPrevSection( &aTmp );
             if( !pCNd || ( aTmp == rSttPos.nNode &&
                 pCNd->Len() == rSttPos.nContent.GetIndex() ))
                 pFnd = 0;
@@ -2416,7 +2416,7 @@ const SwRangeRedline* DocumentRedlineManager::SelNextRedline( SwPaM& rPam ) cons
             {
                 pIdx = &rPam.GetPoint()->nNode;
                 if( !pIdx->GetNode().IsCntntNode() &&
-                    0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) )
+                    0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
                 {
                     if( *pIdx >= rPam.GetMark()->nNode )
                         rPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
@@ -2525,7 +2525,7 @@ const SwRangeRedline* DocumentRedlineManager::SelPrevRedline( SwPaM& rPam ) cons
             SwCntntNode* pCNd;
             SwNodeIndex* pIdx = &rPam.GetMark()->nNode;
             if( !pIdx->GetNode().IsCntntNode() &&
-                0 != ( pCNd = m_rDoc.GetNodes().GoPrevSection( pIdx )) )
+                0 != ( pCNd = SwNodes::GoPrevSection( pIdx )) )
             {
                 if( *pIdx >= rPam.GetPoint()->nNode )
                     rPam.GetMark()->nContent.Assign( pCNd, pCNd->Len() );
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index eaf04103ca09..80de11eebe8d 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -1406,7 +1406,7 @@ bool SwDoc::RemoveInvisibleContent()
                         aPam.GetPoint()->nContent.Assign( pCNd, 0 );
                         aPam.SetMark();
                         aPam.GetPoint()->nNode = *pSectNd->EndOfSectionNode();
-                        pCNd = GetNodes().GoPrevious(
+                        pCNd = SwNodes::GoPrevious(
                                                 &aPam.GetPoint()->nNode );
                         aPam.GetPoint()->nContent.Assign( pCNd, pCNd->Len() );
 
@@ -1539,7 +1539,7 @@ bool SwDoc::ConvertFieldsToText()
                     if (pTxtField && pTxtField->Which() == RES_TXTATR_INPUTFIELD)
                     {
                         SwPosition &rEndPos = *aInsertPam.GetPoint();
-                        rEndPos.nContent = GetDocShell()->GetWrtShell()->EndOfInputFldAtPos( *aInsertPam.End() );
+                        rEndPos.nContent = SwCrsrShell::EndOfInputFldAtPos( *aInsertPam.End() );
                     }
                     else
                     {
@@ -1637,7 +1637,7 @@ void SwDoc::ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew)
     }
 }
 
-OUString SwDoc::GetPaMDescr(const SwPaM & rPam) const
+OUString SwDoc::GetPaMDescr(const SwPaM & rPam)
 {
     if (&rPam.GetNode(true) == &rPam.GetNode(false))
     {
diff --git a/sw/source/core/doc/docbm.cxx b/sw/source/core/doc/docbm.cxx
index a7ed67a63426..ea6621ca0cae 100644
--- a/sw/source/core/doc/docbm.cxx
+++ b/sw/source/core/doc/docbm.cxx
@@ -131,7 +131,7 @@ namespace
         if ( pNode == NULL )
         {
             SwNodeIndex aStt = SwNodeIndex(rStt);
-            pNode = rStt.GetNodes().GoPrevious(&aStt);
+            pNode = SwNodes::GoPrevious(&aStt);
             bPosAtEndOfNode = true;
         }
         if ( pNode != NULL )
@@ -1344,7 +1344,7 @@ void _DelBookmarks(
                 {
                     bStt = false;
                     pRStt->nNode = rStt;
-                    if( 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pRStt->nNode )) )
+                    if( 0 == ( pCNd = SwNodes::GoPrevious( &pRStt->nNode )) )
                     {
                         pRStt->nNode = pREnd->nNode;
                         pCNd = pRStt->nNode.GetNode().GetCntntNode();
@@ -1362,7 +1362,7 @@ void _DelBookmarks(
             {
                 bool bStt = false;
                 SwCntntNode* pCNd = pREnd->nNode.GetNode().GetCntntNode();
-                if( !pCNd && 0 == ( pCNd = pDoc->GetNodes().GoPrevious( &pREnd->nNode )) )
+                if( !pCNd && 0 == ( pCNd = SwNodes::GoPrevious( &pREnd->nNode )) )
                 {
                     bStt = true;
                     pREnd->nNode = rEnd;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index c9d59c971447..e53e37c09409 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -74,8 +74,8 @@ private:
 
     SwPaM *pInsRing, *pDelRing;
 
-    sal_uLong PrevIdx( const SwNode* pNd );
-    sal_uLong NextIdx( const SwNode* pNd );
+    static sal_uLong PrevIdx( const SwNode* pNd );
+    static sal_uLong NextIdx( const SwNode* pNd );
 
     vector< CompareLine* > aLines;
     bool m_bRecordDiff;
@@ -265,7 +265,7 @@ private:
     int *pPos1, *pPos2;
     int nCnt1, nCnt2;		// number of words
 
-    void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
+    static void CalcPositions( int *pPos, const SwTxtNode *pTxtNd, int &nCnt );
 
 public:
     WordArrayComparator( const SwTxtNode *pNode1, const SwTxtNode *pNode2 );
@@ -326,7 +326,7 @@ protected:
                     int nEnd1 = 0, int nStt2 = 0, int nEnd2 = 0 );
 
 public:
-    int IgnoreIsolatedPieces( int *pLcs1, int *pLcs2, int nLen1, int nLen2,
+    static int IgnoreIsolatedPieces( int *pLcs1, int *pLcs2, int nLen1, int nLen2,
                                 int nLcsLen, int nPieceLen );
 };
 
@@ -1319,7 +1319,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
 
             if( CmpOptions.nIgnoreLen )
             {
-                nLcsLen = aSeq.IgnoreIsolatedPieces( &aTmpLcsDst[0], &aTmpLcsSrc[0],
+                nLcsLen = CommonSubseq::IgnoreIsolatedPieces( &aTmpLcsDst[0], &aTmpLcsSrc[0],
                                                 aCmp.GetLen1(), aCmp.GetLen2(),
                                                 nLcsLen, CmpOptions.nIgnoreLen );
             }
@@ -1336,7 +1336,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& rLine,
 
             if( CmpOptions.nIgnoreLen )
             {
-                nLcsLen = aSeq.IgnoreIsolatedPieces( &aLcsDst[0], &aLcsSrc[0], nDstLen,
+                nLcsLen = CommonSubseq::IgnoreIsolatedPieces( &aLcsDst[0], &aLcsSrc[0], nDstLen,
                                                     nSrcLen, nLcsLen,
                                                     CmpOptions.nIgnoreLen );
             }
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 17f27487831f..a92b2d242e11 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -286,7 +286,7 @@ void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
                 // is copied, and the Index to the StartNode is set to
                 // the left or first header attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwHeaderStartNode );
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwHeaderStartNode );
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
@@ -358,7 +358,7 @@ void SwDoc::CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
                 // is copied, and the Index to the StartNode is set to
                 // the left footer attribute.
                 SwNodeIndex aTmp( GetNodes().GetEndOfAutotext() );
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmp, SwFooterStartNode );
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmp, SwFooterStartNode );
                 SwNodeRange aRange( aRCnt.GetCntntIdx()->GetNode(), 0,
                             *aRCnt.GetCntntIdx()->GetNode().EndOfSectionNode() );
                 aTmp = *pSttNd->EndOfSectionNode();
diff --git a/sw/source/core/doc/docedt.cxx b/sw/source/core/doc/docedt.cxx
index 9095f525699e..287c8d1ea1c4 100644
--- a/sw/source/core/doc/docedt.cxx
+++ b/sw/source/core/doc/docedt.cxx
@@ -795,7 +795,7 @@ void SwDoc::DeleteAutoCorrExceptWord()
     mpACEWord = 0;
 }
 
-void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat ) const
+void SwDoc::CountWords( const SwPaM& rPaM, SwDocStat& rStat )
 {
     // This is a modified version of SwDoc::TransliterateText
     const SwPosition* pStt = rPaM.Start();
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 0bfeee404a6d..f3b6fe66679c 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -396,7 +396,7 @@ const SwDBData& SwDoc::GetDBDesc()
         }
     }
     if(maDBData.sDataSource.isEmpty())
-        maDBData = GetDBManager()->GetAddressDBName();
+        maDBData = SwDBManager::GetAddressDBName();
 #endif
     return maDBData;
 }
diff --git a/sw/source/core/doc/docfly.cxx b/sw/source/core/doc/docfly.cxx
index a7a4adf534ff..53edd19eed14 100644
--- a/sw/source/core/doc/docfly.cxx
+++ b/sw/source/core/doc/docfly.cxx
@@ -671,7 +671,7 @@ bool SwDoc::SetFrmFmtToFly( SwFrmFmt& rFmt, SwFrmFmt& rNewFmt,
 }
 
 void SwDoc::GetGrfNms( const SwFlyFrmFmt& rFmt, OUString* pGrfName,
-                       OUString* pFltName ) const
+                       OUString* pFltName )
 {
     SwNodeIndex aIdx( *rFmt.GetCntnt().GetCntntIdx(), 1 );
     const SwGrfNode* pGrfNd = aIdx.GetNode().GetGrfNode();
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index 1dbcb1358144..227b0530ac97 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -1371,7 +1371,7 @@ void SwDoc::CopyPageDescHeaderFooterImpl( bool bCpyHeader,
             {
                 SwNodeIndex aTmpIdx( GetNodes().GetEndOfAutotext() );
                 const SwNodes& rSrcNds = rSrcFmt.GetDoc()->GetNodes();
-                SwStartNode* pSttNd = GetNodes().MakeEmptySection( aTmpIdx,
+                SwStartNode* pSttNd = SwNodes::MakeEmptySection( aTmpIdx,
                                                 bCpyHeader
                                                     ? SwHeaderStartNode
                                                     : SwFooterStartNode );
@@ -1598,7 +1598,7 @@ void SwDoc::ReplaceStyles( const SwDoc& rSource, bool bIncludePageStyles )
 }
 
 SwFmt* SwDoc::FindFmtByName( const SwFmtsBase& rFmtArr,
-                             const OUString& rName ) const
+                             const OUString& rName )
 {
     SwFmt* pFnd = 0;
     for( size_t n = 0; n < rFmtArr.GetFmtCount(); ++n )
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index aeff01cd1e25..9b4e5efedcd8 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1919,7 +1919,7 @@ bool SwDoc::MoveParagraph( const SwPaM& rPam, long nOffset, bool bIsOutlMv )
             {
                 // We need to remove the last empty Node again
                 aIdx = aInsPos.nNode;
-                SwCntntNode* pCNd = GetNodes().GoPrevious( &aInsPos.nNode );
+                SwCntntNode* pCNd = SwNodes::GoPrevious( &aInsPos.nNode );
                 aInsPos.nContent.Assign( pCNd, pCNd ? pCNd->Len() : 0 );
 
                 // All, that are in the to-be-deleted Node, need to be
@@ -2074,7 +2074,7 @@ bool SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, bool bDel )
     return bResult;
 }
 
-SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos ) const
+SwNumRule* SwDoc::GetNumRuleAtPos( const SwPosition& rPos )
 {
     SwNumRule* pRet = NULL;
     SwTxtNode* pTNd = rPos.nNode.GetNode().GetTxtNode();
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 20db6623ddd9..421333156160 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -1170,7 +1170,7 @@ void SwRangeRedline::MoveToSection()
         }
         else
         {
-            pSttNd = rNds.MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
+            pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode );
 
             SwPosition aPos( *pSttNd->EndOfSectionNode() );
@@ -1243,7 +1243,7 @@ void SwRangeRedline::CopyToSection()
         }
         else
         {
-            pSttNd = rNds.MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
+            pSttNd = SwNodes::MakeEmptySection( SwNodeIndex( rNds.GetEndOfRedlines() ),
                                             SwNormalStartNode );
 
             if( pCEndNd )
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 799981638ff6..3637d34ddc61 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -103,7 +103,7 @@ SwSortElement::~SwSortElement()
 {
 }
 
-double SwSortElement::StrToDouble( const OUString& rStr ) const
+double SwSortElement::StrToDouble( const OUString& rStr )
 {
     if( !pLclData )
         pLclData = new LocaleDataWrapper( LanguageTag( *pLocale ));
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 8b6ff3100105..e26b20ff59f6 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -111,7 +111,7 @@ sal_uInt16 SwDoc::GetTOIKeys( SwTOIKeyType eTyp, std::vector<OUString>& rArr ) c
 
 /// Get current table of contents Mark.
 sal_uInt16 SwDoc::GetCurTOXMark( const SwPosition& rPos,
-                                SwTOXMarks& rArr ) const
+                                SwTOXMarks& rArr )
 {
     // search on Position rPos for all SwTOXMarks
     SwTxtNode *const pTxtNd = rPos.nNode.GetNode().GetTxtNode();
@@ -434,7 +434,7 @@ SwTOXBase* SwDoc::GetCurTOX( const SwPosition& rPos )
     return 0;
 }
 
-const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase) const
+const SwAttrSet& SwDoc::GetTOXBaseAttrSet(const SwTOXBase& rTOXBase)
 {
     OSL_ENSURE( rTOXBase.ISA( SwTOXBaseSection ), "no TOXBaseSection!" );
     const SwTOXBaseSection& rTOXSect = static_cast<const SwTOXBaseSection&>(rTOXBase);
@@ -740,7 +740,7 @@ bool SwTOXBaseSection::SetPosAtStartEnd( SwPosition& rPos, bool bAtStart ) const
         else
         {
             rPos.nNode = *pSectNd->EndOfSectionNode();
-            pCNd = pSectNd->GetDoc()->GetNodes().GoPrevious( &rPos.nNode );
+            pCNd = SwNodes::GoPrevious( &rPos.nNode );
             if( pCNd ) nC = pCNd->Len();
         }
         rPos.nContent.Assign( pCNd, nC );
@@ -818,7 +818,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
             // determine page description of content before table-of-content
             SwNodeIndex aIdx( *pSectNd );
             pDefaultPageDesc =
-                pSectNd->GetNodes().GoPrevious( &aIdx )->FindPageDesc( false );
+                SwNodes::GoPrevious( &aIdx )->FindPageDesc( false );
 
         }
         if ( !pDefaultPageDesc )
@@ -875,7 +875,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         }
         --aEndIdx;
         SwPosition aPos( aEndIdx, SwIndex( pFirstEmptyNd, 0 ));
-        pDoc->CorrAbs( aSttIdx, aEndIdx, aPos, true );
+        SwDoc::CorrAbs( aSttIdx, aEndIdx, aPos, true );
 
         // delete flys in whole range including start node which requires
         // giving the node before start node as Mark parameter, hence -1.
@@ -1005,7 +1005,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         if( !aCorPam.Move( fnMoveForward ) )
             aCorPam.Move( fnMoveBackward );
         SwNodeIndex aEndIdx( aInsPos, 1 );
-        pDoc->CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), true );
+        SwDoc::CorrAbs( aInsPos, aEndIdx, *aCorPam.GetPoint(), true );
 
         // Task 70995 - save and restore PageDesc and Break Attributes
         if( pFirstEmptyNd->HasSwAttrSet() )
@@ -1886,10 +1886,10 @@ void SwTOXBaseSection::InsertSorted(SwTOXSortTabBase* pNew)
             {
                 // Own entry for double entries or keywords
                 if( pOld->GetType() == TOX_SORT_CUSTOM &&
-                    pNew->GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)
+                    SwTOXSortTabBase::GetOptions() & nsSwTOIOptions::TOI_KEY_AS_ENTRY)
                     continue;
 
-                if(!(pNew->GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
+                if(!(SwTOXSortTabBase::GetOptions() & nsSwTOIOptions::TOI_SAME_ENTRY))
                 {   // Own entry
                     aSortArr.insert(aSortArr.begin() + i, pNew);
                     return;
diff --git a/sw/source/core/doc/list.cxx b/sw/source/core/doc/list.cxx
index 276def0ba06d..a35d90e55478 100644
--- a/sw/source/core/doc/list.cxx
+++ b/sw/source/core/doc/list.cxx
@@ -41,7 +41,7 @@ class SwListImpl
 
         void InsertListItem( SwNodeNum& rNodeNum,
                              const int nLevel );
-        void RemoveListItem( SwNodeNum& rNodeNum );
+        static void RemoveListItem( SwNodeNum& rNodeNum );
 
         void InvalidateListTree();
         void ValidateListTree();
@@ -241,7 +241,7 @@ void SwList::InsertListItem( SwNodeNum& rNodeNum,
 
 void SwList::RemoveListItem( SwNodeNum& rNodeNum )
 {
-    mpListImpl->RemoveListItem( rNodeNum );
+    SwListImpl::RemoveListItem( rNodeNum );
 }
 
 void SwList::InvalidateListTree()
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 667d165eb3df..8a01ce7cd0e6 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -1104,7 +1104,7 @@ namespace numfunc
             void SetToDefault();
 
             /** returns sequence of default bullet configuration property names */
-            uno::Sequence<OUString> GetPropNames() const;
+            static uno::Sequence<OUString> GetPropNames();
 
             /** loads default bullet configuration properties and applies
                 values to internal data */
@@ -1180,7 +1180,7 @@ namespace numfunc
         mnLevelChars[9] = 0x2022;
     }
 
-    uno::Sequence<OUString> SwDefBulletConfig::GetPropNames() const
+    uno::Sequence<OUString> SwDefBulletConfig::GetPropNames()
     {
         uno::Sequence<OUString> aPropNames(13);
         OUString* pNames = aPropNames.getArray();
@@ -1323,7 +1323,7 @@ namespace numfunc
             void SetToDefault();
 
             /** returns sequence of configuration property names */
-            com::sun::star::uno::Sequence<OUString> GetPropNames() const;
+            static com::sun::star::uno::Sequence<OUString> GetPropNames();
 
             /** loads configuration properties and applies values to internal data */
             void LoadConfig();
@@ -1362,7 +1362,7 @@ namespace numfunc
         mbChangeIndentOnTabAtFirstPosOfFirstListItem = true;
     }
 
-    com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames() const
+    com::sun::star::uno::Sequence<OUString> SwNumberingUIBehaviorConfig::GetPropNames()
     {
         com::sun::star::uno::Sequence<OUString> aPropNames(1);
         OUString* pNames = aPropNames.getArray();
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 2af05755144e..8165c82807fb 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -123,7 +123,7 @@ bool SwDoc::IsUsed( const SwModify& rModify ) const
 }
 
 // See if the NumRule is used
-bool SwDoc::IsUsed( const SwNumRule& rRule ) const
+bool SwDoc::IsUsed( const SwNumRule& rRule )
 {
     bool bUsed = rRule.GetTxtNodeListSize() > 0 ||
                      rRule.GetParagraphStyleListSize() > 0;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index f3a732c4a2c8..a260ddfae52b 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -878,7 +878,7 @@ void SwTableAutoFmt::StoreTableProperties(const SwTable &table)
 
     SwEditShell *pShell = pDoc->GetEditShell();
     SwFmtRowSplit *pRowSplit = 0;
-    pDoc->GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
+    SwDoc::GetRowSplit(*pShell->getShellCrsr(false), pRowSplit);
     m_bRowSplit = pRowSplit && pRowSplit->GetValue();
     delete pRowSplit;
     pRowSplit = 0;
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 8dbd5725b8d7..8d0d7d70cbd8 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -551,9 +551,9 @@ static void lcl_CpyBox( const SwTable& rCpyTbl, const SwTableBox* pCpyBox,
         // Move Bookmarks
         {
             SwPosition aMvPos( aInsIdx );
-            SwCntntNode* pCNd = pDoc->GetNodes().GoPrevious( &aMvPos.nNode );
+            SwCntntNode* pCNd = SwNodes::GoPrevious( &aMvPos.nNode );
             aMvPos.nContent.Assign( pCNd, pCNd->Len() );
-            pDoc->CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
+            SwDoc::CorrAbs( aInsIdx, aEndNdIdx, aMvPos, false );
         }
 
         // If we still have FlyFrames hanging around, delete them too
@@ -1041,7 +1041,7 @@ static void _FndCntntLine( const SwTableLine* pLine, SwSelBoxes* pPara )
 
 // Find all Boxes with content in this Box
 SwSelBoxes& SwTable::SelLineFromBox( const SwTableBox* pBox,
-                                    SwSelBoxes& rBoxes, bool bToTop ) const
+                                    SwSelBoxes& rBoxes, bool bToTop )
 {
     SwTableLine* pLine = const_cast<SwTableLine*>(pBox->GetUpper());
     if( bToTop )