diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:09:01 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2016-09-13 13:19:22 +0200 |
commit | 91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch) | |
tree | d634de3a1a6820904b5699c2136b79b1a5a807c7 /svl/source/numbers | |
parent | 6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (diff) |
loplugin:override: No more need for the "MSVC dtor override" workaround
The issue of 362d4f0cd4e50111edfae9d30c90602c37ed65a2 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
Diffstat (limited to 'svl/source/numbers')
-rw-r--r-- | svl/source/numbers/numfmuno.hxx | 8 | ||||
-rw-r--r-- | svl/source/numbers/supservs.hxx | 2 | ||||
-rw-r--r-- | svl/source/numbers/zforlist.cxx | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/svl/source/numbers/numfmuno.hxx b/svl/source/numbers/numfmuno.hxx index 3523a863da7f..fad3f5108988 100644 --- a/svl/source/numbers/numfmuno.hxx +++ b/svl/source/numbers/numfmuno.hxx @@ -47,7 +47,7 @@ private: public: SvNumberFormatterServiceObj(); - virtual ~SvNumberFormatterServiceObj(); + virtual ~SvNumberFormatterServiceObj() override; // XNumberFormatter virtual void SAL_CALL attachNumberFormatsSupplier( @@ -110,7 +110,7 @@ private: public: SvNumberFormatsObj(SvNumberFormatsSupplierObj& pParent, ::comphelper::SharedMutex& _rMutex); - virtual ~SvNumberFormatsObj(); + virtual ~SvNumberFormatsObj() override; // XNumberFormats @@ -174,7 +174,7 @@ private: public: SvNumberFormatObj( SvNumberFormatsSupplierObj& rParent, sal_uLong nK, const ::comphelper::SharedMutex& _rMutex ); - virtual ~SvNumberFormatObj(); + virtual ~SvNumberFormatObj() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > @@ -248,7 +248,7 @@ private: public: SvNumberFormatSettingsObj( SvNumberFormatsSupplierObj& rParent, const ::comphelper::SharedMutex& _rMutex); - virtual ~SvNumberFormatSettingsObj(); + virtual ~SvNumberFormatSettingsObj() override; // XPropertySet diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index 1a0c50c8a576..1049a5dae054 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -43,7 +43,7 @@ protected: public: explicit SvNumberFormatsSupplierServiceObject(const css::uno::Reference< css::uno::XComponentContext >& _rxORB); - virtual ~SvNumberFormatsSupplierServiceObject(); + virtual ~SvNumberFormatsSupplierServiceObject() override; // XInterface virtual void SAL_CALL acquire() throw() override { SvNumberFormatsSupplierObj::acquire(); } diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 8574b6ffdc65..bb0e29e69817 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -169,7 +169,7 @@ class SvNumberFormatterRegistry_Impl : public utl::ConfigurationListener public: SvNumberFormatterRegistry_Impl(); - virtual ~SvNumberFormatterRegistry_Impl(); + virtual ~SvNumberFormatterRegistry_Impl() override; void Insert( SvNumberFormatter* pThis ) { aFormatters.push_back( pThis ); } |