include/unotools/accessiblerelationsethelper.hxx | 2 +- include/unotools/accessiblestatesethelper.hxx | 2 +- include/unotools/cmdoptions.hxx | 2 +- include/unotools/compatibility.hxx | 2 +- include/unotools/compatibilityviewoptions.hxx | 2 +- include/unotools/confignode.hxx | 3 +-- include/unotools/defaultoptions.hxx | 2 +- include/unotools/dynamicmenuoptions.hxx | 2 +- include/unotools/eventcfg.hxx | 2 +- include/unotools/extendedsecurityoptions.hxx | 2 +- include/unotools/fltrcfg.hxx | 2 +- include/unotools/fontoptions.hxx | 2 +- include/unotools/historyoptions.hxx | 2 +- include/unotools/lingucfg.hxx | 2 +- include/unotools/misccfg.hxx | 2 +- include/unotools/moduleoptions.hxx | 2 +- include/unotools/optionsdlg.hxx | 2 +- include/unotools/pathoptions.hxx | 2 +- include/unotools/printwarningoptions.hxx | 2 +- include/unotools/progresshandlerwrap.hxx | 2 +- include/unotools/saveopt.hxx | 2 +- include/unotools/securityoptions.hxx | 2 +- include/unotools/streamhelper.hxx | 2 +- include/unotools/streamwrap.hxx | 5 ++--- include/unotools/syslocaleoptions.hxx | 2 +- include/unotools/useroptions.hxx | 2 +- include/unotools/viewoptions.hxx | 2 +- 27 files changed, 28 insertions(+), 30 deletions(-)
New commits: commit 2721cd2e9cf12c64b5e4456e231a3ed80b95349a Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Oct 30 15:23:59 2019 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Oct 31 07:03:06 2019 +0100 loplugin:finalclasses in unotools Change-Id: I0fa349db5dab3406aa93d40d4d2f41e517bf60fa Reviewed-on: https://gerrit.libreoffice.org/81799 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/include/unotools/accessiblerelationsethelper.hxx b/include/unotools/accessiblerelationsethelper.hxx index 05d169230adc..6417401796d5 100644 --- a/include/unotools/accessiblerelationsethelper.hxx +++ b/include/unotools/accessiblerelationsethelper.hxx @@ -39,7 +39,7 @@ namespace utl This base class provides an implementation of the <code>AccessibleRelationSet</code> service. */ -class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper +class UNOTOOLS_DLLPUBLIC AccessibleRelationSetHelper final : public cppu::WeakImplHelper< css::accessibility::XAccessibleRelationSet > { public: diff --git a/include/unotools/accessiblestatesethelper.hxx b/include/unotools/accessiblestatesethelper.hxx index 0093e618a0af..e8277f648903 100644 --- a/include/unotools/accessiblestatesethelper.hxx +++ b/include/unotools/accessiblestatesethelper.hxx @@ -38,7 +38,7 @@ namespace utl This base class provides an implementation of the <code>AccessibleStateSet</code> service. */ -class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper +class UNOTOOLS_DLLPUBLIC AccessibleStateSetHelper final : public cppu::WeakImplHelper< css::accessibility::XAccessibleStateSet > { public: diff --git a/include/unotools/cmdoptions.hxx b/include/unotools/cmdoptions.hxx index 6beadc644de9..b28c20638fc7 100644 --- a/include/unotools/cmdoptions.hxx +++ b/include/unotools/cmdoptions.hxx @@ -50,7 +50,7 @@ class SvtCommandOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtCommandOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtCommandOptions final : public utl::detail::Options { friend class SvtCommandOptions_Impl; diff --git a/include/unotools/compatibility.hxx b/include/unotools/compatibility.hxx index ed3e14f5026d..24f2da53e590 100644 --- a/include/unotools/compatibility.hxx +++ b/include/unotools/compatibility.hxx @@ -181,7 +181,7 @@ class SvtCompatibilityOptions_Impl; @descr Make it possible to configure dynamic menu structures of menus like "new" or "wizard". @devstatus ready to use *//*-*************************************************************************************************************/ -class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions: public utl::detail::Options +class UNOTOOLS_DLLPUBLIC SvtCompatibilityOptions final : public utl::detail::Options { public: SvtCompatibilityOptions(); diff --git a/include/unotools/compatibilityviewoptions.hxx b/include/unotools/compatibilityviewoptions.hxx index ce1f4aab42e4..6030c5834f4e 100644 --- a/include/unotools/compatibilityviewoptions.hxx +++ b/include/unotools/compatibilityviewoptions.hxx @@ -23,7 +23,7 @@ class SvtCompatibilityViewOptions_Impl; /// Compatibility settings which affects the GUI. These are not document level settings /// (like SvtCompatibilityOptions), but global options affecting the application's /// behavior in general. -class UNOTOOLS_DLLPUBLIC SvtCompatibilityViewOptions : public utl::detail::Options +class UNOTOOLS_DLLPUBLIC SvtCompatibilityViewOptions final : public utl::detail::Options { public: SvtCompatibilityViewOptions(); diff --git a/include/unotools/confignode.hxx b/include/unotools/confignode.hxx index 2f223b8998c9..368d020910b7 100644 --- a/include/unotools/confignode.hxx +++ b/include/unotools/confignode.hxx @@ -179,11 +179,10 @@ namespace utl Only this class is able to commit any changes made any any OConfigurationNode objects. */ - class UNOTOOLS_DLLPUBLIC OConfigurationTreeRoot : public OConfigurationNode + class UNOTOOLS_DLLPUBLIC OConfigurationTreeRoot final : public OConfigurationNode { css::uno::Reference< css::util::XChangesBatch > m_xCommitter; - protected: /** ctor for a readonly node */ OConfigurationTreeRoot( diff --git a/include/unotools/defaultoptions.hxx b/include/unotools/defaultoptions.hxx index 5aff22d4f3b3..8149361acc62 100644 --- a/include/unotools/defaultoptions.hxx +++ b/include/unotools/defaultoptions.hxx @@ -26,7 +26,7 @@ class SvtDefaultOptions_Impl; -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDefaultOptions final : public utl::detail::Options { private: std::shared_ptr<SvtDefaultOptions_Impl> pImpl; diff --git a/include/unotools/dynamicmenuoptions.hxx b/include/unotools/dynamicmenuoptions.hxx index 4e02604add1c..b9a1bac2911c 100644 --- a/include/unotools/dynamicmenuoptions.hxx +++ b/include/unotools/dynamicmenuoptions.hxx @@ -61,7 +61,7 @@ class SvtDynamicMenuOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtDynamicMenuOptions final : public utl::detail::Options { public: SvtDynamicMenuOptions(); diff --git a/include/unotools/eventcfg.hxx b/include/unotools/eventcfg.hxx index 2353797d148f..660ec91b02f0 100644 --- a/include/unotools/eventcfg.hxx +++ b/include/unotools/eventcfg.hxx @@ -59,7 +59,7 @@ enum class GlobalEventId class GlobalEventConfig_Impl; -class UNOTOOLS_DLLPUBLIC GlobalEventConfig: +class UNOTOOLS_DLLPUBLIC GlobalEventConfig final : public cppu::WeakImplHelper< css::document::XEventsSupplier, css::container::XNameReplace > { public: diff --git a/include/unotools/extendedsecurityoptions.hxx b/include/unotools/extendedsecurityoptions.hxx index 1b5183d3f551..533cc8894890 100644 --- a/include/unotools/extendedsecurityoptions.hxx +++ b/include/unotools/extendedsecurityoptions.hxx @@ -42,7 +42,7 @@ class SvtExtendedSecurityOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtExtendedSecurityOptions final : public utl::detail::Options { public: // Must be zero based! diff --git a/include/unotools/fltrcfg.hxx b/include/unotools/fltrcfg.hxx index c015740dcaf2..bac46c03cc31 100644 --- a/include/unotools/fltrcfg.hxx +++ b/include/unotools/fltrcfg.hxx @@ -25,7 +25,7 @@ #include <memory> struct SvtFilterOptions_Impl; -class UNOTOOLS_DLLPUBLIC SvtFilterOptions : public utl::ConfigItem +class UNOTOOLS_DLLPUBLIC SvtFilterOptions final : public utl::ConfigItem { private: std::unique_ptr<SvtFilterOptions_Impl, o3tl::default_delete<SvtFilterOptions_Impl>> pImpl; diff --git a/include/unotools/fontoptions.hxx b/include/unotools/fontoptions.hxx index 1779b2199bfa..96fff5327def 100644 --- a/include/unotools/fontoptions.hxx +++ b/include/unotools/fontoptions.hxx @@ -40,7 +40,7 @@ class SvtFontOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtFontOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtFontOptions final : public utl::detail::Options { public: SvtFontOptions(); diff --git a/include/unotools/historyoptions.hxx b/include/unotools/historyoptions.hxx index 8d628a67254b..9279f864cfdc 100644 --- a/include/unotools/historyoptions.hxx +++ b/include/unotools/historyoptions.hxx @@ -55,7 +55,7 @@ class SvtHistoryOptions_Impl; key "PickList": The last used documents displayed in the file menu. key "History": The last opened documents general. */ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtHistoryOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtHistoryOptions final : public utl::detail::Options { public: SvtHistoryOptions(); diff --git a/include/unotools/lingucfg.hxx b/include/unotools/lingucfg.hxx index 3e5c7ee6b2b5..82d2dfe5d0b3 100644 --- a/include/unotools/lingucfg.hxx +++ b/include/unotools/lingucfg.hxx @@ -135,7 +135,7 @@ struct UNOTOOLS_DLLPUBLIC SvtLinguConfigDictionaryEntry css::uno::Sequence< OUString > aLocaleNames; }; -class UNOTOOLS_DLLPUBLIC SvtLinguConfig: public utl::detail::Options +class UNOTOOLS_DLLPUBLIC SvtLinguConfig final : public utl::detail::Options { // returns static object UNOTOOLS_DLLPRIVATE static SvtLinguConfigItem & GetConfigItem(); diff --git a/include/unotools/misccfg.hxx b/include/unotools/misccfg.hxx index 34dbec889db0..ffc6b9f7aa6a 100644 --- a/include/unotools/misccfg.hxx +++ b/include/unotools/misccfg.hxx @@ -26,7 +26,7 @@ namespace utl { class SfxMiscCfg; -class UNOTOOLS_DLLPUBLIC MiscCfg : public detail::Options +class UNOTOOLS_DLLPUBLIC MiscCfg final : public detail::Options { private: std::shared_ptr<SfxMiscCfg> m_pImpl; diff --git a/include/unotools/moduleoptions.hxx b/include/unotools/moduleoptions.hxx index 4366c0c69d4e..9e73cba91ef0 100644 --- a/include/unotools/moduleoptions.hxx +++ b/include/unotools/moduleoptions.hxx @@ -47,7 +47,7 @@ class SvtModuleOptions_Impl; @devstatus ready to use @threadsafe yes *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtModuleOptions final : public utl::detail::Options { public: diff --git a/include/unotools/optionsdlg.hxx b/include/unotools/optionsdlg.hxx index f568ad032630..f20d2aa59d65 100644 --- a/include/unotools/optionsdlg.hxx +++ b/include/unotools/optionsdlg.hxx @@ -25,7 +25,7 @@ class SvtOptionsDlgOptions_Impl; -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtOptionsDialogOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtOptionsDialogOptions final : public utl::detail::Options { private: SvtOptionsDlgOptions_Impl* m_pImp; diff --git a/include/unotools/pathoptions.hxx b/include/unotools/pathoptions.hxx index 74a408a7c9ef..5e68b8fe5932 100644 --- a/include/unotools/pathoptions.hxx +++ b/include/unotools/pathoptions.hxx @@ -31,7 +31,7 @@ class SvtPathOptions_Impl; All path functions return URLs! */ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPathOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPathOptions final : public utl::detail::Options { private: std::shared_ptr<SvtPathOptions_Impl> pImpl; diff --git a/include/unotools/printwarningoptions.hxx b/include/unotools/printwarningoptions.hxx index f86b0731199f..176dc924302e 100644 --- a/include/unotools/printwarningoptions.hxx +++ b/include/unotools/printwarningoptions.hxx @@ -41,7 +41,7 @@ class SvtPrintWarningOptions_Impl; @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtPrintWarningOptions final : public utl::detail::Options { public: SvtPrintWarningOptions(); diff --git a/include/unotools/progresshandlerwrap.hxx b/include/unotools/progresshandlerwrap.hxx index 6b4d56a99f0f..1a0794b492d5 100644 --- a/include/unotools/progresshandlerwrap.hxx +++ b/include/unotools/progresshandlerwrap.hxx @@ -29,7 +29,7 @@ namespace com::sun::star::task { class XStatusIndicator; } namespace utl { -class UNOTOOLS_DLLPUBLIC ProgressHandlerWrap : public ::cppu::WeakImplHelper< css::ucb::XProgressHandler > +class UNOTOOLS_DLLPUBLIC ProgressHandlerWrap final : public ::cppu::WeakImplHelper< css::ucb::XProgressHandler > { css::uno::Reference< css::task::XStatusIndicator > m_xStatusIndicator; diff --git a/include/unotools/saveopt.hxx b/include/unotools/saveopt.hxx index 865ec73835cc..7c4d3adc0dc8 100644 --- a/include/unotools/saveopt.hxx +++ b/include/unotools/saveopt.hxx @@ -23,7 +23,7 @@ #include <unotools/options.hxx> struct SvtLoadSaveOptions_Impl; -class UNOTOOLS_DLLPUBLIC SvtSaveOptions: public utl::detail::Options +class UNOTOOLS_DLLPUBLIC SvtSaveOptions final : public utl::detail::Options { SvtLoadSaveOptions_Impl* pImp; diff --git a/include/unotools/securityoptions.hxx b/include/unotools/securityoptions.hxx index 36f43ed0c505..44b99fdc9a57 100644 --- a/include/unotools/securityoptions.hxx +++ b/include/unotools/securityoptions.hxx @@ -56,7 +56,7 @@ enum EBasicSecurityMode @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSecurityOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSecurityOptions final : public utl::detail::Options { public: diff --git a/include/unotools/streamhelper.hxx b/include/unotools/streamhelper.hxx index 99e9e708aa97..5b2b7f762157 100644 --- a/include/unotools/streamhelper.hxx +++ b/include/unotools/streamhelper.hxx @@ -33,7 +33,7 @@ namespace utl /** * The helper implementation for a using input streams based on SvLockBytes. */ -class UNOTOOLS_DLLPUBLIC OInputStreamHelper : public cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> +class UNOTOOLS_DLLPUBLIC OInputStreamHelper final : public cppu::WeakImplHelper<css::io::XInputStream, css::io::XSeekable> { ::osl::Mutex m_aMutex; SvLockBytesRef m_xLockBytes; diff --git a/include/unotools/streamwrap.hxx b/include/unotools/streamwrap.hxx index bb34dd7af7e6..7900c93b4c39 100644 --- a/include/unotools/streamwrap.hxx +++ b/include/unotools/streamwrap.hxx @@ -122,7 +122,7 @@ typedef ::cppu::ImplHelper1 < css::io::XSeekable /** helper class for wrapping an SvStream into a com.sun.star.io::XOutputStream which is seekable (i.e. supports the com.sun.star.io::XSeekable interface). */ -class UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper +class UNOTOOLS_DLLPUBLIC OSeekableOutputStreamWrapper final :public OOutputStreamWrapper ,public OSeekableOutputStreamWrapper_Base { @@ -143,13 +143,12 @@ private: virtual sal_Int64 SAL_CALL getLength( ) override; }; -class UNOTOOLS_DLLPUBLIC OStreamWrapper +class UNOTOOLS_DLLPUBLIC OStreamWrapper final : public cppu::ImplInheritanceHelper<OSeekableInputStreamWrapper, css::io::XStream, css::io::XOutputStream, css::io::XTruncate> { -protected: ~OStreamWrapper() override; public: diff --git a/include/unotools/syslocaleoptions.hxx b/include/unotools/syslocaleoptions.hxx index 666f4d995f31..5f5e57540485 100644 --- a/include/unotools/syslocaleoptions.hxx +++ b/include/unotools/syslocaleoptions.hxx @@ -31,7 +31,7 @@ class SvtSysLocaleOptions_Impl; class LinkParamNone; template <typename Arg, typename Ret> class Link; -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtSysLocaleOptions final : public utl::detail::Options { std::shared_ptr<SvtSysLocaleOptions_Impl> pImpl; diff --git a/include/unotools/useroptions.hxx b/include/unotools/useroptions.hxx index 8589f4fdea9f..42dfa37c84df 100644 --- a/include/unotools/useroptions.hxx +++ b/include/unotools/useroptions.hxx @@ -54,7 +54,7 @@ enum class UserOptToken // class SvtUserOptions -------------------------------------------------- -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtUserOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtUserOptions final : public utl::detail::Options { public: SvtUserOptions (); diff --git a/include/unotools/viewoptions.hxx b/include/unotools/viewoptions.hxx index f7c1a9cd064d..461e5ead6e26 100644 --- a/include/unotools/viewoptions.hxx +++ b/include/unotools/viewoptions.hxx @@ -94,7 +94,7 @@ enum class EViewType @devstatus ready to use *//*-*************************************************************************************************************/ -class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions : public utl::detail::Options +class SAL_WARN_UNUSED UNOTOOLS_DLLPUBLIC SvtViewOptions final : public utl::detail::Options { // public methods _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits