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 | |
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')
-rw-r--r-- | svl/qa/unit/items/test_itempool.cxx | 2 | ||||
-rw-r--r-- | svl/qa/unit/svl.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/cjkoptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/ctloptions.cxx | 2 | ||||
-rw-r--r-- | svl/source/config/itemholder2.hxx | 2 | ||||
-rw-r--r-- | svl/source/fsstor/fsstorage.hxx | 2 | ||||
-rw-r--r-- | svl/source/fsstor/oinputstreamcontainer.hxx | 2 | ||||
-rw-r--r-- | svl/source/fsstor/ostreamcontainer.hxx | 2 | ||||
-rw-r--r-- | svl/source/inc/passwordcontainer.hxx | 2 | ||||
-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 |
12 files changed, 15 insertions, 15 deletions
diff --git a/svl/qa/unit/items/test_itempool.cxx b/svl/qa/unit/items/test_itempool.cxx index bf52772e763a..9a4aae2ba622 100644 --- a/svl/qa/unit/items/test_itempool.cxx +++ b/svl/qa/unit/items/test_itempool.cxx @@ -19,7 +19,7 @@ class PoolItemTest : public CppUnit::TestFixture { public: PoolItemTest() {} - virtual ~PoolItemTest() {} + virtual ~PoolItemTest() override {} void testPool(); diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx index 321e382ae6fd..e3a81fb7d1af 100644 --- a/svl/qa/unit/svl.cxx +++ b/svl/qa/unit/svl.cxx @@ -50,7 +50,7 @@ namespace { class Test : public CppUnit::TestFixture { public: Test(); - virtual ~Test(); + virtual ~Test() override; virtual void tearDown() override; diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index c16cccf4cba5..3556cb7fb0dc 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -62,7 +62,7 @@ class SvtCJKOptions_Impl : public utl::ConfigItem public: SvtCJKOptions_Impl(); - virtual ~SvtCJKOptions_Impl(); + virtual ~SvtCJKOptions_Impl() override; virtual void Notify( const css::uno::Sequence< OUString >& rPropertyNames ) override; void Load(); diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 245c385846f9..3c3fa2302e08 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -58,7 +58,7 @@ private: public: SvtCTLOptions_Impl(); - virtual ~SvtCTLOptions_Impl(); + virtual ~SvtCTLOptions_Impl() override; virtual void Notify( const Sequence< OUString >& _aPropertyNames ) override; void Load(); diff --git a/svl/source/config/itemholder2.hxx b/svl/source/config/itemholder2.hxx index a6fa0aa0ba64..8a5ba35ad473 100644 --- a/svl/source/config/itemholder2.hxx +++ b/svl/source/config/itemholder2.hxx @@ -36,7 +36,7 @@ class ItemHolder2 : private ItemHolderMutexBase public: ItemHolder2(); - virtual ~ItemHolder2(); + virtual ~ItemHolder2() override; static void holdConfigItem(EItem eItem); // uno interface diff --git a/svl/source/fsstor/fsstorage.hxx b/svl/source/fsstor/fsstorage.hxx index ddbaab89ae65..5cf83891d9ff 100644 --- a/svl/source/fsstor/fsstorage.hxx +++ b/svl/source/fsstor/fsstorage.hxx @@ -53,7 +53,7 @@ public: sal_Int32 nMode, css::uno::Reference< css::uno::XComponentContext > const & xContext ); - virtual ~FSStorage(); + virtual ~FSStorage() override; ::ucbhelper::Content* GetContent(); diff --git a/svl/source/fsstor/oinputstreamcontainer.hxx b/svl/source/fsstor/oinputstreamcontainer.hxx index cb53f2a67300..13c983d7c355 100644 --- a/svl/source/fsstor/oinputstreamcontainer.hxx +++ b/svl/source/fsstor/oinputstreamcontainer.hxx @@ -48,7 +48,7 @@ class OFSInputStreamContainer : public cppu::WeakImplHelper < css::io::XInputStr public: explicit OFSInputStreamContainer( const css::uno::Reference < css::io::XInputStream >& xStream ); - virtual ~OFSInputStreamContainer(); + virtual ~OFSInputStreamContainer() override; virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw (css::uno::RuntimeException, std::exception) override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override; diff --git a/svl/source/fsstor/ostreamcontainer.hxx b/svl/source/fsstor/ostreamcontainer.hxx index 6fc7f634c9b0..feac66ebef58 100644 --- a/svl/source/fsstor/ostreamcontainer.hxx +++ b/svl/source/fsstor/ostreamcontainer.hxx @@ -61,7 +61,7 @@ class OFSStreamContainer : public cppu::OWeakObject, public: explicit OFSStreamContainer( const css::uno::Reference < css::io::XStream >& xStream ); - virtual ~OFSStreamContainer(); + virtual ~OFSStreamContainer() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) diff --git a/svl/source/inc/passwordcontainer.hxx b/svl/source/inc/passwordcontainer.hxx index f2212e3d8382..980366fcdb7e 100644 --- a/svl/source/inc/passwordcontainer.hxx +++ b/svl/source/inc/passwordcontainer.hxx @@ -275,7 +275,7 @@ css::task::UrlRecord find( public: PasswordContainer( const css::uno::Reference< css::lang::XMultiServiceFactory >& ); - virtual ~PasswordContainer(); + virtual ~PasswordContainer() override; virtual void SAL_CALL add( const OUString& aUrl, const OUString& aUserName, 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 ); } |