loplugin:staticmethods: sfx2

Change-Id: I64bd8564b335481a8cdfb053cc9563bea8ef47d3

16 files changed, 37 insertions, 37 deletions

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 67df6f296dbd..99577e69194d 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -118,7 +118,7 @@ class SFX2_DLLPUBLIC SfxApplication: public SfxShell
 {
     std::unique_ptr<SfxAppData_Impl>            pImpl;
 
-    DECL_DLLPRIVATE_LINK( GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
+    DECL_DLLPRIVATE_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, bool );
 
     void                        Deinitialize();
 
@@ -215,23 +215,23 @@ public:
     SAL_DLLPRIVATE void         OpenRemoteExec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void         MiscExec_Impl(SfxRequest &);
     SAL_DLLPRIVATE void         MiscState_Impl(SfxItemSet &);
-    SAL_DLLPRIVATE void         PropExec_Impl(SfxRequest &);
-    SAL_DLLPRIVATE void         PropState_Impl(SfxItemSet &);
+    SAL_DLLPRIVATE static void  PropExec_Impl(SfxRequest &);
+    SAL_DLLPRIVATE static void  PropState_Impl(SfxItemSet &);
     SAL_DLLPRIVATE void         OfaExec_Impl(SfxRequest &);
-    SAL_DLLPRIVATE void         OfaState_Impl(SfxItemSet &);
+    SAL_DLLPRIVATE static void  OfaState_Impl(SfxItemSet &);
 
     SAL_DLLPRIVATE void         SetProgress_Impl(SfxProgress *);
     SAL_DLLPRIVATE const OUString& GetLastDir_Impl() const;
     SAL_DLLPRIVATE void         SetLastDir_Impl( const OUString & );
 
-    SAL_DLLPRIVATE void         Registrations_Impl();
+    SAL_DLLPRIVATE static void  Registrations_Impl();
     SAL_DLLPRIVATE SfxWorkWindow* GetWorkWindow_Impl(const SfxViewFrame *pFrame=nullptr) const;
 
     // TODO/CLEANUP: still needed? -- unclear whether this comment
     // refers to the GetDisabledSlotList_Impl() method which was
     // already removed, or the below methods?
     SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
-    SAL_DLLPRIVATE SfxModule*   GetModule_Impl();
+    SAL_DLLPRIVATE static SfxModule* GetModule_Impl();
 
     static void                 SetModule(SfxToolsModule nSharedLib, std::unique_ptr<SfxModule> pModule);
     static SfxModule*           GetModule(SfxToolsModule nSharedLib);
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 7dc728994eb6..6e1c336ce472 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -204,7 +204,7 @@ public:
     void                SetVisible_Impl( bool bVis );
     SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* );
     SAL_DLLPRIVATE void Activate_Impl();
-    SAL_DLLPRIVATE void Deactivate_Impl();
+    SAL_DLLPRIVATE static void Deactivate_Impl();
 
     SAL_DLLPRIVATE SfxChildWindowContext*
                         GetContext_Impl() const
diff --git a/include/sfx2/dispatch.hxx b/include/sfx2/dispatch.hxx
index 8d88ce0b3946..783f0c2ef295 100644
--- a/include/sfx2/dispatch.hxx
+++ b/include/sfx2/dispatch.hxx
@@ -181,8 +181,8 @@ public:
     SAL_DLLPRIVATE void SetQuietMode_Impl( bool bOn );
     SAL_DLLPRIVATE bool IsReadOnlyShell_Impl( sal_uInt16 nShell ) const;
     SAL_DLLPRIVATE void RemoveShell_Impl( SfxShell& rShell );
-    SAL_DLLPRIVATE void DoParentActivate_Impl();
-    SAL_DLLPRIVATE void DoParentDeactivate_Impl();
+    SAL_DLLPRIVATE static void DoParentActivate_Impl();
+    SAL_DLLPRIVATE static void DoParentDeactivate_Impl();
     SAL_DLLPRIVATE void DoActivate_Impl( bool bMDI );
     SAL_DLLPRIVATE void DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew );
     SAL_DLLPRIVATE void InvalidateBindings_Impl(bool);
diff --git a/include/sfx2/dockwin.hxx b/include/sfx2/dockwin.hxx
index 03201c79dca0..9d10cf5cc868 100644
--- a/include/sfx2/dockwin.hxx
+++ b/include/sfx2/dockwin.hxx
@@ -102,7 +102,7 @@ public:
     DECL_LINK(TimerHdl, Idle *, void);
 
     SAL_DLLPRIVATE void Initialize_Impl();
