diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 12:03:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-07 12:07:43 +0200 |
commit | a360d0b33a66be1ae190196e39c12b0494ba2840 (patch) | |
tree | 6466302bcb6187bc7fed17695b077527b5d34f9a /include/sfx2 | |
parent | 5700899b13826f27be9c43fa9d7b5df786dd66df (diff) |
loplugin:staticmethods: sfx2
Change-Id: I64bd8564b335481a8cdfb053cc9563bea8ef47d3
Diffstat (limited to 'include/sfx2')
-rw-r--r-- | include/sfx2/app.hxx | 12 | ||||
-rw-r--r-- | include/sfx2/childwin.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/dispatch.hxx | 4 | ||||
-rw-r--r-- | include/sfx2/dockwin.hxx | 2 | ||||
-rw-r--r-- | include/sfx2/objsh.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/sfxhelp.hxx | 6 | ||||
-rw-r--r-- | include/sfx2/viewfrm.hxx | 2 |
7 files changed, 17 insertions, 17 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(); |