diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-29 12:41:03 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-30 05:49:55 +0100 |
commit | b5d8a5f830832f04d192f1351d8e523a2ef0042a (patch) | |
tree | 49f79d078e1a95d1bf07b3a08dc08d6aec049add | |
parent | 84ad5f840062b8a604c776ee86cedb3ba360f355 (diff) |
loplugin:finalclasses svtools
Change-Id: I17f4fd3960a23132916ea64b21cc8869a94eaed4
Reviewed-on: https://gerrit.libreoffice.org/81704
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
31 files changed, 49 insertions, 55 deletions
diff --git a/include/svtools/DocumentInfoPreview.hxx b/include/svtools/DocumentInfoPreview.hxx index a4491d2f4510..bf8db2746e10 100644 --- a/include/svtools/DocumentInfoPreview.hxx +++ b/include/svtools/DocumentInfoPreview.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace svtools { -class SVT_DLLPUBLIC ODocumentInfoPreview: public vcl::Window { +class SVT_DLLPUBLIC ODocumentInfoPreview final : public vcl::Window { public: ODocumentInfoPreview(vcl::Window * pParent, WinBits nBits); diff --git a/include/svtools/PlaceEditDialog.hxx b/include/svtools/PlaceEditDialog.hxx index fd53f1021181..f28afb4e2331 100644 --- a/include/svtools/PlaceEditDialog.hxx +++ b/include/svtools/PlaceEditDialog.hxx @@ -19,7 +19,7 @@ class Place; class DetailsContainer; -class SVT_DLLPUBLIC PlaceEditDialog : public weld::GenericDialogController +class SVT_DLLPUBLIC PlaceEditDialog final : public weld::GenericDialogController { private: std::shared_ptr< DetailsContainer > m_xCurrentDetails; diff --git a/include/svtools/ServerDetailsControls.hxx b/include/svtools/ServerDetailsControls.hxx index d569ac8e20ac..3bc5fccc530a 100644 --- a/include/svtools/ServerDetailsControls.hxx +++ b/include/svtools/ServerDetailsControls.hxx @@ -85,7 +85,7 @@ class HostDetailsContainer : public DetailsContainer virtual bool verifyScheme( const OUString& rScheme ); }; -class DavDetailsContainer : public HostDetailsContainer +class DavDetailsContainer final : public HostDetailsContainer { public: DavDetailsContainer(PlaceEditDialog* pDialog); @@ -93,14 +93,13 @@ class DavDetailsContainer : public HostDetailsContainer virtual void set_visible( bool bShow ) override; virtual bool enableUserCredentials( ) override { return false; }; - protected: + private: virtual bool verifyScheme( const OUString& rScheme ) override; - private: DECL_LINK(ToggledDavsHdl, weld::ToggleButton&, void); }; -class SmbDetailsContainer : public DetailsContainer +class SmbDetailsContainer final : public DetailsContainer { private: OUString m_sHost; @@ -113,7 +112,7 @@ class SmbDetailsContainer : public DetailsContainer virtual void set_visible( bool bShow ) override; }; -class CmisDetailsContainer : public DetailsContainer +class CmisDetailsContainer final : public DetailsContainer { private: OUString m_sUsername; diff --git a/include/svtools/acceleratorexecute.hxx b/include/svtools/acceleratorexecute.hxx index 0cf4675b99db..d2b5969e6b9f 100644 --- a/include/svtools/acceleratorexecute.hxx +++ b/include/svtools/acceleratorexecute.hxx @@ -68,7 +68,7 @@ struct TMutexInit Of course this queue will be stopped if the environment will be destructed... */ -class SVT_DLLPUBLIC AcceleratorExecute : private TMutexInit +class SVT_DLLPUBLIC AcceleratorExecute final : private TMutexInit { // member private: diff --git a/include/svtools/accessibilityoptions.hxx b/include/svtools/accessibilityoptions.hxx index 9aa9ab12f14b..6f2aebac5c83 100644 --- a/include/svtools/accessibilityoptions.hxx +++ b/include/svtools/accessibilityoptions.hxx @@ -25,7 +25,7 @@ class SvtAccessibilityOptions_Impl; -class SVT_DLLPUBLIC SvtAccessibilityOptions: +class SVT_DLLPUBLIC SvtAccessibilityOptions final : public utl::detail::Options, private SfxListener { private: diff --git a/include/svtools/apearcfg.hxx b/include/svtools/apearcfg.hxx index 653dda7132d5..81a9ef8f931f 100644 --- a/include/svtools/apearcfg.hxx +++ b/include/svtools/apearcfg.hxx @@ -38,7 +38,7 @@ enum class DragMode { }; -class SVT_DLLPUBLIC SvtTabAppearanceCfg : public utl::ConfigItem +class SVT_DLLPUBLIC SvtTabAppearanceCfg final : public utl::ConfigItem { DragMode nDragMode ; SnapType nSnapMode ; diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index b2c4ee7a5acd..e3035b892500 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -71,7 +71,7 @@ method in CalendarField and create an own calendar there ourselves. *************************************************************************/ -class SVT_DLLPUBLIC CalendarField : public DateField +class SVT_DLLPUBLIC CalendarField final : public DateField { private: VclPtr<ImplCFieldFloatWin> mpFloatWin; @@ -96,7 +96,7 @@ public: void EnableToday() { mbToday = true; } void EnableNone() { mbNone = true; } -protected: +private: virtual void StateChanged( StateChangedType nStateChange ) override; }; diff --git a/include/svtools/cliplistener.hxx b/include/svtools/cliplistener.hxx index 5a1a45700904..1324decc268c 100644 --- a/include/svtools/cliplistener.hxx +++ b/include/svtools/cliplistener.hxx @@ -29,7 +29,7 @@ namespace vcl { class Window; } class TransferableDataHelper; -class SVT_DLLPUBLIC TransferableClipboardListener : public cppu::WeakImplHelper< +class SVT_DLLPUBLIC TransferableClipboardListener final : public cppu::WeakImplHelper< css::datatransfer::clipboard::XClipboardListener > { Link<TransferableDataHelper*,void> aLink; diff --git a/include/svtools/colorcfg.hxx b/include/svtools/colorcfg.hxx index 381ef70570c4..b404f40dd9d9 100644 --- a/include/svtools/colorcfg.hxx +++ b/include/svtools/colorcfg.hxx @@ -94,7 +94,7 @@ struct ColorConfigValue { return nColor != rCmp.nColor || bIsVisible != rCmp.bIsVisible;} }; -class SVT_DLLPUBLIC ColorConfig: +class SVT_DLLPUBLIC ColorConfig final : public utl::detail::Options { friend class ColorConfig_Impl; diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx index e4b7a71c2d04..fbde3fc5dacc 100644 --- a/include/svtools/ctrlbox.hxx +++ b/include/svtools/ctrlbox.hxx @@ -356,7 +356,7 @@ private: FontNameBox& operator =( const FontNameBox& ) = delete; }; -class SVT_DLLPUBLIC FontStyleBox : public ComboBox +class SVT_DLLPUBLIC FontStyleBox final : public ComboBox { Size aOptimalSize; diff --git a/include/svtools/dialogclosedlistener.hxx b/include/svtools/dialogclosedlistener.hxx index b129bddf5555..7b7c324fa688 100644 --- a/include/svtools/dialogclosedlistener.hxx +++ b/include/svtools/dialogclosedlistener.hxx @@ -35,7 +35,7 @@ namespace svt /** C++ class to implement a css::ui::dialogs::XDialogClosedListener */ - class SVT_DLLPUBLIC DialogClosedListener : + class SVT_DLLPUBLIC DialogClosedListener final : public cppu::WeakImplHelper< css::ui::dialogs::XDialogClosedListener > { private: diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index b0ef6d7fb8d1..c878fe7fc39a 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -187,7 +187,7 @@ namespace svt /** a multi line edit which can be used in a cell of an EditBrowseBox */ - class SVT_DLLPUBLIC MultiLineTextCell : public MultiLineEdit + class SVT_DLLPUBLIC MultiLineTextCell final : public MultiLineEdit { public: MultiLineTextCell( vcl::Window* _pParent, WinBits _nStyle ) @@ -195,14 +195,13 @@ namespace svt { } - protected: + private: // Window overridables virtual bool PreNotify( NotifyEvent& rNEvt ) override; // MultiLineEdit overridables virtual void Modify() override; - private: bool dispatchKeyEvent( const KeyEvent& _rEvent ); }; @@ -212,7 +211,7 @@ namespace svt typedef GenericEditImplementation< Edit > EditImplementation; typedef GenericEditImplementation< MultiLineTextCell > MultiLineEditImplementation_Base; - class SVT_DLLPUBLIC MultiLineEditImplementation : public MultiLineEditImplementation_Base + class SVT_DLLPUBLIC MultiLineEditImplementation final : public MultiLineEditImplementation_Base { public: MultiLineEditImplementation( MultiLineTextCell& _rEdit ) : MultiLineEditImplementation_Base( _rEdit ) @@ -252,7 +251,7 @@ namespace svt //= SpinCellController - class SVT_DLLPUBLIC SpinCellController : public CellController + class SVT_DLLPUBLIC SpinCellController final : public CellController { public: SpinCellController(SpinField* pSpinField); @@ -263,16 +262,15 @@ namespace svt virtual bool IsModified() const override; virtual void ClearModified() override; - protected: - virtual bool MoveAllowed(const KeyEvent& rEvt) const override; private: + virtual bool MoveAllowed(const KeyEvent& rEvt) const override; DECL_LINK(ModifyHdl, Edit&, void); }; //= CheckBoxControl - class SVT_DLLPUBLIC CheckBoxControl : public Control + class SVT_DLLPUBLIC CheckBoxControl final : public Control { VclPtr<CheckBox> pBox; Link<VclPtr<CheckBox>,void> m_aClickLink; @@ -304,7 +302,7 @@ namespace svt //= CheckBoxCellController - class SVT_DLLPUBLIC CheckBoxCellController : public CellController + class SVT_DLLPUBLIC CheckBoxCellController final : public CellController { public: @@ -314,23 +312,22 @@ namespace svt virtual bool IsModified() const override; virtual void ClearModified() override; - protected: - virtual bool WantMouseEvent() const override; private: + virtual bool WantMouseEvent() const override; DECL_LINK(ModifyHdl, LinkParamNone*, void); }; //= ComboBoxControl - class SVT_DLLPUBLIC ComboBoxControl : public ComboBox + class SVT_DLLPUBLIC ComboBoxControl final : public ComboBox { friend class ComboBoxCellController; public: ComboBoxControl(vcl::Window* pParent); - protected: + private: virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; @@ -356,14 +353,14 @@ namespace svt //= ListBoxControl - class SVT_DLLPUBLIC ListBoxControl : public ListBox + class SVT_DLLPUBLIC ListBoxControl final : public ListBox { friend class ListBoxCellController; public: ListBoxControl(vcl::Window* pParent); - protected: + private: virtual bool PreNotify( NotifyEvent& rNEvt ) override; }; @@ -390,7 +387,7 @@ namespace svt //= FormattedFieldCellController - class SVT_DLLPUBLIC FormattedFieldCellController : public EditCellController + class SVT_DLLPUBLIC FormattedFieldCellController final : public EditCellController { public: FormattedFieldCellController( FormattedField* _pFormatted ); diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx index 24878019ec0e..ba7a20e11dfb 100644 --- a/include/svtools/ehdl.hxx +++ b/include/svtools/ehdl.hxx @@ -30,7 +30,7 @@ SVT_DLLPUBLIC extern const ErrMsgCode RID_ERRCTX[]; namespace weld { class Window; } -class SVT_DLLPUBLIC SfxErrorContext : private ErrorContext +class SVT_DLLPUBLIC SfxErrorContext final : private ErrorContext { public: SfxErrorContext( diff --git a/include/svtools/embedtransfer.hxx b/include/svtools/embedtransfer.hxx index 59394bc27675..16c724487bfe 100644 --- a/include/svtools/embedtransfer.hxx +++ b/include/svtools/embedtransfer.hxx @@ -27,7 +27,7 @@ namespace com :: sun :: star :: embed { class XEmbeddedObject; } class Graphic; -class SVT_DLLPUBLIC SvEmbedTransferHelper : public TransferableHelper +class SVT_DLLPUBLIC SvEmbedTransferHelper final : public TransferableHelper { private: @@ -37,8 +37,6 @@ private: OUString maParentShellID; -protected: - virtual void AddSupportedFormats() override; virtual bool GetData( const css::datatransfer::DataFlavor& rFlavor, const OUString& rDestDoc ) override; virtual void ObjectReleased() override; diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 752784c92390..2374d0fb18fc 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -57,7 +57,7 @@ public: void setColor(Color _nColor) { m_nColor = _nColor; } }; -class SVT_DLLPUBLIC ExtendedColorConfig : public SfxBroadcaster, public SfxListener +class SVT_DLLPUBLIC ExtendedColorConfig final : public SfxBroadcaster, public SfxListener { friend class ExtendedColorConfig_Impl; private: diff --git a/include/svtools/fileurlbox.hxx b/include/svtools/fileurlbox.hxx index 208195e2226f..c2f4451db6d0 100644 --- a/include/svtools/fileurlbox.hxx +++ b/include/svtools/fileurlbox.hxx @@ -30,7 +30,7 @@ namespace svt //= FileURLBox - class SVT_DLLPUBLIC FileURLBox : public SvtURLBox + class SVT_DLLPUBLIC FileURLBox final : public SvtURLBox { private: OUString m_sPreservedText; @@ -38,7 +38,7 @@ namespace svt public: FileURLBox( vcl::Window* _pParent, WinBits _nStyle ); - protected: + private: virtual bool PreNotify( NotifyEvent& rNEvt ) override; virtual bool EventNotify( NotifyEvent& rNEvt ) override; diff --git a/include/svtools/fontsubstconfig.hxx b/include/svtools/fontsubstconfig.hxx index fdb64cf74d06..76830d1c013f 100644 --- a/include/svtools/fontsubstconfig.hxx +++ b/include/svtools/fontsubstconfig.hxx @@ -34,7 +34,7 @@ struct SubstitutionStruct bool bReplaceOnScreenOnly; }; -class SVT_DLLPUBLIC SvtFontSubstConfig : public utl::ConfigItem +class SVT_DLLPUBLIC SvtFontSubstConfig final : public utl::ConfigItem { private: bool bIsEnabled; diff --git a/include/svtools/generictoolboxcontroller.hxx b/include/svtools/generictoolboxcontroller.hxx index 7e792b9f4d3a..6b9c11cc3924 100644 --- a/include/svtools/generictoolboxcontroller.hxx +++ b/include/svtools/generictoolboxcontroller.hxx @@ -27,7 +27,7 @@ namespace svt { -class SVT_DLLPUBLIC GenericToolboxController : public svt::ToolboxController +class SVT_DLLPUBLIC GenericToolboxController final : public svt::ToolboxController { public: GenericToolboxController( const css::uno::Reference< css::uno::XComponentContext >& rxContext, diff --git a/include/svtools/helpopt.hxx b/include/svtools/helpopt.hxx index 358a107c410f..0f7ada539c4d 100644 --- a/include/svtools/helpopt.hxx +++ b/include/svtools/helpopt.hxx @@ -27,7 +27,7 @@ class SvtHelpOptions_Impl; -class SVT_DLLPUBLIC SvtHelpOptions: public utl::detail::Options +class SVT_DLLPUBLIC SvtHelpOptions final : public utl::detail::Options { std::shared_ptr<SvtHelpOptions_Impl> pImpl; diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 18b6d351ecd3..eff992147392 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -35,7 +35,7 @@ struct HtmlOptions_Impl; -class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem +class SVT_DLLPUBLIC SvxHtmlOptions final : public utl::ConfigItem { std::unique_ptr<HtmlOptions_Impl> pImpl; static const css::uno::Sequence<OUString>& GetPropertyNames(); diff --git a/include/svtools/javacontext.hxx b/include/svtools/javacontext.hxx index 99274c1c2090..c34c555bb648 100644 --- a/include/svtools/javacontext.hxx +++ b/include/svtools/javacontext.hxx @@ -32,7 +32,7 @@ namespace svt // We cannot derive from cppu::WeakImplHelper because we would export the inline //generated class. This conflicts with other libraries if they use the same inline //class. - class SVT_DLLPUBLIC JavaContext : + class SVT_DLLPUBLIC JavaContext final : public css::uno::XCurrentContext { diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx index 23249a5dc8e8..5fbff61fff23 100644 --- a/include/svtools/javainteractionhandler.hxx +++ b/include/svtools/javainteractionhandler.hxx @@ -35,7 +35,7 @@ namespace svt //generated class. This conflicts with other libraries if they use the same inline //class. -class SVT_DLLPUBLIC JavaInteractionHandler: +class SVT_DLLPUBLIC JavaInteractionHandler final : public css::task::XInteractionHandler { public: diff --git a/include/svtools/menuoptions.hxx b/include/svtools/menuoptions.hxx index 0408443338b6..9db1fe281ee3 100644 --- a/include/svtools/menuoptions.hxx +++ b/include/svtools/menuoptions.hxx @@ -41,7 +41,7 @@ class SvtMenuOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions: public utl::detail::Options +class SAL_WARN_UNUSED SVT_DLLPUBLIC SvtMenuOptions final : public utl::detail::Options { public: SvtMenuOptions(); diff --git a/include/svtools/miscopt.hxx b/include/svtools/miscopt.hxx index b84bbc2da8d4..d981d8a2846c 100644 --- a/include/svtools/miscopt.hxx +++ b/include/svtools/miscopt.hxx @@ -46,7 +46,7 @@ enum class ToolBoxButtonSize; @devstatus ready to use *//*-*************************************************************************************************************/ -class SVT_DLLPUBLIC SvtMiscOptions: public utl::detail::Options +class SVT_DLLPUBLIC SvtMiscOptions final : public utl::detail::Options { public: SvtMiscOptions(); diff --git a/include/svtools/openfiledroptargetlistener.hxx b/include/svtools/openfiledroptargetlistener.hxx index d5a83b8ff1da..4791c7cf5f67 100644 --- a/include/svtools/openfiledroptargetlistener.hxx +++ b/include/svtools/openfiledroptargetlistener.hxx @@ -37,7 +37,7 @@ namespace com { namespace sun { namespace star { namespace uno { /** DropTargetListener that takes care of opening a file when it is dropped in the frame. */ -class SVT_DLLPUBLIC OpenFileDropTargetListener : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener > +class SVT_DLLPUBLIC OpenFileDropTargetListener final : public cppu::WeakImplHelper< css::datatransfer::dnd::XDropTargetListener > { private: /// uno service manager to create necessary services diff --git a/include/svtools/printoptions.hxx b/include/svtools/printoptions.hxx index cdc3acf586c8..44f064f9c782 100644 --- a/include/svtools/printoptions.hxx +++ b/include/svtools/printoptions.hxx @@ -79,7 +79,7 @@ public: }; -class SVT_DLLPUBLIC SvtPrinterOptions : public SvtBasePrintOptions +class SVT_DLLPUBLIC SvtPrinterOptions final : public SvtBasePrintOptions { private: @@ -93,7 +93,7 @@ public: }; -class SVT_DLLPUBLIC SvtPrintFileOptions : public SvtBasePrintOptions +class SVT_DLLPUBLIC SvtPrintFileOptions final : public SvtBasePrintOptions { private: diff --git a/include/svtools/prnsetup.hxx b/include/svtools/prnsetup.hxx index 5ea91fecaa01..618fc8578705 100644 --- a/include/svtools/prnsetup.hxx +++ b/include/svtools/prnsetup.hxx @@ -28,7 +28,7 @@ class Printer; class QueueInfo; -class SVT_DLLPUBLIC PrinterSetupDialog : public weld::GenericDialogController +class SVT_DLLPUBLIC PrinterSetupDialog final : public weld::GenericDialogController { private: std::unique_ptr<weld::ComboBox> m_xLbName; diff --git a/include/svtools/querydelete.hxx b/include/svtools/querydelete.hxx index 91e2096615ee..b41d2461e189 100644 --- a/include/svtools/querydelete.hxx +++ b/include/svtools/querydelete.hxx @@ -34,7 +34,7 @@ enum QueryDeleteResult_Impl QUERYDELETE_ALL = 101 }; -class SVT_DLLPUBLIC QueryDeleteDlg_Impl : public weld::MessageDialogController +class SVT_DLLPUBLIC QueryDeleteDlg_Impl final : public weld::MessageDialogController { private: std::unique_ptr<weld::Button> m_xAllButton; diff --git a/include/svtools/slidesorterbaropt.hxx b/include/svtools/slidesorterbaropt.hxx index 4a1d5ab9890d..c12268fea1fa 100644 --- a/include/svtools/slidesorterbaropt.hxx +++ b/include/svtools/slidesorterbaropt.hxx @@ -38,7 +38,7 @@ class SvtSlideSorterBarOptions_Impl; \attention This class is partially threadsafe. */ -class SVT_DLLPUBLIC SvtSlideSorterBarOptions: public utl::detail::Options +class SVT_DLLPUBLIC SvtSlideSorterBarOptions final : public utl::detail::Options { public: SvtSlideSorterBarOptions(); diff --git a/include/svtools/svmedit2.hxx b/include/svtools/svmedit2.hxx index 32bc78b38a5e..e2b7b1f5a238 100644 --- a/include/svtools/svmedit2.hxx +++ b/include/svtools/svmedit2.hxx @@ -24,7 +24,7 @@ class TextAttrib; -class SVT_DLLPUBLIC ExtMultiLineEdit : public MultiLineEdit +class SVT_DLLPUBLIC ExtMultiLineEdit final : public MultiLineEdit { public: ExtMultiLineEdit( vcl::Window* pParent, WinBits nWinStyle ); diff --git a/include/svtools/unoevent.hxx b/include/svtools/unoevent.hxx index 448573c117bd..f693a51030ca 100644 --- a/include/svtools/unoevent.hxx +++ b/include/svtools/unoevent.hxx @@ -244,7 +244,7 @@ protected: }; -class SVT_DLLPUBLIC SvMacroTableEventDescriptor : public SvDetachedEventDescriptor +class SVT_DLLPUBLIC SvMacroTableEventDescriptor final : public SvDetachedEventDescriptor { public: |