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 /include/ucbhelper | |
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 'include/ucbhelper')
-rw-r--r-- | include/ucbhelper/commandenvironment.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/contenthelper.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/contentidentifier.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/contentinfo.hxx | 4 | ||||
-rw-r--r-- | include/ucbhelper/fd_inputstream.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/interactionrequest.hxx | 4 | ||||
-rw-r--r-- | include/ucbhelper/propertyvalueset.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/providerhelper.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/resultset.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/resultsethelper.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/resultsetmetadata.hxx | 2 | ||||
-rw-r--r-- | include/ucbhelper/simplenameclashresolverequest.hxx | 2 |
12 files changed, 14 insertions, 14 deletions
diff --git a/include/ucbhelper/commandenvironment.hxx b/include/ucbhelper/commandenvironment.hxx index 26a7006c0d7d..dff68b1ed8aa 100644 --- a/include/ucbhelper/commandenvironment.hxx +++ b/include/ucbhelper/commandenvironment.hxx @@ -57,7 +57,7 @@ public: /** * Destructor. */ - virtual ~CommandEnvironment(); + virtual ~CommandEnvironment() override; // XCommandEnvironemnt virtual css::uno::Reference< css::task::XInteractionHandler > SAL_CALL getInteractionHandler() diff --git a/include/ucbhelper/contenthelper.hxx b/include/ucbhelper/contenthelper.hxx index f558507e2d45..9645f7ef1f83 100644 --- a/include/ucbhelper/contenthelper.hxx +++ b/include/ucbhelper/contenthelper.hxx @@ -306,7 +306,7 @@ public: * content provider. The provider implementation removes the content * from a hash map. */ - virtual ~ContentImplHelper(); + virtual ~ContentImplHelper() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx index 25969f17ae4e..21616511ce2b 100644 --- a/include/ucbhelper/contentidentifier.hxx +++ b/include/ucbhelper/contentidentifier.hxx @@ -46,7 +46,7 @@ class UCBHELPER_DLLPUBLIC ContentIdentifier : { public: ContentIdentifier( const OUString& rURL ); - virtual ~ContentIdentifier(); + virtual ~ContentIdentifier() override; // XInterface virtual css::uno::Any SAL_CALL diff --git a/include/ucbhelper/contentinfo.hxx b/include/ucbhelper/contentinfo.hxx index acf778e1c8af..ee1f9ec43420 100644 --- a/include/ucbhelper/contentinfo.hxx +++ b/include/ucbhelper/contentinfo.hxx @@ -62,7 +62,7 @@ private: public: PropertySetInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ); - virtual ~PropertySetInfo(); + virtual ~PropertySetInfo() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) @@ -127,7 +127,7 @@ private: public: CommandProcessorInfo( const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv, ContentImplHelper* pContent ); - virtual ~CommandProcessorInfo(); + virtual ~CommandProcessorInfo() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/fd_inputstream.hxx b/include/ucbhelper/fd_inputstream.hxx index 0959551a2f24..27d0b1a72774 100644 --- a/include/ucbhelper/fd_inputstream.hxx +++ b/include/ucbhelper/fd_inputstream.hxx @@ -51,7 +51,7 @@ namespace ucbhelper FdInputStream(oslFileHandle tmpfl = nullptr); - virtual ~FdInputStream(); + virtual ~FdInputStream() override; virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& aData, diff --git a/include/ucbhelper/interactionrequest.hxx b/include/ucbhelper/interactionrequest.hxx index 8d8f2c9191bf..4bf10bcab250 100644 --- a/include/ucbhelper/interactionrequest.hxx +++ b/include/ucbhelper/interactionrequest.hxx @@ -70,7 +70,7 @@ protected: void setRequest( const css::uno::Any & rRequest ); InteractionRequest(); - virtual ~InteractionRequest(); + virtual ~InteractionRequest() override; public: /** @@ -163,7 +163,7 @@ protected: * method the way that they call this method. */ void recordSelection(); - virtual ~InteractionContinuation(); + virtual ~InteractionContinuation() override; public: InteractionContinuation( InteractionRequest * pRequest ); diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx index 8781a7d81725..c0c8c34ac698 100644 --- a/include/ucbhelper/propertyvalueset.hxx +++ b/include/ucbhelper/propertyvalueset.hxx @@ -71,7 +71,7 @@ private: public: PropertyValueSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~PropertyValueSet(); + virtual ~PropertyValueSet() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx index ab0dca5a73d7..da10f4194817 100644 --- a/include/ucbhelper/providerhelper.hxx +++ b/include/ucbhelper/providerhelper.hxx @@ -133,7 +133,7 @@ public: ContentProviderImplHelper( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ContentProviderImplHelper(); + virtual ~ContentProviderImplHelper() override; // XInterface diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx index 4f002deb9620..e2f9945d9055 100644 --- a/include/ucbhelper/resultset.hxx +++ b/include/ucbhelper/resultset.hxx @@ -99,7 +99,7 @@ public: const css::uno::Sequence< css::beans::Property >& rProperties, const rtl::Reference< ResultSetDataSupplier >& rDataSupplier, const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); - virtual ~ResultSet(); + virtual ~ResultSet() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx index f34b8666768c..d2f6c73b8c3e 100644 --- a/include/ucbhelper/resultsethelper.hxx +++ b/include/ucbhelper/resultsethelper.hxx @@ -126,7 +126,7 @@ public: /** * Destructor. */ - virtual ~ResultSetImplHelper(); + virtual ~ResultSetImplHelper() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx index 6d27da83f697..5b397d6603f9 100644 --- a/include/ucbhelper/resultsetmetadata.hxx +++ b/include/ucbhelper/resultsetmetadata.hxx @@ -140,7 +140,7 @@ public: /** * Destructor. */ - virtual ~ResultSetMetaData(); + virtual ~ResultSetMetaData() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) diff --git a/include/ucbhelper/simplenameclashresolverequest.hxx b/include/ucbhelper/simplenameclashresolverequest.hxx index 8c63126337ed..cdc5e19766e6 100644 --- a/include/ucbhelper/simplenameclashresolverequest.hxx +++ b/include/ucbhelper/simplenameclashresolverequest.hxx @@ -43,7 +43,7 @@ class UCBHELPER_DLLPUBLIC SimpleNameClashResolveRequest : public ucbhelper::Inte { rtl::Reference< InteractionSupplyName > m_xNameSupplier; - virtual ~SimpleNameClashResolveRequest(); + virtual ~SimpleNameClashResolveRequest() override; public: /** |