-    SAL_DLLPRIVATE SplitWindowItemFlags GetWinBits_Impl() const;
+    SAL_DLLPRIVATE static SplitWindowItemFlags GetWinBits_Impl();
     SAL_DLLPRIVATE void SetItemSize_Impl( const Size& rSize );
     SAL_DLLPRIVATE void Disappear_Impl();
     SAL_DLLPRIVATE void Reappear_Impl();
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 1b9dfaf68960..72763397d1a4 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -625,7 +625,7 @@ public:
 
     SAL_DLLPRIVATE std::shared_ptr<GDIMetaFile> CreatePreviewMetaFile_Impl(bool bFullContent) const;
 
-    SAL_DLLPRIVATE bool IsPackageStorageFormat_Impl(const SfxMedium &) const;
+    SAL_DLLPRIVATE static bool IsPackageStorageFormat_Impl(const SfxMedium &);
 
     SAL_DLLPRIVATE bool ConnectTmpStorage_Impl( const css::uno::Reference< css::embed::XStorage >& xStorage, SfxMedium* pMedium );
     SAL_DLLPRIVATE bool DisconnectStorage_Impl( SfxMedium& rSrcMedium, SfxMedium& rTargetMedium );
@@ -642,7 +642,7 @@ public:
     SAL_DLLPRIVATE void BreakMacroSign_Impl( bool bBreakMacroSing );
     SAL_DLLPRIVATE void CheckSecurityOnLoading_Impl();
     SAL_DLLPRIVATE void CheckForBrokenDocSignatures_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
-    SAL_DLLPRIVATE SignatureState ImplCheckSignaturesInformation(
+    SAL_DLLPRIVATE static SignatureState ImplCheckSignaturesInformation(
                 const css::uno::Sequence< css::security::DocumentSignatureInformation >& aInfos );
     SAL_DLLPRIVATE void CheckEncryption_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
     SAL_DLLPRIVATE void SetModifyPasswordEntered( bool bEntered = true );
@@ -673,7 +673,7 @@ public:
     SAL_DLLPRIVATE void ExecProps_Impl(SfxRequest &);
     SAL_DLLPRIVATE void StateProps_Impl(SfxItemSet &);
     SAL_DLLPRIVATE void ExecView_Impl(SfxRequest &);
-    SAL_DLLPRIVATE void StateView_Impl(SfxItemSet &);
+    SAL_DLLPRIVATE static void StateView_Impl(SfxItemSet &);
 
     // Load/Save public internals
     SAL_DLLPRIVATE bool ImportFromGeneratedStream_Impl(
diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx
index da6a5a281383..561b336cfa1a 100644
--- a/include/sfx2/sfxhelp.hxx
+++ b/include/sfx2/sfxhelp.hxx
@@ -33,11 +33,11 @@ class SFX2_DLLPUBLIC SfxHelp : public Help
     bool            bIsDebug;
 
 private:
-    SAL_DLLPRIVATE bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword );
+    SAL_DLLPRIVATE static bool Start_Impl( const OUString& rURL, const vcl::Window* pWindow, const OUString& rKeyword );
     SAL_DLLPRIVATE virtual bool SearchKeyword( const OUString& rKeyWord ) override;
     SAL_DLLPRIVATE virtual bool Start( const OUString& rURL, const vcl::Window* pWindow ) override;
-    SAL_DLLPRIVATE OUString GetHelpModuleName_Impl();
-    SAL_DLLPRIVATE OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName );
+    SAL_DLLPRIVATE static OUString GetHelpModuleName_Impl();
+    SAL_DLLPRIVATE static OUString CreateHelpURL_Impl( const OUString& aCommandURL, const OUString& rModuleName );
 
 public:
     SfxHelp();
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index ec4e931c71b4..a413638d4b31 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -196,7 +196,7 @@ public:
     SAL_DLLPRIVATE void StateView_Impl( SfxItemSet &rSet );
     SAL_DLLPRIVATE void ExecHistory_Impl( SfxRequest &rReq );
     SAL_DLLPRIVATE void StateHistory_Impl( SfxItemSet &rSet );
-    SAL_DLLPRIVATE SfxViewFrame* GetParentViewFrame_Impl() const;
+    SAL_DLLPRIVATE static SfxViewFrame* GetParentViewFrame_Impl();
     SAL_DLLPRIVATE void ForceOuterResize_Impl();
     SAL_DLLPRIVATE bool IsResizeInToOut_Impl() const;
     SAL_DLLPRIVATE void UpdateDocument_Impl();
diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx
index 0b65b948abdd..0b0c2d833391 100644
--- a/sfx2/source/appl/app.cxx
+++ b/sfx2/source/appl/app.cxx
@@ -314,11 +314,11 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame )
     {
         // get the containerframes ( if one of the frames is an InPlaceFrame )
         SfxViewFrame *pOldContainerFrame = pImpl->pViewFrame;
-        while ( pOldContainerFrame && pOldContainerFrame->GetParentViewFrame_Impl() )
-            pOldContainerFrame = pOldContainerFrame->GetParentViewFrame_Impl();
+        while ( pOldContainerFrame && SfxViewFrame::GetParentViewFrame_Impl() )
+            pOldContainerFrame = SfxViewFrame::GetParentViewFrame_Impl();
         SfxViewFrame *pNewContainerFrame = pFrame;
-        while ( pNewContainerFrame && pNewContainerFrame->GetParentViewFrame_Impl() )
-            pNewContainerFrame = pNewContainerFrame->GetParentViewFrame_Impl();
+        while ( pNewContainerFrame && SfxViewFrame::GetParentViewFrame_Impl() )
+            pNewContainerFrame = SfxViewFrame::GetParentViewFrame_Impl();
 
         // DocWinActivate : both frames belong to the same TopWindow
         // TopWinActivate : both frames belong to different TopWindows
@@ -467,7 +467,7 @@ extern "C" void basicide_macro_organizer(sal_Int16);
 
 #endif
 
-IMPL_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool )
+IMPL_STATIC_LINK( SfxApplication, GlobalBasicErrorHdl_Impl, StarBASIC*, pStarBasic, bool )
 {
 #if !HAVE_FEATURE_SCRIPTING
     (void) pStarBasic;
diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 8e10bb7dd8c1..9247ac5cf961 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -658,7 +658,7 @@ bool SfxHelp::Start_Impl(const OUString& rURL, const vcl::Window* pWindow, const
 OUString SfxHelp::CreateHelpURL(const OUString& aCommandURL, const OUString& rModuleName)
 {
     SfxHelp* pHelp = static_cast< SfxHelp* >(Application::GetHelp());
-    return pHelp ? pHelp->CreateHelpURL_Impl( aCommandURL, rModuleName ) : OUString();
+    return pHelp ? SfxHelp::CreateHelpURL_Impl( aCommandURL, rModuleName ) : OUString();
 }
 
 OUString SfxHelp::GetDefaultHelpModule()
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index 971c7502f4bb..e4011862de40 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -333,7 +333,7 @@ bool SfxModelessDialog::Notify( NotifyEvent& rEvt )
         else if ( rEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
         {
             pBindings->SetActiveFrame( css::uno::Reference< css::frame::XFrame > () );
-            pImpl->pMgr->Deactivate_Impl();
+            SfxChildWindow::Deactivate_Impl();
         }
         else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
         {
@@ -421,7 +421,7 @@ bool SfxFloatingWindow::Notify( NotifyEvent& rEvt )
             if ( !HasChildPathFocus() )
             {
                 pBindings->SetActiveFrame( nullptr );
-                pImpl->pMgr->Deactivate_Impl();
+                SfxChildWindow::Deactivate_Impl();
             }
         }
         else if( rEvt.GetType() == MouseNotifyEvent::KEYINPUT )
diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx
index f74494f1ed7c..9365efea38a3 100644
--- a/sfx2/source/dialog/dockwin.cxx
+++ b/sfx2/source/dialog/dockwin.cxx
@@ -1657,14 +1657,14 @@ bool SfxDockingWindow::Notify( NotifyEvent& rEvt )
     {
         pBindings->SetActiveFrame( nullptr );
         if (pMgr != nullptr)
-            pMgr->Deactivate_Impl();
+            SfxChildWindow::Deactivate_Impl();
     }
 
     return DockingWindow::Notify( rEvt );
 }
 
 
-SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl() const
+SplitWindowItemFlags SfxDockingWindow::GetWinBits_Impl()
 {
     return SplitWindowItemFlags::NONE;
 }
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index 978cf37ff0c8..a0a41e7d8e6d 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -95,7 +95,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage(vcl::Window* pParent, const Sfx
     else
         m_pEditLinkStyleBtn->Enable();
 
-    ResMgr* pResMgr = SfxGetpApp()->GetModule_Impl()->GetResMgr();
+    ResMgr* pResMgr = SfxApplication::GetModule_Impl()->GetResMgr();
     OSL_ENSURE( pResMgr, "No ResMgr in Module" );
     pFamilies = new SfxStyleFamilies( ResId( DLG_STYLE_DESIGNER, *pResMgr ) );
 
diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx
index a31e3563766a..2e80e3b7fd19 100644
--- a/sfx2/source/dialog/splitwin.cxx
+++ b/sfx2/source/dialog/splitwin.cxx
@@ -663,7 +663,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock,
 {
     SfxDockingWindow* pDockWin = pDock->pWin;
 
-    SplitWindowItemFlags nItemBits = pDockWin->GetWinBits_Impl();
+    SplitWindowItemFlags nItemBits = SfxDockingWindow::GetWinBits_Impl();
 
     long nWinSize, nSetSize;
     if ( IsHorizontal() )
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx
index 60f4c6345f74..13e762ae57d7 100644
--- a/sfx2/source/doc/objmisc.cxx
+++ b/sfx2/source/doc/objmisc.cxx
@@ -1867,7 +1867,7 @@ bool SfxObjectShell_Impl::hasTrustedScriptingSignature( bool bAllowUIToAddAuthor
             if ( aInfo.getLength() )
             {
                 if ( nScriptingSignatureState == SignatureState::UNKNOWN )
-                    nScriptingSignatureState = rDocShell.ImplCheckSignaturesInformation( aInfo );
+                    nScriptingSignatureState = SfxObjectShell::ImplCheckSignaturesInformation( aInfo );
 
                 if ( nScriptingSignatureState == SignatureState::OK
                   || nScriptingSignatureState == SignatureState::NOTVALIDATED )
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 3de2dc38b6fe..6edaf1159291 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -981,7 +981,7 @@ bool SfxObjectShell::IsOwnStorageFormat(const SfxMedium &rMedium)
 }
 
 
-bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium) const
+bool SfxObjectShell::IsPackageStorageFormat_Impl(const SfxMedium &rMedium)
 {
     return !rMedium.GetFilter() || // Embedded
            ( rMedium.GetFilter()->UsesStorage() &&
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index f84b8b2cd2d6..1a161f3ba9ab 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -1082,7 +1082,7 @@ void SfxViewFrame::DoActivate( bool bUI )
         SfxViewFrame *pFrame = GetParentViewFrame();
         while ( pFrame )
         {
-            pFrame->m_pDispatcher->DoParentActivate_Impl();
+            SfxDispatcher::DoParentActivate_Impl();
             pFrame = pFrame->GetParentViewFrame();
         }
     }
@@ -1101,7 +1101,7 @@ void SfxViewFrame::DoDeactivate(bool bUI, SfxViewFrame* pNewFrame )
         while ( pFrame )
         {
             if ( !pNewFrame || !pNewFrame->GetFrame().IsParent( &pFrame->GetFrame() ) )
-                pFrame->m_pDispatcher->DoParentDeactivate_Impl();
+                SfxDispatcher::DoParentDeactivate_Impl();
             pFrame = pFrame->GetParentViewFrame();
         }
     }
@@ -1555,7 +1555,7 @@ void SfxViewFrame::SetViewShell_Impl( SfxViewShell *pVSh )
     The ParentViewFrame of the Containers ViewFrame in the internal InPlace
 */
 //TODO/LATER: is it still necessary? is there a replacement for GetParentViewFrame_Impl?
-SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl() const
+SfxViewFrame* SfxViewFrame::GetParentViewFrame_Impl()
 {
     return nullptr;
 }
@@ -1700,7 +1700,7 @@ void SfxViewFrame::MakeActive_Impl( bool bGrabFocus )
                     {
                         SfxInPlaceClient *pCli = GetViewShell()->GetUIActiveClient();
                         if ( ( !pCli || !pCli->IsObjectUIActive() ) &&
-                            ( !pCurrent || pCurrent->GetParentViewFrame_Impl() != this ) )
+                            ( !pCurrent || SfxViewFrame::GetParentViewFrame_Impl() != this ) )
                                 GetFrame().GrabFocusOnComponent_Impl();
                     }
                 }
@@ -2812,8 +2812,8 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
                 {
                     // Get the ContainerFrame, when internal InPlace.
                     SfxViewFrame *pFrame = this;
-                    if ( pFrame->GetParentViewFrame_Impl() )
-                        pFrame = pFrame->GetParentViewFrame_Impl();
+                    if ( SfxViewFrame::GetParentViewFrame_Impl() )
+                        pFrame = SfxViewFrame::GetParentViewFrame_Impl();
                     rSet.Put( SfxStringItem( nWhich, pFrame->GetActualPresentationURL_Impl() ) );
                     break;
                 }