[Libreoffice-commits] core.git: sfx2/inc sfx2/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Fri Jun 25 10:26:14 UTC 2021
sfx2/inc/templatedefaultview.hxx | 2 +-
sfx2/inc/unoctitm.hxx | 2 +-
sfx2/source/inc/alienwarn.hxx | 2 +-
sfx2/source/inc/appbaslib.hxx | 2 +-
sfx2/source/inc/appdata.hxx | 2 +-
sfx2/source/inc/documentfontsdialog.hxx | 5 ++---
sfx2/source/inc/docundomanager.hxx | 2 +-
sfx2/source/inc/eventsupplier.hxx | 2 +-
sfx2/source/inc/fltoptint.hxx | 4 ++--
sfx2/source/inc/macroloader.hxx | 2 +-
sfx2/source/inc/objshimp.hxx | 4 ++--
sfx2/source/inc/openurlhint.hxx | 2 +-
sfx2/source/inc/partwnd.hxx | 5 ++---
sfx2/source/inc/preview.hxx | 2 +-
sfx2/source/inc/recfloat.hxx | 4 ++--
sfx2/source/inc/splitwin.hxx | 4 +---
sfx2/source/inc/statcach.hxx | 2 +-
sfx2/source/inc/templatesearchviewitem.hxx | 2 +-
sfx2/source/inc/templdgi.hxx | 3 +--
sfx2/source/inc/tplcitem.hxx | 4 ++--
sfx2/source/inc/versdlg.hxx | 6 +++---
sfx2/source/inc/workwin.hxx | 2 +-
22 files changed, 30 insertions(+), 35 deletions(-)
New commits:
commit 5a0e9dd75e1c266714177d1178c0a035fcc193b9
Author: Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Thu Jun 24 15:13:44 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Jun 25 12:25:34 2021 +0200
loplugin:finalclasses in sfx2
Change-Id: I8125d5447e13a6dadfde9c19c8cab6004693589a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117789
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/sfx2/inc/templatedefaultview.hxx b/sfx2/inc/templatedefaultview.hxx
index e53910044176..1771ad3d8759 100644
--- a/sfx2/inc/templatedefaultview.hxx
+++ b/sfx2/inc/templatedefaultview.hxx
@@ -11,7 +11,7 @@
#include <sfx2/templatelocalview.hxx>
-class TemplateDefaultView : public TemplateLocalView
+class TemplateDefaultView final : public TemplateLocalView
{
public:
TemplateDefaultView(std::unique_ptr<weld::ScrolledWindow> xWindow,
diff --git a/sfx2/inc/unoctitm.hxx b/sfx2/inc/unoctitm.hxx
index 8259329e9e18..805ff22b3124 100644
--- a/sfx2/inc/unoctitm.hxx
+++ b/sfx2/inc/unoctitm.hxx
@@ -101,7 +101,7 @@ public:
SfxDispatcher* GetDispatcher_Impl();
};
-class SfxDispatchController_Impl : public SfxControllerItem
+class SfxDispatchController_Impl final : public SfxControllerItem
{
css::util::URL aDispatchURL;
SfxDispatcher* pDispatcher;
diff --git a/sfx2/source/inc/alienwarn.hxx b/sfx2/source/inc/alienwarn.hxx
index 5cf662b09d0f..7c4f8cb364ee 100644
--- a/sfx2/source/inc/alienwarn.hxx
+++ b/sfx2/source/inc/alienwarn.hxx
@@ -21,7 +21,7 @@
#include <vcl/weld.hxx>
-class SfxAlienWarningDialog : public weld::MessageDialogController
+class SfxAlienWarningDialog final : public weld::MessageDialogController
{
private:
std::unique_ptr<weld::Button> m_xKeepCurrentBtn;
diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx
index f1ca81d29d57..30473f2af94a 100644
--- a/sfx2/source/inc/appbaslib.hxx
+++ b/sfx2/source/inc/appbaslib.hxx
@@ -30,7 +30,7 @@ class BasicManager;
/** helper class which holds and manipulates a BasicManager
*/
-class SfxBasicManagerHolder
+class SfxBasicManagerHolder final
: public SfxListener
{
private:
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index f36a25f176e6..0861ad69758f 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -136,7 +136,7 @@ public:
void OnApplicationBasicManagerCreated( BasicManager& _rManager );
};
-class SfxDdeTriggerTopic_Impl : public DdeTopic
+class SfxDdeTriggerTopic_Impl final : public DdeTopic
{
#if defined(_WIN32)
public:
diff --git a/sfx2/source/inc/documentfontsdialog.hxx b/sfx2/source/inc/documentfontsdialog.hxx
index 6f7b3fb221ae..9ce447669a71 100644
--- a/sfx2/source/inc/documentfontsdialog.hxx
+++ b/sfx2/source/inc/documentfontsdialog.hxx
@@ -24,7 +24,7 @@
/**
Tab page for document font settings in the document properties dialog.
*/
-class SfxDocumentFontsPage : public SfxTabPage
+class SfxDocumentFontsPage final : public SfxTabPage
{
public:
SfxDocumentFontsPage(weld::Container* pPage, weld::DialogController* pController,
@@ -33,11 +33,10 @@ public:
static std::unique_ptr<SfxTabPage>
Create(weld::Container* pPage, weld::DialogController* pController, const SfxItemSet* set);
-protected:
+private:
virtual bool FillItemSet(SfxItemSet* set) override;
virtual void Reset(const SfxItemSet* set) override;
-private:
std::unique_ptr<weld::CheckButton> embedFontsCheckbox;
std::unique_ptr<weld::CheckButton> embedUsedFontsCheckbox;
std::unique_ptr<weld::CheckButton> embedLatinScriptFontsCheckbox;
diff --git a/sfx2/source/inc/docundomanager.hxx b/sfx2/source/inc/docundomanager.hxx
index 9145e5967d51..98bf827fb14e 100644
--- a/sfx2/source/inc/docundomanager.hxx
+++ b/sfx2/source/inc/docundomanager.hxx
@@ -95,7 +95,7 @@ namespace sfx2
//= DocumentUndoManager
struct DocumentUndoManager_Impl;
- class DocumentUndoManager :public ::cppu::WeakImplHelper<css::document::XUndoManager>
+ class DocumentUndoManager final : public ::cppu::WeakImplHelper<css::document::XUndoManager>
,public SfxModelSubComponent
{
friend struct DocumentUndoManager_Impl;
diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx
index 3aa73a7ffc8d..9c14bd3efe31 100644
--- a/sfx2/source/inc/eventsupplier.hxx
+++ b/sfx2/source/inc/eventsupplier.hxx
@@ -39,7 +39,7 @@ class SfxObjectShell;
class SvxMacro;
-class SfxEvents_Impl : public ::cppu::WeakImplHelper< css::container::XNameReplace, css::document::XEventListener >
+class SfxEvents_Impl final : public ::cppu::WeakImplHelper< css::container::XNameReplace, css::document::XEventListener >
{
css::uno::Sequence< OUString > maEventNames;
css::uno::Sequence< css::uno::Any > maEventData;
diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx
index 624ecd073453..ca9537bfe177 100644
--- a/sfx2/source/inc/fltoptint.hxx
+++ b/sfx2/source/inc/fltoptint.hxx
@@ -25,7 +25,7 @@
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
-class FilterOptionsContinuation : public comphelper::OInteraction< css::document::XInteractionFilterOptions >
+class FilterOptionsContinuation final : public comphelper::OInteraction< css::document::XInteractionFilterOptions >
{
css::uno::Sequence< css::beans::PropertyValue > rProperties;
@@ -34,7 +34,7 @@ public:
virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getFilterOptions( ) override;
};
-class RequestFilterOptions : public ::cppu::WeakImplHelper< css::task::XInteractionRequest >
+class RequestFilterOptions final : public ::cppu::WeakImplHelper< css::task::XInteractionRequest >
{
css::uno::Any m_aRequest;
diff --git a/sfx2/source/inc/macroloader.hxx b/sfx2/source/inc/macroloader.hxx
index 051486c09adf..b51cae3d93cf 100644
--- a/sfx2/source/inc/macroloader.hxx
+++ b/sfx2/source/inc/macroloader.hxx
@@ -39,7 +39,7 @@
class SfxObjectShell;
-class SfxMacroLoader : public cppu::WeakImplHelper<
+class SfxMacroLoader final : public cppu::WeakImplHelper<
css::frame::XDispatchProvider,
css::frame::XNotifyingDispatch,
css::frame::XSynchronousDispatch,
diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx
index 21799f7cad49..46db158984ac 100644
--- a/sfx2/source/inc/objshimp.hxx
+++ b/sfx2/source/inc/objshimp.hxx
@@ -37,7 +37,7 @@ class SfxViewFrame;
class SfxBasicManagerHolder;
-class AutoReloadTimer_Impl : public Timer
+class AutoReloadTimer_Impl final : public Timer
{
OUString aUrl;
SfxObjectShell* pObjSh;
@@ -48,7 +48,7 @@ public:
virtual void Invoke() override;
};
-struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess
+struct SfxObjectShell_Impl final : public ::sfx2::IMacroDocumentAccess
{
std::unique_ptr<::comphelper::EmbeddedObjectContainer> mxObjectContainer;
SfxBasicManagerHolder aBasicManager;
diff --git a/sfx2/source/inc/openurlhint.hxx b/sfx2/source/inc/openurlhint.hxx
index c4557cae8a9e..ea52a44e45f3 100644
--- a/sfx2/source/inc/openurlhint.hxx
+++ b/sfx2/source/inc/openurlhint.hxx
@@ -23,7 +23,7 @@
#include <svl/hint.hxx>
#include <rtl/ustring.hxx>
-class SfxOpenUrlHint : public SfxHint
+class SfxOpenUrlHint final : public SfxHint
{
OUString msDocumentURL;
diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx
index 4896b476c685..1d51329f6820 100644
--- a/sfx2/source/inc/partwnd.hxx
+++ b/sfx2/source/inc/partwnd.hxx
@@ -29,7 +29,7 @@ namespace com::sun::star::frame { class XFrame; }
// class SfxPartChildWnd_Impl -----------------------------------
-class SfxPartChildWnd_Impl : public SfxChildWindow
+class SfxPartChildWnd_Impl final : public SfxChildWindow
{
public:
SfxPartChildWnd_Impl( vcl::Window* pParent, sal_uInt16 nId,
@@ -44,9 +44,8 @@ public:
// class SfxExplorerDockWnd_Impl -----------------------------------------
-class SfxPartDockWnd_Impl : public SfxDockingWindow
+class SfxPartDockWnd_Impl final : public SfxDockingWindow
{
-protected:
virtual bool EventNotify( NotifyEvent& rNEvt ) override;
public:
diff --git a/sfx2/source/inc/preview.hxx b/sfx2/source/inc/preview.hxx
index b3065831982b..b1a5621ab8e3 100644
--- a/sfx2/source/inc/preview.hxx
+++ b/sfx2/source/inc/preview.hxx
@@ -24,7 +24,7 @@
class SfxObjectShell;
class GDIMetaFile;
-class SfxPreviewWin_Impl : public weld::CustomWidgetController
+class SfxPreviewWin_Impl final : public weld::CustomWidgetController
{
private:
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle&) override;
diff --git a/sfx2/source/inc/recfloat.hxx b/sfx2/source/inc/recfloat.hxx
index b7aa71668491..e25ad7f08fda 100644
--- a/sfx2/source/inc/recfloat.hxx
+++ b/sfx2/source/inc/recfloat.hxx
@@ -24,7 +24,7 @@
#include <sfx2/childwin.hxx>
#include <sfx2/weldutils.hxx>
-class SfxRecordingFloatWrapper_Impl : public SfxChildWindow
+class SfxRecordingFloatWrapper_Impl final : public SfxChildWindow
{
SfxBindings* pBindings;
public:
@@ -38,7 +38,7 @@ public:
virtual bool QueryClose() override;
};
-class SfxRecordingFloat_Impl : public SfxModelessDialogController
+class SfxRecordingFloat_Impl final : public SfxModelessDialogController
{
std::unique_ptr<weld::Toolbar> m_xToolbar;
std::unique_ptr<ToolbarUnoDispatcher> m_xDispatcher;
diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx
index 7d765363fd72..4b65830b96d1 100644
--- a/sfx2/source/inc/splitwin.hxx
+++ b/sfx2/source/inc/splitwin.hxx
@@ -38,7 +38,7 @@ struct SfxDock_Impl
bool bHide; // SplitWindow had this window
};
-class SfxSplitWindow : public SplitWindow
+class SfxSplitWindow final : public SplitWindow
{
friend class SfxEmptySplitWin_Impl;
@@ -64,8 +64,6 @@ private:
void SaveConfig_Impl();
void FadeOut_Impl();
-protected:
-
virtual void StartSplit() override;
virtual void SplitResize() override;
virtual void Split() override;
diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx
index c831fa4c7fce..4247037e20c4 100644
--- a/sfx2/source/inc/statcach.hxx
+++ b/sfx2/source/inc/statcach.hxx
@@ -34,7 +34,7 @@
class SfxControllerItem;
class SfxDispatcher;
-class BindDispatch_Impl : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
+class BindDispatch_Impl final : public ::cppu::WeakImplHelper< css::frame::XStatusListener >
{
friend class SfxStateCache;
css::uno::Reference< css::frame::XDispatch > xDisp;
diff --git a/sfx2/source/inc/templatesearchviewitem.hxx b/sfx2/source/inc/templatesearchviewitem.hxx
index 093b6adf10d9..bd4b682da102 100644
--- a/sfx2/source/inc/templatesearchviewitem.hxx
+++ b/sfx2/source/inc/templatesearchviewitem.hxx
@@ -12,7 +12,7 @@
#include <templateviewitem.hxx>
-struct TemplateSearchViewItem : public TemplateViewItem
+struct TemplateSearchViewItem final : public TemplateViewItem
{
TemplateSearchViewItem(ThumbnailViewBase& rView, sal_uInt16 nId)
: TemplateViewItem(rView, nId)
diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx
index 21e2f8bda032..61d6de8001cb 100644
--- a/sfx2/source/inc/templdgi.hxx
+++ b/sfx2/source/inc/templdgi.hxx
@@ -258,7 +258,7 @@ public:
class ToolbarDropTarget;
class DropTargetHelper;
-class SfxTemplateDialog_Impl : public SfxCommonTemplateDialog_Impl
+class SfxTemplateDialog_Impl final : public SfxCommonTemplateDialog_Impl
{
private:
friend class SfxTemplateControllerItem;
@@ -276,7 +276,6 @@ private:
DECL_LINK(ToolBoxRSelect, const OString&, void);
DECL_LINK(ToolMenuSelectHdl, const OString&, void);
-protected:
virtual void EnableEdit( bool ) override;
virtual void EnableItem(const OString& rMesId, bool bCheck = true) override;
virtual void CheckItem(const OString& rMesId, bool bCheck = true) override;
diff --git a/sfx2/source/inc/tplcitem.hxx b/sfx2/source/inc/tplcitem.hxx
index 7ce479936e6d..9c532fbc85bd 100644
--- a/sfx2/source/inc/tplcitem.hxx
+++ b/sfx2/source/inc/tplcitem.hxx
@@ -25,14 +25,14 @@
struct ImplSVEvent;
class SfxCommonTemplateDialog_Impl;
-class SfxTemplateControllerItem : public SfxControllerItem {
+class SfxTemplateControllerItem final : public SfxControllerItem
+{
SfxCommonTemplateDialog_Impl &rTemplateDlg;
sal_uInt8 nWaterCanState;
ImplSVEvent* nUserEventId;
DECL_LINK(SetWaterCanStateHdl_Impl, void*, void);
-protected:
virtual void StateChangedAtToolBoxControl(sal_uInt16, SfxItemState, const SfxPoolItem* pState) override;
public:
diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx
index e8830b5f1237..22513f365220 100644
--- a/sfx2/source/inc/versdlg.hxx
+++ b/sfx2/source/inc/versdlg.hxx
@@ -27,7 +27,7 @@ class SfxViewFrame;
struct SfxVersionInfo;
class SfxVersionTableDtor;
-class SfxVersionDialog : public SfxDialogController
+class SfxVersionDialog final : public SfxDialogController
{
SfxViewFrame* m_pViewFrame;
bool m_bIsSaveVersionOnClose;
@@ -54,7 +54,7 @@ public:
bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; }
};
-class SfxViewVersionDialog_Impl : public SfxDialogController
+class SfxViewVersionDialog_Impl final : public SfxDialogController
{
private:
SfxVersionInfo& m_rInfo;
@@ -72,7 +72,7 @@ public:
SfxViewVersionDialog_Impl(weld::Window* pParent, SfxVersionInfo& rInfo, bool bEdit);
};
-class SfxCmisVersionsDialog : public SfxDialogController
+class SfxCmisVersionsDialog final : public SfxDialogController
{
SfxViewFrame* m_pViewFrame;
std::unique_ptr<SfxVersionTableDtor> m_pTable;
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 6a05e1561caf..e407fcf54244 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -147,7 +147,7 @@ enum class SfxDockingConfig
#define SFX_SPLITWINDOWS_MAX 4
-class LayoutManagerListener : public ::cppu::WeakImplHelper<
+class LayoutManagerListener final : public ::cppu::WeakImplHelper<
css::frame::XLayoutManagerListener,
css::lang::XComponent >
{
More information about the Libreoffice-commits
mailing list