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 /ucb/source/ucp/ext | |
| 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 'ucb/source/ucp/ext')
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_content.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_datasupplier.hxx | 2 | ||||
| -rw-r--r-- | ucb/source/ucp/ext/ucpext_provider.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ucb/source/ucp/ext/ucpext_content.hxx b/ucb/source/ucp/ext/ucpext_content.hxx index aad3588119e5..c01a330e1f1b 100644 --- a/ucb/source/ucp/ext/ucpext_content.hxx +++ b/ucb/source/ucp/ext/ucpext_content.hxx @@ -86,7 +86,7 @@ namespace ucb { namespace ucp { namespace ext OUString getPhysicalURL() const; protected: - virtual ~Content(); + virtual ~Content() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.hxx b/ucb/source/ucp/ext/ucpext_datasupplier.hxx index 57395a3e1f0f..b9a7fccb2d11 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.hxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.hxx @@ -48,7 +48,7 @@ namespace ucb { namespace ucp { namespace ext void fetchData(); protected: - virtual ~DataSupplier(); + virtual ~DataSupplier() override; virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; diff --git a/ucb/source/ucp/ext/ucpext_provider.hxx b/ucb/source/ucp/ext/ucpext_provider.hxx index e803e20d6878..2e73f89b6e05 100644 --- a/ucb/source/ucp/ext/ucpext_provider.hxx +++ b/ucb/source/ucp/ext/ucpext_provider.hxx @@ -34,7 +34,7 @@ namespace ucb { namespace ucp { namespace ext { public: explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~ContentProvider(); + virtual ~ContentProvider() override; // XServiceInfo virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; |