loplugin:staticmethods

Change-Id: I90dd921077bbfc57200e398e7959306f26c65cfe

41 files changed, 80 insertions, 84 deletions

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 880ed86cf4c4..cddd9ae40565 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -831,7 +831,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
             break;
             case SID_SPELLCHECKER_CHANGED:
                 //! false, true, true is on the save side but a probably overdone
-                SW_MOD()->CheckSpellChanges(false, true, true, false );
+                SwModule::CheckSpellChanges(false, true, true, false );
             break;
 
         case SID_MAIL_PREPAREEXPORT:
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index 549cd54cbf73..2f5802cb1dc4 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2049,7 +2049,7 @@ bool  SwDocStyleSheet::IsUsed() const
     case SFX_STYLE_FAMILY_PAGE : pMod = pDesc;      break;
 
     case SFX_STYLE_FAMILY_PSEUDO:
-            return pNumRule && rDoc.IsUsed( *pNumRule );
+            return pNumRule && SwDoc::IsUsed( *pNumRule );
 
     default:
         OSL_ENSURE(false, "unknown style family");
@@ -2896,7 +2896,7 @@ SfxStyleSheetBase*  SwStyleSheetIterator::First()
                 if ( nSrchMask == SFXSTYLEBIT_HIDDEN && !rRule.IsHidden( ) )
                     continue;
 
-                bool bUsed = bIsSearchUsed && ( bOrganizer || rDoc.IsUsed(rRule) );
+                bool bUsed = bIsSearchUsed && ( bOrganizer || SwDoc::IsUsed(rRule) );
                 if( !bUsed )
                 {
                     if( ( !bSearchHidden && rRule.IsHidden() ) ||
@@ -3006,7 +3006,7 @@ void SwStyleSheetIterator::AppendStyleList(const ::std::vector<OUString>& rList,
             case nsSwGetPoolIdFromName::GET_POOLID_NUMRULE:
                 {
                     SwNumRule* pRule = rDoc.FindNumRulePtr( rList[i] );
-                    bUsed = pRule && rDoc.IsUsed( *pRule );
+                    bUsed = pRule && SwDoc::IsUsed( *pRule );
                     bHidden = pRule && pRule->IsHidden( );
                 }
                 break;
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 852751667581..1418abee8cb2 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -99,7 +99,7 @@ bool SwViewOption::IsEqualFlags( const SwViewOption &rOpt ) const
 }
 
 void SwViewOption::DrawRect( OutputDevice *pOut,
-                             const SwRect &rRect, long nCol ) const
+                             const SwRect &rRect, long nCol )
 {
     if ( pOut->GetOutDevType() != OUTDEV_PRINTER )
     {
@@ -114,7 +114,7 @@ void SwViewOption::DrawRect( OutputDevice *pOut,
 }
 
 void SwViewOption::DrawRectPrinter( OutputDevice *pOut,
-                                    const SwRect &rRect ) const
+                                    const SwRect &rRect )
 {
     Color aOldColor(pOut->GetLineColor());
     Color aOldFillColor( pOut->GetFillColor() );
@@ -125,13 +125,13 @@ void SwViewOption::DrawRectPrinter( OutputDevice *pOut,
     pOut->SetLineColor( aOldColor );
 }
 
-sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut ) const
+sal_uInt16 SwViewOption::GetPostItsWidth( const OutputDevice *pOut )
 {
     assert(pOut && "no Outdev");
     return sal_uInt16(pOut->GetTextWidth( OUString(aPostItStr )));
 }
 
-void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript ) const
+void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool bIsScript )
 {
     if( pOut && bIsScript )
     {
@@ -303,7 +303,7 @@ void SwViewOption::Init( vcl::Window *pWin )
     }
 }
 
