Kaydet (Commit) d197d524 authored tarafından Noel Grandin's avatar Noel Grandin

loplugin:staticmethods in sfx2

Change-Id: Ide10d0186431e745c3bb17d321cf46724e801c8f
Reviewed-on: https://gerrit.libreoffice.org/63404
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 80751cd9
...@@ -55,7 +55,7 @@ private: ...@@ -55,7 +55,7 @@ private:
SAL_DLLPRIVATE void SetDialogData_Impl(); SAL_DLLPRIVATE void SetDialogData_Impl();
SAL_DLLPRIVATE void GetDialogData_Impl(); SAL_DLLPRIVATE void GetDialogData_Impl();
DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); DECL_DLLPRIVATE_STATIC_LINK(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*);
protected: protected:
SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription); SfxModalDialog(vcl::Window *pParent, const OUString& rID, const OUString& rUIXMLDescription);
...@@ -86,7 +86,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog ...@@ -86,7 +86,7 @@ class SFX2_DLLPUBLIC SfxModelessDialog: public ModelessDialog
void Init(SfxBindings *pBindinx, SfxChildWindow *pCW); void Init(SfxBindings *pBindinx, SfxChildWindow *pCW);
DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); DECL_DLLPRIVATE_STATIC_LINK(SfxModelessDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*);
protected: protected:
SfxModelessDialog( SfxBindings*, SfxChildWindow*, SfxModelessDialog( SfxBindings*, SfxChildWindow*,
vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription ); vcl::Window*, const OUString& rID, const OUString& rUIXMLDescription );
...@@ -110,7 +110,7 @@ public: ...@@ -110,7 +110,7 @@ public:
class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController class SFX2_DLLPUBLIC SfxDialogController : public weld::GenericDialogController
{ {
private: private:
DECL_DLLPRIVATE_LINK(InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*); DECL_DLLPRIVATE_STATIC_LINK(SfxDialogController, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*);
public: public:
SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId); SfxDialogController(weld::Widget* pParent, const OUString& rUIFile, const OString& rDialogId);
}; };
......
...@@ -750,7 +750,7 @@ public: ...@@ -750,7 +750,7 @@ public:
SAL_DLLPRIVATE SignatureState ImplGetSignatureState( bool bScriptingContent = false ); SAL_DLLPRIVATE SignatureState ImplGetSignatureState( bool bScriptingContent = false );
SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler ); SAL_DLLPRIVATE bool QuerySaveSizeExceededModules_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler );
SAL_DLLPRIVATE bool QueryAllowExoticFormat_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler, SAL_DLLPRIVATE static bool QueryAllowExoticFormat_Impl( const css::uno::Reference< css::task::XInteractionHandler >& xHandler,
const OUString& rURL, const OUString& rURL,
const OUString& rFilterUIName); const OUString& rFilterUIName);
......
...@@ -55,7 +55,7 @@ public: ...@@ -55,7 +55,7 @@ public:
void Suspend(); void Suspend();
bool IsSuspended() const { return bSuspended; } bool IsSuspended() const { return bSuspended; }
void Reschedule(); static void Reschedule();
void Stop(); void Stop();
......
...@@ -31,7 +31,7 @@ public: ...@@ -31,7 +31,7 @@ public:
const std::function<void()>& rCloserAction); const std::function<void()>& rCloserAction);
void SetCloserVisible(const bool bIsCloserVisible); void SetCloserVisible(const bool bIsCloserVisible);
tools::Rectangle GetDragArea() const; static tools::Rectangle GetDragArea();
virtual void DataChanged(const DataChangedEvent& rEvent) override; virtual void DataChanged(const DataChangedEvent& rEvent) override;
virtual void MouseMove(const MouseEvent& rMouseEvent) override; virtual void MouseMove(const MouseEvent& rMouseEvent) override;
......
...@@ -130,7 +130,7 @@ SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const ...@@ -130,7 +130,7 @@ SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const
GetDialogData_Impl(); GetDialogData_Impl();
} }
IMPL_LINK_NOARG(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*) IMPL_STATIC_LINK_NOARG(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
{ {
return SfxViewShell::Current(); return SfxViewShell::Current();
} }
...@@ -274,7 +274,7 @@ SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx, ...@@ -274,7 +274,7 @@ SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
Init(pBindinx, pCW); Init(pBindinx, pCW);
} }
IMPL_LINK_NOARG(SfxModelessDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*) IMPL_STATIC_LINK_NOARG(SfxModelessDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
{ {
return SfxViewShell::Current(); return SfxViewShell::Current();
} }
...@@ -840,7 +840,7 @@ SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString& ...@@ -840,7 +840,7 @@ SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString&
m_xDialog->SetInstallLOKNotifierHdl(LINK(this, SfxDialogController, InstallLOKNotifierHdl)); m_xDialog->SetInstallLOKNotifierHdl(LINK(this, SfxDialogController, InstallLOKNotifierHdl));
} }
IMPL_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*) IMPL_STATIC_LINK_NOARG(SfxDialogController, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
{ {
return SfxViewShell::Current(); return SfxViewShell::Current();
} }
......
...@@ -82,7 +82,7 @@ tools::Rectangle DeckTitleBar::GetTitleArea (const tools::Rectangle& rTitleBarBo ...@@ -82,7 +82,7 @@ tools::Rectangle DeckTitleBar::GetTitleArea (const tools::Rectangle& rTitleBarBo
rTitleBarBox.Bottom()); rTitleBarBox.Bottom());
} }
tools::Rectangle DeckTitleBar::GetDragArea() const tools::Rectangle DeckTitleBar::GetDragArea()
{ {
Image aGripImage (Theme::GetImage(Theme::Image_Grip)); Image aGripImage (Theme::GetImage(Theme::Image_Grip));
return tools::Rectangle(0,0, return tools::Rectangle(0,0,
......
...@@ -1389,7 +1389,7 @@ tools::Rectangle SidebarController::GetDeckDragArea() const ...@@ -1389,7 +1389,7 @@ tools::Rectangle SidebarController::GetDeckDragArea() const
if(pTitleBar) if(pTitleBar)
{ {
aRect = pTitleBar->GetDragArea(); aRect = DeckTitleBar::GetDragArea();
} }
} }
......
...@@ -97,7 +97,7 @@ public: ...@@ -97,7 +97,7 @@ public:
{ {
return m_pCategory; return m_pCategory;
} }
sfx::ClassificationCreationOrigin getExistingClassificationOrigin(); static sfx::ClassificationCreationOrigin getExistingClassificationOrigin();
void toggleInteractivityOnOrigin(); void toggleInteractivityOnOrigin();
void setCategoryStateFromPolicy(SfxClassificationHelper & rHelper); void setCategoryStateFromPolicy(SfxClassificationHelper & rHelper);
}; };
...@@ -175,7 +175,7 @@ IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, vo ...@@ -175,7 +175,7 @@ IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, vo
{ {
m_pClassification->toggleInteractivityOnOrigin(); m_pClassification->toggleInteractivityOnOrigin();
if (m_pClassification->getExistingClassificationOrigin() == sfx::ClassificationCreationOrigin::MANUAL) if (ClassificationControl::getExistingClassificationOrigin() == sfx::ClassificationCreationOrigin::MANUAL)
{ {
SfxObjectShell* pObjectShell = SfxObjectShell::Current(); SfxObjectShell* pObjectShell = SfxObjectShell::Current();
if (!pObjectShell) if (!pObjectShell)
...@@ -211,7 +211,7 @@ void ClassificationCategoriesController::statusChanged(const frame::FeatureState ...@@ -211,7 +211,7 @@ void ClassificationCategoriesController::statusChanged(const frame::FeatureState
m_pClassification->toggleInteractivityOnOrigin(); m_pClassification->toggleInteractivityOnOrigin();
// check if classification was set via the advanced dialog // check if classification was set via the advanced dialog
if (m_pClassification->getExistingClassificationOrigin() != sfx::ClassificationCreationOrigin::MANUAL) if (ClassificationControl::getExistingClassificationOrigin() != sfx::ClassificationCreationOrigin::MANUAL)
{ {
VclPtr<ListBox> pCategories = m_pClassification->getCategory(); VclPtr<ListBox> pCategories = m_pClassification->getCategory();
if (pCategories->GetEntryCount() == 0) if (pCategories->GetEntryCount() == 0)
......
...@@ -3331,7 +3331,7 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons ...@@ -3331,7 +3331,7 @@ void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect cons
if( aShortCut.Stop( aPaintRect ) ) if( aShortCut.Stop( aPaintRect ) )
break; break;
if ( bCnt && gProp.pSProgress ) if ( bCnt && gProp.pSProgress )
gProp.pSProgress->Reschedule(); SfxProgress::Reschedule();
//We need to retouch if a frame explicitly requests it. //We need to retouch if a frame explicitly requests it.
//First do the retouch, because this could flatten the borders. //First do the retouch, because this could flatten the borders.
...@@ -4092,7 +4092,7 @@ void SwFlyFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& ...@@ -4092,7 +4092,7 @@ void SwFlyFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const&
rRenderContext.Pop(); rRenderContext.Pop();
if ( gProp.pSProgress && pNoText ) if ( gProp.pSProgress && pNoText )
gProp.pSProgress->Reschedule(); SfxProgress::Reschedule();
} }
void SwTabFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const void SwTabFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect const& rRect, SwPrintData const*const) const
...@@ -6292,7 +6292,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP ...@@ -6292,7 +6292,7 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP
SwShortCut aShortCut( *pFrame, aBorderRect ); SwShortCut aShortCut( *pFrame, aBorderRect );
do do
{ if ( gProp.pSProgress ) { if ( gProp.pSProgress )
gProp.pSProgress->Reschedule(); SfxProgress::Reschedule();
aFrameRect = pFrame->GetPaintArea(); aFrameRect = pFrame->GetPaintArea();
if ( aFrameRect.IsOver( aBorderRect ) ) if ( aFrameRect.IsOver( aBorderRect ) )
......
...@@ -132,7 +132,7 @@ void RescheduleProgress( SwDocShell const *pDocShell ) ...@@ -132,7 +132,7 @@ void RescheduleProgress( SwDocShell const *pDocShell )
{ {
SwProgress *pProgress = lcl_SwFindProgress( pDocShell ); SwProgress *pProgress = lcl_SwFindProgress( pDocShell );
if ( pProgress ) if ( pProgress )
pProgress->pProgress->Reschedule(); SfxProgress::Reschedule();
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment