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 /comphelper | |
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 'comphelper')
17 files changed, 19 insertions, 19 deletions
diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx index 261dedba34db..6da949301b4b 100644 --- a/comphelper/qa/container/comphelper_ifcontainer.cxx +++ b/comphelper/qa/container/comphelper_ifcontainer.cxx @@ -46,7 +46,7 @@ class ContainerListener : public ::cppu::WeakImplHelper1< XEventListener > public: explicit ContainerListener(ContainerStats *pStats) : m_pStats(pStats) { m_pStats->m_nAlive++; } - virtual ~ContainerListener() { m_pStats->m_nAlive--; } + virtual ~ContainerListener() override { m_pStats->m_nAlive--; } virtual void SAL_CALL disposing( const EventObject& ) throw (RuntimeException, std::exception) override { diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 824756e7ec36..d0ee59d5c25a 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -35,7 +35,7 @@ class IndexedPropertyValuesContainer : public cppu::WeakImplHelper< container::X { public: IndexedPropertyValuesContainer() throw(); - virtual ~IndexedPropertyValuesContainer() throw(); + virtual ~IndexedPropertyValuesContainer() throw() override; // XIndexContainer virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index e4bb48663210..7bd50ebdf9d2 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -36,7 +36,7 @@ class NamedPropertyValuesContainer : public cppu::WeakImplHelper< container::XNa { public: NamedPropertyValuesContainer() throw(); - virtual ~NamedPropertyValuesContainer() throw(); + virtual ~NamedPropertyValuesContainer() throw() override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 3b45fda06255..040192d61dca 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -153,7 +153,7 @@ namespace comphelper { protected: EnumerableMap(); - virtual ~EnumerableMap(); + virtual ~EnumerableMap() override; // XInitialization virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; @@ -283,7 +283,7 @@ namespace comphelper virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; protected: - virtual ~MapEnumeration() + virtual ~MapEnumeration() override { acquire(); { diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 6ef8143753f9..f20be212fd48 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -42,7 +42,7 @@ namespace comphelper { public: explicit NameContainer( css::uno::Type aType ); - virtual ~NameContainer(); + virtual ~NameContainer() override; // XNameContainer virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index cf3232b99eb1..81bfcd3c6ac1 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -95,7 +95,7 @@ class ImplEventAttacherManager public: ImplEventAttacherManager( const Reference< XIntrospection > & rIntrospection, const Reference< XComponentContext >& rContext ); - virtual ~ImplEventAttacherManager(); + virtual ~ImplEventAttacherManager() override; // Methods of XEventAttacherManager virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 5eabc8e56598..9a7c7a957094 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -46,7 +46,7 @@ class OSimpleLogRing : public ::cppu::WeakImplHelper< css::logging::XSimpleLogRi public: OSimpleLogRing(); - virtual ~OSimpleLogRing(); + virtual ~OSimpleLogRing() override; // XSimpleLogRing virtual void SAL_CALL logString( const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index 2107d7a6912d..6960e1da60ef 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -54,7 +54,7 @@ class OInstanceLocker : public ::cppu::WeakImplHelper< css::lang::XComponent, public: explicit OInstanceLocker(); - virtual ~OInstanceLocker(); + virtual ~OInstanceLocker() override; // XComponent virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; @@ -92,7 +92,7 @@ public: sal_Int32 nMode, const css::uno::Reference< css::embed::XActionsApproval >& rApproval ); - virtual ~OLockListener(); + virtual ~OLockListener() override; void Init(); void Dispose(); diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 43d707c36363..a20e5cfd7f14 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -48,7 +48,7 @@ public: , m_bRestartRequested( false ) {} - virtual ~OOfficeRestartManager() + virtual ~OOfficeRestartManager() override {} // XRestartManager diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 7744d3c1f8b7..8a18fabb6a82 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -62,7 +62,7 @@ public: throw (uno::Exception, std::exception) override; private: - virtual ~Factory(); + virtual ~Factory() override; ServiceDecl const& m_rServiceDecl; }; diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 88e8341f0039..20fcc6b6ca92 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -45,7 +45,7 @@ class OfficeInstallationDirectories : public mutex_holder, public UnoImplBase public: explicit OfficeInstallationDirectories( const css::uno::Reference< css::uno::XComponentContext > & xCtx ); - virtual ~OfficeInstallationDirectories(); + virtual ~OfficeInstallationDirectories() override; // XOfficeInstallationDirectories virtual OUString SAL_CALL diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 64bdf1ab190a..e8b08eca2497 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -63,7 +63,7 @@ namespace comphelper public: explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); - virtual ~GenericPropertySet() throw(); + virtual ~GenericPropertySet() throw() override; // XInterface virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception) override; diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index 467aee20c718..ca2df4a9fa0a 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -92,7 +92,7 @@ namespace comphelper OPropertyBag(const OPropertyBag&) = delete; const OPropertyBag& operator=(const OPropertyBag&) = delete; OPropertyBag(); - virtual ~OPropertyBag(); + virtual ~OPropertyBag() override; protected: DECLARE_XINTERFACE() diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index 4e7601211224..b4026427589c 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -45,7 +45,7 @@ class UNOMemoryStream : public WeakImplHelper<XServiceInfo, XStream, XSeekableIn { public: UNOMemoryStream(); - virtual ~UNOMemoryStream(); + virtual ~UNOMemoryStream() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 6cf44bc4c0a8..d9e372238637 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -73,7 +73,7 @@ public: virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) override; private: - virtual ~SequenceInputStreamService() {} + virtual ~SequenceInputStreamService() override {} ::osl::Mutex m_aMutex; diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 58b3235029b0..461cbc5d2563 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -61,7 +61,7 @@ public: virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override; private: - virtual ~SequenceOutputStreamService() {}; + virtual ~SequenceOutputStreamService() override {}; ::osl::Mutex m_aMutex; diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index 02f5815c7901..6946e0e3bbd6 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -70,7 +70,7 @@ public: css::uno::Sequence< css::uno::Sequence< css::beans::StringPair > > const & GetParsingResult(); explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly - virtual ~OFOPXMLHelper_Impl(); + virtual ~OFOPXMLHelper_Impl() override; // XDocumentHandler virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; |