summaryrefslogtreecommitdiff
path: root/include/sfx2
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2021-06-17 09:49:37 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2021-06-19 14:08:50 +0200
commite3077168072452fb8f1c0a8afb2992877cb96d1c (patch)
tree785da5126ddb052250ee3747fa221c746cc62e82 /include/sfx2
parente48dd86341fff8a010f514bbcd818468f3a92815 (diff)
loplugin:finalclasses
improve the plugin to detect more cases. I only apply the new final changes to classes in /include here. Which reveals that RoadmapWizard::getPageController( TabPage* _pCurrentPage ) will always return nullptr Also needed to sprinkle some SAL_DLLPUBLIC_TEMPLATE around to workaround Visual Studio linking problems. Change-Id: Iadb7d46a9e0e73dabce562375ca013c0fea6690c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117365 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include/sfx2')
-rw-r--r--include/sfx2/bindings.hxx2
-rw-r--r--include/sfx2/linkmgr.hxx2
-rw-r--r--include/sfx2/objsh.hxx1
-rw-r--r--include/sfx2/sidebar/SidebarController.hxx2
-rw-r--r--include/sfx2/viewfrm.hxx6
-rw-r--r--include/sfx2/zoomitem.hxx2
6 files changed, 5 insertions, 10 deletions
diff --git a/include/sfx2/bindings.hxx b/include/sfx2/bindings.hxx
index 3eb756ebb18d..f4f44bd1af7a 100644
--- a/include/sfx2/bindings.hxx
+++ b/include/sfx2/bindings.hxx
@@ -67,7 +67,7 @@ template<> struct typed_flags<SfxCallMode>: is_typed_flags<SfxCallMode, 0x0F>
}
-class SFX2_DLLPUBLIC SfxBindings: public SfxBroadcaster
+class SFX2_DLLPUBLIC SfxBindings final : public SfxBroadcaster
/* [Description]
diff --git a/include/sfx2/linkmgr.hxx b/include/sfx2/linkmgr.hxx
index b952e992092b..e4f58a996480 100644
--- a/include/sfx2/linkmgr.hxx
+++ b/include/sfx2/linkmgr.hxx
@@ -61,7 +61,7 @@ class SFX2_DLLPUBLIC LinkManager
SvLinkSources aServerTbl;
SfxObjectShell *pPersist; // LinkMgr must be release before SfxObjectShell
-protected:
+
bool InsertLink( SvBaseLink* pLink, SvBaseLinkObjectType nObjType, SfxLinkUpdateMode nUpdateType,
const OUString* pName );
public:
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index dfdd240a4413..725f72b1c9f6 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -814,7 +814,6 @@ typedef tools::SvRef<SfxObjectShell> SfxObjectShellRef;
class SfxObjectShellLock
{
-protected:
SfxObjectShell * pObj;
public:
SfxObjectShellLock() { pObj = nullptr; }
diff --git a/include/sfx2/sidebar/SidebarController.hxx b/include/sfx2/sidebar/SidebarController.hxx
index 48d595722717..133c1f5806c6 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -59,7 +59,7 @@ namespace sfx2::sidebar {
class DeckDescriptor;
class SidebarDockingWindow;
-class SFX2_DLLPUBLIC SidebarController
+class SFX2_DLLPUBLIC SidebarController final
: private ::cppu::BaseMutex,
public SidebarControllerInterfaceBase
{
diff --git a/include/sfx2/viewfrm.hxx b/include/sfx2/viewfrm.hxx
index 4585b722e487..7dd7f0e8553a 100644
--- a/include/sfx2/viewfrm.hxx
+++ b/include/sfx2/viewfrm.hxx
@@ -46,7 +46,7 @@ class SfxInfoBarWindow;
enum class InfobarType;
class CommandPopupHandler;
-class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
+class SFX2_DLLPUBLIC SfxViewFrame final : public SfxShell, public SfxListener
{
std::unique_ptr<struct SfxViewFrame_Impl> m_pImpl;
@@ -59,12 +59,8 @@ class SFX2_DLLPUBLIC SfxViewFrame: public SfxShell, public SfxListener
std::unique_ptr<CommandPopupHandler> m_pCommandPopupHandler;
-private:
SAL_DLLPRIVATE void Construct_Impl( SfxObjectShell *pObjSh );
-
-protected:
virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
-
DECL_LINK(GetInvolvedHandler, weld::Button&, void);
DECL_LINK(DonationHandler, weld::Button&, void);
DECL_LINK(WhatsNewHandler, weld::Button&, void);
diff --git a/include/sfx2/zoomitem.hxx b/include/sfx2/zoomitem.hxx
index 32285cb704cd..4e7703dfdf92 100644
--- a/include/sfx2/zoomitem.hxx
+++ b/include/sfx2/zoomitem.hxx
@@ -52,7 +52,7 @@ namespace o3tl
template<> struct typed_flags<SvxZoomEnableFlags> : is_typed_flags<SvxZoomEnableFlags, 0x701f> {};
}
-class SFX2_DLLPUBLIC SvxZoomItem: public SfxUInt16Item
+class SFX2_DLLPUBLIC SvxZoomItem final : public SfxUInt16Item
{
SvxZoomEnableFlags nValueSet; // allowed values (see #defines below)
SvxZoomType eType;