summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-11-15 12:28:17 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-11-15 17:33:55 +0100
commitd197d524c5292cf6d66be802ec7d1fed78e30416 (patch)
treeed1c3f2476cc557a776b9f6aabc56be3bb5b8534 /sfx2
parent80751cd90d007a19143e13bf69c7e317b7d4afc9 (diff)
loplugin:staticmethods in sfx2
Change-Id: Ide10d0186431e745c3bb17d321cf46724e801c8f Reviewed-on: https://gerrit.libreoffice.org/63404 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/basedlgs.cxx6
-rw-r--r--sfx2/source/sidebar/DeckTitleBar.cxx2
-rw-r--r--sfx2/source/sidebar/SidebarController.cxx2
-rw-r--r--sfx2/source/view/classificationcontroller.cxx6
4 files changed, 8 insertions, 8 deletions
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index f3b35c63071d..7ad50b9b86ad 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -130,7 +130,7 @@ SfxModalDialog::SfxModalDialog(vcl::Window *pParent, const OUString& rID, const
GetDialogData_Impl();
}
-IMPL_LINK_NOARG(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
+IMPL_STATIC_LINK_NOARG(SfxModalDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
{
return SfxViewShell::Current();
}
@@ -274,7 +274,7 @@ SfxModelessDialog::SfxModelessDialog(SfxBindings* pBindinx,
Init(pBindinx, pCW);
}
-IMPL_LINK_NOARG(SfxModelessDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
+IMPL_STATIC_LINK_NOARG(SfxModelessDialog, InstallLOKNotifierHdl, void*, vcl::ILibreOfficeKitNotifier*)
{
return SfxViewShell::Current();
}
@@ -840,7 +840,7 @@ SfxDialogController::SfxDialogController(weld::Widget* pParent, const OUString&
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();
}
diff --git a/sfx2/source/sidebar/DeckTitleBar.cxx b/sfx2/source/sidebar/DeckTitleBar.cxx
index 40450ddeaa7b..35e62b9eee4b 100644
--- a/sfx2/source/sidebar/DeckTitleBar.cxx
+++ b/sfx2/source/sidebar/DeckTitleBar.cxx
@@ -82,7 +82,7 @@ tools::Rectangle DeckTitleBar::GetTitleArea (const tools::Rectangle& rTitleBarBo
rTitleBarBox.Bottom());
}
-tools::Rectangle DeckTitleBar::GetDragArea() const
+tools::Rectangle DeckTitleBar::GetDragArea()
{
Image aGripImage (Theme::GetImage(Theme::Image_Grip));
return tools::Rectangle(0,0,
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index 338fd9d6137d..95b33d7cde4a 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1389,7 +1389,7 @@ tools::Rectangle SidebarController::GetDeckDragArea() const
if(pTitleBar)
{
- aRect = pTitleBar->GetDragArea();
+ aRect = DeckTitleBar::GetDragArea();
}
}
diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx
index accb1d9d0c28..f07824a3774a 100644
--- a/sfx2/source/view/classificationcontroller.cxx
+++ b/sfx2/source/view/classificationcontroller.cxx
@@ -97,7 +97,7 @@ public:
{
return m_pCategory;
}
- sfx::ClassificationCreationOrigin getExistingClassificationOrigin();
+ static sfx::ClassificationCreationOrigin getExistingClassificationOrigin();
void toggleInteractivityOnOrigin();
void setCategoryStateFromPolicy(SfxClassificationHelper & rHelper);
};
@@ -175,7 +175,7 @@ IMPL_LINK(ClassificationCategoriesController, SelectHdl, ListBox&, rCategory, vo
{
m_pClassification->toggleInteractivityOnOrigin();
- if (m_pClassification->getExistingClassificationOrigin() == sfx::ClassificationCreationOrigin::MANUAL)
+ if (ClassificationControl::getExistingClassificationOrigin() == sfx::ClassificationCreationOrigin::MANUAL)
{
SfxObjectShell* pObjectShell = SfxObjectShell::Current();
if (!pObjectShell)
@@ -211,7 +211,7 @@ void ClassificationCategoriesController::statusChanged(const frame::FeatureState
m_pClassification->toggleInteractivityOnOrigin();
// 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();
if (pCategories->GetEntryCount() == 0)