-bool SwViewOption::IsAutoCompleteWords() const
+bool SwViewOption::IsAutoCompleteWords()
 {
     const SvxSwAutoFmtFlags& rFlags = SvxAutoCorrCfg::Get().GetAutoCorrect()->GetSwFlags();
     return rFlags.bAutoCmpltCollectWords;
diff --git a/sw/source/uibase/dbui/mmconfigitem.cxx b/sw/source/uibase/dbui/mmconfigitem.cxx
index 461c68cf6d28..c8218c52981b 100644
--- a/sw/source/uibase/dbui/mmconfigitem.cxx
+++ b/sw/source/uibase/dbui/mmconfigitem.cxx
@@ -149,7 +149,7 @@ class SwMailMergeConfigItem_Impl : public utl::ConfigItem
     bool                                bIsGreetingLineInMail_LastUserSetting;
     bool                                bIsGreetingLine_LastUserSetting;
 
-    const Sequence< OUString>&       GetPropertyNames();
+    static const Sequence< OUString>&       GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
index b467db4483c1..c829ad5107cf 100644
--- a/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
+++ b/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx
@@ -187,7 +187,7 @@ svx::SpellPortions SwSpellDialogChildWindow::GetNextWrongSentence(bool bRecheck)
         {
             // first set continuation point for spell/grammar check to the
             // end of the current sentence
-            pWrtShell->MoveContinuationPosToEndOfCheckedSentence();
+            SwEditShell::MoveContinuationPosToEndOfCheckedSentence();
         }
 
         ShellModes  eSelMode = pWrtShell->GetView().GetShellMode();
@@ -452,7 +452,7 @@ void SwSpellDialogChildWindow::ApplyChangedSentence(const svx::SpellPortions& rC
         // evaluate if the same sentence should be rechecked or not.
         // Sentences that got grammar checked should always be rechecked in order
         // to detect possible errors that get introduced with the changes
-        bRecheck |= pWrtShell->HasLastSentenceGotGrammarChecked();
+        bRecheck |= SwEditShell::HasLastSentenceGotGrammarChecked();
 
         if(bNormalText)
             pWrtShell->ApplyChangedSentence(rChanged, bRecheck);
@@ -507,7 +507,7 @@ void SwSpellDialogChildWindow::SetGrammarChecking(bool bOn)
             SHELL_MODE_TABLE_LIST_TEXT == eSelMode ||
             SHELL_MODE_TEXT == eSelMode;
         if( bNormalText )
-            pWrtShell->PutSpellingToSentenceStart();
+            SwEditShell::PutSpellingToSentenceStart();
         else if( bDrawText )
         {
             SdrView*     pSdrView = pWrtShell->GetDrawView();
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index fbb6e061f209..4a8d91b7e401 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -715,7 +715,7 @@ void SwEditWin::StopInsFrm()
     m_nInsFrmColCount = 1;
 }
 
-bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const
+bool SwEditWin::IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr )
 {
     const SvtCTLOptions& rCTLOptions = SW_MOD()->GetCTLOptions();
     if ( !rCTLOptions.IsCTLFontEnabled() ||
@@ -2967,7 +2967,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
         rBind.Update();
 
         if ( RulerMarginDrag( rMEvt,
-                        rSh.IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPos ) ) )
+                        SwFEShell::IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPos ) ) )
         {
             m_rView.SetNumRuleNodeFromDoc( NULL );
             m_rView.InvalidateRulerPos();
@@ -3847,7 +3847,7 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
             // i#42921 - consider vertical mode
             SwTxtNode* pNodeAtPos = rSh.GetNumRuleNodeAtPos( aDocPt );
             const sal_uInt16 nPointer =
-                    rSh.IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPt )
+                    SwFEShell::IsVerticalModeAtNdAndPos( *pNodeAtPos, aDocPt )
                     ? POINTER_VSIZEBAR
                     : POINTER_HSIZEBAR;
             SetPointer( nPointer );
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx
index 7d4420a0d025..1be211b95fa4 100644
--- a/sw/source/uibase/fldui/fldmgr.cxx
+++ b/sw/source/uibase/fldui/fldmgr.cxx
@@ -318,7 +318,7 @@ SwField* SwFldMgr::GetCurFld()
 }
 
 // provide group range
-const SwFldGroupRgn& SwFldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) const
+const SwFldGroupRgn& SwFldMgr::GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId)
 {
 static SwFldGroupRgn const aRanges[] =
 {
@@ -346,7 +346,7 @@ static SwFldGroupRgn const aWebRanges[] =
 }
 
 // determine GroupId
-sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType) const
+sal_uInt16 SwFldMgr::GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType)
 {
     if (nTypeId == TYP_SETINPFLD)
         nTypeId = TYP_SETFLD;
@@ -1044,7 +1044,7 @@ bool SwFldMgr::InsertFld(
                 rData.aDBColumn >>= xColumn;
                 if(xColumn.is())
                 {
-                    nFormatId = pCurShell->GetDBManager()->GetColumnFmt(xSource, xConnection, xColumn,
+                    nFormatId = SwDBManager::GetColumnFmt(xSource, xConnection, xColumn,
                         pCurShell->GetNumberFormatter(), GetCurrLanguage() );
                 }
                 else
diff --git a/sw/source/uibase/inc/annotsh.hxx b/sw/source/uibase/inc/annotsh.hxx
index 8b3bea7cbb98..e66a632fc09b 100644
--- a/sw/source/uibase/inc/annotsh.hxx
+++ b/sw/source/uibase/inc/annotsh.hxx
@@ -42,7 +42,7 @@ public:
                 SwAnnotationShell(SwView&);
     virtual     ~SwAnnotationShell();
 
-    void        StateDisableItems(SfxItemSet &);
+    static void StateDisableItems(SfxItemSet &);
     void        Exec(SfxRequest &);
 
     void        GetState(SfxItemSet &);
@@ -58,17 +58,17 @@ public:
     void        StateClpbrd(SfxItemSet &rSet);
 
     void        ExecTransliteration(SfxRequest &);
-    void                ExecRotateTransliteration(SfxRequest &);
+    void        ExecRotateTransliteration(SfxRequest &);
 
     void        ExecUndo(SfxRequest &rReq);
     void        StateUndo(SfxItemSet &rSet);
 
-    void        StateStatusLine(SfxItemSet &rSet);
+    static void StateStatusLine(SfxItemSet &rSet);
 
     void        InsertSymbol(SfxRequest& rReq);
 
     void        ExecSearch(SfxRequest&, bool bNoMessage = false);
-    void            StateSearch(SfxItemSet &);
+    void        StateSearch(SfxItemSet &);
 
     virtual ::svl::IUndoManager*
                 GetUndoManager() SAL_OVERRIDE;
diff --git a/sw/source/uibase/inc/barcfg.hxx b/sw/source/uibase/inc/barcfg.hxx
index cdb0897959c6..50b561f9576e 100644
--- a/sw/source/uibase/inc/barcfg.hxx
+++ b/sw/source/uibase/inc/barcfg.hxx
@@ -24,7 +24,7 @@ class SwToolbarConfigItem : public utl::ConfigItem
 {
     sal_Int32            aTbxIdArray[5];
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/basesh.hxx b/sw/source/uibase/inc/basesh.hxx
index 68b4db11f84d..5636e0796f58 100644
--- a/sw/source/uibase/inc/basesh.hxx
+++ b/sw/source/uibase/inc/basesh.hxx
@@ -103,7 +103,7 @@ public:
     void        ExecBckCol(SfxRequest& rReq);
     void        SetWrapMode( sal_uInt16 nSlot );
 
-    void        StateDisableItems(SfxItemSet &);
+    static void StateDisableItems(SfxItemSet &);
 
     void        EditRegionDialog(SfxRequest& rReq);
     void        InsertRegionDialog(SfxRequest& rReq);
diff --git a/sw/source/uibase/inc/content.hxx b/sw/source/uibase/inc/content.hxx
index 73ebf0167287..402999701dfd 100644
--- a/sw/source/uibase/inc/content.hxx
+++ b/sw/source/uibase/inc/content.hxx
@@ -162,7 +162,7 @@ class SwContentType : public SwTypeNumber
     bool                bEdit:          1;  // can this type be edited?
     bool                bDelete:        1;  // can this type be deleted?
 protected:
-        OUString            RemoveNewline(const OUString&);
+        static OUString     RemoveNewline(const OUString&);
 public:
         SwContentType(SwWrtShell* pParent, sal_uInt16 nType, sal_uInt8 nLevel );
         virtual ~SwContentType();
diff --git a/sw/source/uibase/inc/drwtxtsh.hxx b/sw/source/uibase/inc/drwtxtsh.hxx
index 1431992ba258..b8656bdec8c4 100644
--- a/sw/source/uibase/inc/drwtxtsh.hxx
+++ b/sw/source/uibase/inc/drwtxtsh.hxx
@@ -56,7 +56,7 @@ public:
     virtual ::svl::IUndoManager*
                 GetUndoManager() SAL_OVERRIDE;
 
-    void        StateDisableItems(SfxItemSet &);
+    static void StateDisableItems(SfxItemSet &);
 
     void        Execute(SfxRequest &);
     void        ExecDraw(SfxRequest &);
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 3bdf785cf1b3..aa9e84873dfd 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -76,7 +76,7 @@ friend void     PageNumNotify(  SwViewShell* pVwSh,
 
     /*
      * timer and handler for scrolling on when the mousepointer
-     * stopps outside of EditWin during a drag-operation.
+     * stops outside of EditWin during a drag-operation.
      * The selection is increased towards the mouse position
      * regularly.
      */
@@ -243,7 +243,7 @@ public:
     bool            IsChainMode() const             { return m_bChainMode; }
 
     void            FlushInBuffer();
-    bool            IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr ) const;
+    static bool     IsInputSequenceCheckingRequired( const OUString &rText, const SwPaM& rCrsr );
 
     void             SetApplyTemplate(const SwApplyTemplate &);
     SwApplyTemplate* GetApplyTemplate() const { return m_pApplyTempl; }
@@ -253,13 +253,13 @@ public:
     sal_uInt16           GetDropAction() const { return m_nDropAction; }
     SotClipboardFormatId GetDropFormat() const { return m_nDropFormat; }
 
-    Color           GetTextColor() { return m_aTextColor; }
+    static Color    GetTextColor() { return m_aTextColor; }
 
-    void            SetTextColor(const Color& rCol ) { m_aTextColor = rCol; }
+    static void     SetTextColor(const Color& rCol ) { m_aTextColor = rCol; }
 
-    Color           GetTextBackColor()
+    static Color    GetTextBackColor()
                                             { return m_aTextBackColor; }
-    void            SetTextBackColor(const Color& rCol )
+    static void     SetTextBackColor(const Color& rCol )
                                             { m_aTextBackColor = rCol; }
     void            LockKeyInput(bool bSet){m_bLockInput = bSet;}
 
diff --git a/sw/source/uibase/inc/envimg.hxx b/sw/source/uibase/inc/envimg.hxx
index fd9a04f76d53..fc836b635871 100644
--- a/sw/source/uibase/inc/envimg.hxx
+++ b/sw/source/uibase/inc/envimg.hxx
@@ -72,7 +72,7 @@ class SwEnvCfgItem : public utl::ConfigItem
 private:
     SwEnvItem aEnvItem;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx
index 57cfeda448c8..24b1d1606799 100644
--- a/sw/source/uibase/inc/fldmgr.hxx
+++ b/sw/source/uibase/inc/fldmgr.hxx
@@ -173,8 +173,8 @@ public:
 
     // access via TypeId from the dialog
     // Ids for a range of fields
-    const SwFldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId) const;
-    sal_uInt16          GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0) const;
+    static const SwFldGroupRgn& GetGroupRange(bool bHtmlMode, sal_uInt16 nGrpId);
+    static sal_uInt16           GetGroup(bool bHtmlMode, sal_uInt16 nTypeId, sal_uInt16 nSubType = 0);
 
     // the current field's TypeId
     sal_uInt16          GetCurTypeId() const;
diff --git a/sw/source/uibase/inc/formatclipboard.hxx b/sw/source/uibase/inc/formatclipboard.hxx
index 87713da2e5e9..9e1d6b589e6a 100644
--- a/sw/source/uibase/inc/formatclipboard.hxx
+++ b/sw/source/uibase/inc/formatclipboard.hxx
@@ -38,7 +38,7 @@ public:
      */
     bool HasContent() const;
     bool HasContentForThisType( int nSelectionType ) const;
-    bool CanCopyThisType( int nSelectionType ) const;
+    static bool CanCopyThisType( int nSelectionType );
 
     /**
      * Store/Backup the text and paragraph attribute of the current selection.
diff --git a/sw/source/uibase/inc/frmpage.hxx b/sw/source/uibase/inc/frmpage.hxx
index 88498685c99e..095966548883 100644
--- a/sw/source/uibase/inc/frmpage.hxx
+++ b/sw/source/uibase/inc/frmpage.hxx
@@ -165,8 +165,8 @@ class SwFrmPage: public SfxTabPage
                                ListBox& _rLB,
                                FixedText& _rFT );
     sal_Int32       GetMapPos( const FrmMap *pMap, ListBox &rAlignLB );
-    sal_Int16       GetAlignment(FrmMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
-    sal_Int16       GetRelation(FrmMap *pMap, ListBox &rRelationLB);
+    static sal_Int16 GetAlignment(FrmMap *pMap, sal_Int32 nMapPos, ListBox &rAlignLB, ListBox &rRelationLB);
+    static sal_Int16 GetRelation(FrmMap *pMap, ListBox &rRelationLB);
     RndStdIds       GetAnchor();
 
     void setOptimalFrmWidth();
diff --git a/sw/source/uibase/inc/gloslst.hxx b/sw/source/uibase/inc/gloslst.hxx
index ed9e2a6a56d8..729b917f4c70 100644
--- a/sw/source/uibase/inc/gloslst.hxx
+++ b/sw/source/uibase/inc/gloslst.hxx
@@ -52,7 +52,7 @@ class SwGlossaryList : public AutoTimer
     bool            bFilled;
 
     AutoTextGroup*  FindGroup(const OUString& rGroupName);
-    void            FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss);
+    static void     FillGroup(AutoTextGroup* pGroup, SwGlossaries* pGloss);
 
 public:
         SwGlossaryList();
diff --git a/sw/source/uibase/inc/navicfg.hxx b/sw/source/uibase/inc/navicfg.hxx
index 06a3c4e45c54..33576e803ffe 100644
--- a/sw/source/uibase/inc/navicfg.hxx
+++ b/sw/source/uibase/inc/navicfg.hxx
@@ -31,7 +31,7 @@ class SwNavigationConfig : public utl::ConfigItem
     bool    bIsSmall;       //ShowListBox
     bool    bIsGlobalActive; //GlobalDocMode// global view for GlobalDoc valid?
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx
index a5fe54a69458..033d12db3236 100644
--- a/sw/source/uibase/inc/numpara.hxx
+++ b/sw/source/uibase/inc/numpara.hxx
@@ -63,7 +63,7 @@ class SwParagraphNumTabPage : public SfxTabPage
 
 protected:
     void aCountParaFL();
-    bool    ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
+    static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr,
                           sal_uInt16 nFamily, sal_uInt16 nMask = 0,
                           const sal_uInt16* pModifier = NULL );
 
diff --git a/sw/source/uibase/inc/olmenu.hxx b/sw/source/uibase/inc/olmenu.hxx
index cec3199f3beb..d68e22140b1d 100644
--- a/sw/source/uibase/inc/olmenu.hxx
+++ b/sw/source/uibase/inc/olmenu.hxx
@@ -60,7 +60,7 @@ class SW_DLLPUBLIC SwSpellPopup : public PopupMenu
 
     Image     m_aInfo16;
 
-    void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
+    static void fillLangPopupMenu( PopupMenu *pPopupMenu, sal_uInt16 nLangStart,
             const ::com::sun::star::uno::Sequence< OUString >& aSeq, SwWrtShell* pWrtSh,
             std::map< sal_Int16, OUString > &rLangTable );
 
diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx
index fa8901d40d0e..2cb229a1c5de 100644
--- a/sw/source/uibase/inc/optpage.hxx
+++ b/sw/source/uibase/inc/optpage.hxx
@@ -355,7 +355,7 @@ class SwRedlineOptionsTabPage : public SfxTabPage
     DECL_LINK(ChangedMaskPrevHdl, void * = 0);
     DECL_LINK( ColorHdl, ColorListBox *pColorLB );
 
-    void                InitFontStyle(SvxFontPrevWindow& rExampleWin);
+    static void         InitFontStyle(SvxFontPrevWindow& rExampleWin);
 
 public:
     SwRedlineOptionsTabPage( vcl::Window* pParent, const SfxItemSet& rSet );
diff --git a/sw/source/uibase/inc/pggrid.hxx b/sw/source/uibase/inc/pggrid.hxx
index 8823b1d4099f..86aae8d5637c 100644
--- a/sw/source/uibase/inc/pggrid.hxx
+++ b/sw/source/uibase/inc/pggrid.hxx
@@ -69,7 +69,7 @@ class SwTextGridPage: public SfxTabPage
 
     void UpdatePageSize(const SfxItemSet& rSet);
     void PutGridItem(SfxItemSet& rSet);
-    void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue );
+    static void SetLinesOrCharsRanges(FixedText & rField, const sal_Int32 nValue );
 
     DECL_LINK(GridTypeHdl, RadioButton*);
     DECL_LINK(CharorLineChangedHdl, SpinField*);
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index ae856e8e607a..e11c6970ed2d 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -261,7 +261,7 @@ public:
     // Handler
     void            Execute(SfxRequest&);
     void            GetState(SfxItemSet&);
-    void            StateUndo(SfxItemSet&);
+    static void     StateUndo(SfxItemSet&);
 
     SwDocShell*     GetDocShell();
 
diff --git a/sw/source/uibase/inc/usrpref.hxx b/sw/source/uibase/inc/usrpref.hxx
index 1ae841dd097d..e3baf4647561 100644
--- a/sw/source/uibase/inc/usrpref.hxx
+++ b/sw/source/uibase/inc/usrpref.hxx
@@ -71,7 +71,7 @@ class SwGridConfig : public utl::ConfigItem
 private:
     SwMasterUsrPref&    rParent;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
@@ -89,7 +89,7 @@ class SwCursorConfig : public utl::ConfigItem
 private:
     SwMasterUsrPref&    rParent;
 
-    com::sun::star::uno::Sequence<OUString> GetPropertyNames();
+    static com::sun::star::uno::Sequence<OUString> GetPropertyNames();
 
     virtual void ImplCommit() SAL_OVERRIDE;
 
diff --git a/sw/source/uibase/lingu/hyp.cxx b/sw/source/uibase/lingu/hyp.cxx
index 1f1e2ffaf298..cdf801558f4a 100644
--- a/sw/source/uibase/lingu/hyp.cxx
+++ b/sw/source/uibase/lingu/hyp.cxx
@@ -111,7 +111,7 @@ bool SwHyphWrapper::SpellMore()
 void SwHyphWrapper::InsertHyphen( const sal_uInt16 nPos )
 {
     if( nPos)
-        PSH->InsertSoftHyph( nPos + 1); // does nPos == 1 really mean
+        SwEditShell::InsertSoftHyph( nPos + 1); // does nPos == 1 really mean
                                         // insert hyphen after first char?
                                         // (instead of nPos == 0)
     else
diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx
index 5dd31fb7b31f..879b1b685cf4 100644
--- a/sw/source/uibase/lingu/olmenu.cxx
+++ b/sw/source/uibase/lingu/olmenu.cxx
@@ -725,7 +725,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
     {
         SwPaM *pPaM = m_pSh->GetCrsr();
         if (pPaM)
-            m_pSh->IgnoreGrammarErrorAt( *pPaM );
+            SwEditShell::IgnoreGrammarErrorAt( *pPaM );
     }
     else if (nId == MN_IGNORE_WORD)
     {
@@ -739,7 +739,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
                 // refresh the layout of the actual paragraph (faster)
                 SwPaM *pPaM = m_pSh->GetCrsr();
                 if (pPaM)
-                    m_pSh->IgnoreGrammarErrorAt( *pPaM );
+                    SwEditShell::IgnoreGrammarErrorAt( *pPaM );
                 // refresh the layout of all paragraphs (workaround to launch a dictionary event)
                 xDictionary->setActive(sal_False);
                 xDictionary->setActive(sal_True);
diff --git a/sw/source/uibase/shells/textfld.cxx b/sw/source/uibase/shells/textfld.cxx
index 31bbd379c5e4..150325fa4eb2 100644
--- a/sw/source/uibase/shells/textfld.cxx
+++ b/sw/source/uibase/shells/textfld.cxx
@@ -195,8 +195,8 @@ void SwTextShell::ExecField(SfxRequest &rReq)
                     {
                         rSh.SttSelect();
                         rSh.SelectTxt(
-                            rSh.StartOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) + 1,
-                            rSh.EndOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) - 1 );
+                            SwCrsrShell::StartOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) + 1,
+                            SwCrsrShell::EndOfInputFldAtPos( *(rSh.GetCrsr()->Start()) ) - 1 );
                     }
                     else
                     {
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index ac1e4537ba48..d6eebc62813f 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1148,7 +1148,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
             {
                 Color aSet = static_cast<const SvxColorItem*>(pItem)->GetValue();
                 SwEditWin& rEditWin = GetView().GetEditWin();
-                rEditWin.SetTextColor(aSet);
+                SwEditWin::SetTextColor(aSet);
                 SwApplyTemplate* pApply = rEditWin.GetApplyTemplate();
 
                 // If there is a selection, then set the color on it
@@ -1171,7 +1171,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 aSet = COL_TRANSPARENT;
 
             SwEditWin& rEdtWin = GetView().GetEditWin();
-            rEdtWin.SetTextBackColor(aSet);
+            SwEditWin::SetTextBackColor(aSet);
             SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
 
             if(!pApply && (rWrtSh.HasSelection() || rReq.IsAPI()))
@@ -1220,9 +1220,9 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 // and reopened, its color resets, while SwEditWin still holds the old one.
                 Color aSet = static_cast<const SvxColorItem*>(pItem)->GetValue();
                 if( nSlot == SID_ATTR_CHAR_COLOR_BACKGROUND_EXT )
-                    rEdtWin.SetTextBackColor(aSet);
+                    SwEditWin::SetTextBackColor(aSet);
                 else
-                    rEdtWin.SetTextColor(aSet);
+                    SwEditWin::SetTextColor(aSet);
             }
 
             SwApplyTemplate* pApply = rEdtWin.GetApplyTemplate();
@@ -1233,7 +1233,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 {
                     rWrtSh.StartUndo( UNDO_INSATTR );
                     rWrtSh.SetAttrItem(
-                        SvxBrushItem( rEdtWin.GetTextBackColor(), RES_CHRATR_BACKGROUND) );
+                        SvxBrushItem( SwEditWin::GetTextBackColor(), RES_CHRATR_BACKGROUND) );
 
                     // Remove MS specific highlight when background is set
                     rWrtSh.SetAttrItem( SvxBrushItem(RES_CHRATR_HIGHLIGHT) );
@@ -1258,7 +1258,7 @@ void SwTextShell::Execute(SfxRequest &rReq)
                 }
                 else
                     rWrtSh.SetAttrItem(
-                        SvxColorItem( rEdtWin.GetTextColor(), RES_CHRATR_COLOR) );
+                        SvxColorItem( SwEditWin::GetTextColor(), RES_CHRATR_COLOR) );
             }
             else
             {
diff --git a/sw/source/uibase/uiview/formatclipboard.cxx b/sw/source/uibase/uiview/formatclipboard.cxx
index 801e757030a9..2aaa3346dc1c 100644
--- a/sw/source/uibase/uiview/formatclipboard.cxx
+++ b/sw/source/uibase/uiview/formatclipboard.cxx
@@ -260,7 +260,7 @@ bool SwFormatClipboard::HasContentForThisType( int nSelectionType ) const
     return false;
 }
 
-bool SwFormatClipboard::CanCopyThisType( int nSelectionType ) const
+bool SwFormatClipboard::CanCopyThisType( int nSelectionType )
 {
     if( nSelectionType & (nsSelectionType::SEL_FRM | nsSelectionType::SEL_OLE | nsSelectionType::SEL_GRF
          | nsSelectionType::SEL_TXT | nsSelectionType::SEL_DRW | nsSelectionType::SEL_TBL | nsSelectionType::SEL_TBL_CELLS ) )
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index ab632ebf3d1d..085157fdf961 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -996,7 +996,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
     if(xBeamerFrame.is())
     {
         SwDBData aData = m_pWrtShell->GetDBData();
-        SW_MOD()->ShowDBObj( *this, aData );
+        SwModule::ShowDBObj( *this, aData );
     }
 
     // has anybody calls the attrchanged handler in the constructor?
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 7379cf3dd6d2..46f4e5aa6d1c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -570,7 +570,7 @@ void SwView::ExecViewOptions(SfxRequest &rReq)
         // The UsrPref must be marked as modified.
         // call for initialization
         pModule->GetUsrPref(bWebView);
-        pModule->CheckSpellChanges( pOpt->IsOnlineSpell(), false, false, false );
+        SwModule::CheckSpellChanges( pOpt->IsOnlineSpell(), false, false, false );
     }
     //OS: Set back modified again, because view/fields sets the Doc modified.
     if( !bModified )
diff --git a/sw/source/uibase/uiview/view1.cxx b/sw/source/uibase/uiview/view1.cxx
index 9695e3690815..4081d58d0df4 100644
--- a/sw/source/uibase/uiview/view1.cxx
+++ b/sw/source/uibase/uiview/view1.cxx
@@ -176,7 +176,7 @@ void SwView::StateFormatPaintbrush(SfxItemSet &rSet)
     rSet.Put(SfxBoolItem(SID_FORMATPAINTBRUSH, bHasContent));
     if(!bHasContent)
     {
-        if( !m_pFormatClipboard->CanCopyThisType( GetWrtShell().GetSelectionType() ) )
+        if( !SwFormatClipboard::CanCopyThisType( GetWrtShell().GetSelectionType() ) )
             rSet.DisableItem( SID_FORMATPAINTBRUSH );
     }
 }
diff --git a/sw/source/uibase/uiview/view2.cxx b/sw/source/uibase/uiview/view2.cxx
index ac264eca208d..efebf89a8534 100644
--- a/sw/source/uibase/uiview/view2.cxx
+++ b/sw/source/uibase/uiview/view2.cxx
@@ -1104,7 +1104,7 @@ void SwView::Execute(SfxRequest &rReq)
             if(pVFrame->HasChildWindow(SID_BROWSER))
             {
                 const SwDBData& rData = GetWrtShell().GetDBDesc();
-                SW_MOD()->ShowDBObj(*this, rData, false);
+                SwModule::ShowDBObj(*this, rData, false);
             }
         }
         break;
@@ -1322,19 +1322,19 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
         OUString sCurrentSectionName = CurrSect->GetSectionName();
         if(sCurrentSectionName != m_sOldSectionName)
         {
-            rShell.FireSectionChangeEvent(2, 1);
+            SwCrsrShell::FireSectionChangeEvent(2, 1);
         }
         m_sOldSectionName = sCurrentSectionName;
     }
     else if (!m_sOldSectionName.isEmpty())
     {
-        rShell.FireSectionChangeEvent(2, 1);
+        SwCrsrShell::FireSectionChangeEvent(2, 1);
         m_sOldSectionName= OUString();
     }
     //get column change event
     if(rShell.bColumnChange())
     {
-        rShell.FireColumnChangeEvent(2, 1);
+        SwCrsrShell::FireColumnChangeEvent(2, 1);
     }
 
     while( nWhich )
@@ -1352,7 +1352,7 @@ void SwView::StateStatusLine(SfxItemSet &rSet)
                 if (m_nOldPageNum != nLogPage )
                 {
                     if (m_nOldPageNum != 0)
-                        rShell.FirePageChangeEvent(m_nOldPageNum, nLogPage);
+                        SwCrsrShell::FirePageChangeEvent(m_nOldPageNum, nLogPage);
                     m_nOldPageNum = nLogPage;
                 }
                 const sal_uInt16 nCnt = GetWrtShell().GetPageCnt();
diff --git a/sw/source/uibase/uiview/viewling.cxx b/sw/source/uibase/uiview/viewling.cxx
index a39bdd5b2128..7193b042f2f1 100644
--- a/sw/source/uibase/uiview/viewling.cxx
+++ b/sw/source/uibase/uiview/viewling.cxx
@@ -228,7 +228,7 @@ void SwView::StartTextConversion(
         bool bIsInteractive )
 {
     // do not do text conversion if it is active elsewhere
-    if (GetWrtShell().HasConvIter())
+    if (SwEditShell::HasConvIter())
     {
         return;
     }
@@ -417,7 +417,7 @@ void SwView::HyphStart( SvxSpellArea eWhich )
 void SwView::HyphenateDocument()
 {
     // do not hyphenate if interactive hyphenation is active elsewhere
-    if (GetWrtShell().HasHyphIter())
+    if (SwEditShell::HasHyphIter())
     {
         MessBox( 0, WB_OK, OUString( SW_RES( STR_HYPH_TITLE ) ),
                 OUString( SW_RES( STR_MULT_INTERACT_HYPH_WARN ) ) ).Execute();
diff --git a/sw/source/uibase/uno/dlelstnr.cxx b/sw/source/uibase/uno/dlelstnr.cxx
index 195ebae5edc6..be28c315f3e8 100644
--- a/sw/source/uibase/uno/dlelstnr.cxx
+++ b/sw/source/uibase/uno/dlelstnr.cxx
@@ -84,7 +84,7 @@ void SAL_CALL SwLinguServiceEventListener::processLinguServiceEvent(
         bIsSpellWrong = bIsSpellAll = true;     // have all spelling and grammar checked...
     if (bIsSpellWrong || bIsSpellAll)
     {
-        SW_MOD()->CheckSpellChanges( false, bIsSpellWrong, bIsSpellAll, false );
+        SwModule::CheckSpellChanges( false, bIsSpellWrong, bIsSpellAll, false );
     }
     if (rLngSvcEvent.nEvent & HYPHENATE_AGAIN)
     {
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index e97edd17881c..07f783ae3bbf 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -223,7 +223,7 @@ void SwXDispatch::dispatch(const util::URL& aURL,
     }
     else if(aURL.Complete.equalsAscii(cURLInsertColumns))
     {
-        pDBManager->InsertText(rSh, aArgs);
+        SwDBManager::InsertText(rSh, aArgs);
     }
     else if(aURL.Complete.equalsAscii(cURLFormLetter))
     {
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index da1a01efe78a..5812d728102e 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -620,7 +620,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
         case  HANDLE_VIEWSET_HIDDEN_CHARACTERS     :   mpViewOption->SetShowHiddenChar(bVal); break;
         case  HANDLE_VIEWSET_HIDDEN_PARAGRAPHS     :   mpViewOption->SetShowHiddenPara(bVal);   break;
         case  HANDLE_VIEWSET_TABLE_BOUNDARIES      :   SwViewOption::SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, true);    break;
-        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   mpViewOption->SetDocBoundaries(bVal);    break;
+        case  HANDLE_VIEWSET_TEXT_BOUNDARIES       :   SwViewOption::SetDocBoundaries(bVal);    break;
         case  HANDLE_VIEWSET_SMOOTH_SCROLLING      :   mpViewOption->SetSmoothScroll(bVal); break;
         case  HANDLE_VIEWSET_SHOW_CONTENT_TIPS     :   mpViewOption->SetShowContentTips(bVal); break;
         case  HANDLE_VIEWSET_IS_RASTER_VISIBLE     : mpViewOption->SetGridVisible(bVal); break;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 5c12fc645d8a..a83bbfca4ce0 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2626,7 +2626,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
         const bool bPrintProspect = m_pPrintUIOptions->getBoolValue( "PrintProspect", false );
         if (bPrintProspect)
         {
-            pDoc->CalculatePagePairsForProspectPrinting( *pViewShell->GetLayout(), *m_pRenderData, *m_pPrintUIOptions, nPageCount );
+            SwDoc::CalculatePagePairsForProspectPrinting( *pViewShell->GetLayout(), *m_pRenderData, *m_pPrintUIOptions, nPageCount );
             nRet = m_pRenderData->GetPagePairsForProspectPrinting().size();
         }
         else
@@ -2640,11 +2640,11 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 
             // get set of valid document pages (according to the current settings)
             // and their start frames
-            pDoc->CalculatePagesForPrinting( *pViewShell->GetLayout(), *m_pRenderData, *m_pPrintUIOptions, bIsPDFExport, nPageCount );
+            SwDoc::CalculatePagesForPrinting( *pViewShell->GetLayout(), *m_pRenderData, *m_pPrintUIOptions, bIsPDFExport, nPageCount );
 
             if (nPostItMode != POSTITS_NONE)
             {
-                pDoc->UpdatePagesForPrintingWithPostItData( *m_pRenderData,
+                SwDoc::UpdatePagesForPrintingWithPostItData( *m_pRenderData,
                         *m_pPrintUIOptions, bIsPDFExport, nPageCount );
             }
 
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 8e817a0ab495..3a2820f18d1c 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -395,10 +395,7 @@ uno::Any SwXTextView::getSelection()
                 uno::Reference< drawing::XDrawPageSupplier >  xPageSupp;
                 uno::Reference< frame::XModel > xModel = m_pView->GetDocShell()->GetBaseModel();
                 uno::Reference< lang::XUnoTunnel > xModelTunnel(xModel, uno::UNO_QUERY);
-                SwXTextDocument* pTextDoc = reinterpret_cast<SwXTextDocument*>(xModelTunnel->
-                                getSomething(SwXTextDocument::getUnoTunnelId()));
 
-                SwFmDrawPage* pSvxDrawPage =    pTextDoc->GetDrawPage()->GetSvxPage();
                 uno::Reference< drawing::XShapes >  xShCol = drawing::ShapeCollection::create(
                         comphelper::getProcessComponentContext());
 
@@ -406,7 +403,7 @@ uno::Any SwXTextView::getSelection()
                 for(size_t i = 0; i < rMarkList.GetMarkCount(); ++i)
                 {
                     SdrObject* pObj = rMarkList.GetMark(i)->GetMarkedSdrObj();
-                    uno::Reference< uno::XInterface >  xInt = pSvxDrawPage->GetInterface( pObj );
+                    uno::Reference< uno::XInterface >  xInt = SwFmDrawPage::GetInterface( pObj );
                     uno::Reference< drawing::XShape >  xShape(xInt, uno::UNO_QUERY);
                     xShCol->add(xShape);
                 }
@@ -542,10 +539,9 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
         eSelMode != SHELL_MODE_TEXT           )
         return Sequence< Sequence< PropertyValue > > ();
 
-    SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
     SwRubyList aList;
 
-    const sal_uInt16 nCount = pDoc->FillRubyList( *rSh.GetCrsr(), aList, 0 );
+    const sal_uInt16 nCount = SwDoc::FillRubyList( *rSh.GetCrsr(), aList, 0 );
     Sequence< Sequence< PropertyValue > > aRet(nCount);
     Sequence< PropertyValue >* pRet = aRet.getArray();
     OUString aString;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index d80c5097f7dd..f5a63c3dcab1 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -1207,7 +1207,7 @@ PopupMenu* SwContentTree::CreateContextMenu()
                     pSubPop4->InsertItem(403, aContextStrings[ST_EDIT_ENTRY - ST_CONTEXT_FIRST]);
                 pSubPop4->InsertItem(405, sReadonlyIdx);
 
-                pSubPop4->CheckItem( 405, pActiveShell->IsTOXBaseReadonly(*pBase));
+                pSubPop4->CheckItem( 405, SwEditShell::IsTOXBaseReadonly(*pBase));
                 pSubPop4->InsertItem(501, aContextStrings[ST_DELETE_ENTRY - ST_CONTEXT_FIRST]);
             }
             else if(CONTENT_TYPE_TABLE == nContentType && !bReadonly)
@@ -2944,7 +2944,7 @@ void    SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry
         {
             const SwTOXBase* pBase = static_cast<SwTOXBaseContent*>(pFirst->GetUserData())
                                                                 ->GetTOXBase();
-            pActiveShell->SetTOXBaseReadonly(*pBase, !pActiveShell->IsTOXBaseReadonly(*pBase));
+            pActiveShell->SetTOXBaseReadonly(*pBase, !SwEditShell::IsTOXBaseReadonly(*pBase));
         }
         break;
         case 4: