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 /desktop/source/deployment/registry | |
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 'desktop/source/deployment/registry')
-rw-r--r-- | desktop/source/deployment/registry/dp_registry.cxx | 2 | ||||
-rw-r--r-- | desktop/source/deployment/registry/inc/dp_backend.h | 6 | ||||
-rw-r--r-- | desktop/source/deployment/registry/inc/dp_backenddb.hxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index 02419477b926..d1b77a020af9 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -94,7 +94,7 @@ protected: inline void check(); virtual void SAL_CALL disposing() override; - virtual ~PackageRegistryImpl(); + virtual ~PackageRegistryImpl() override; PackageRegistryImpl() : t_helper( getMutex() ) {} diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index cb7b8fcbe026..d94d30f1b25c 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -89,7 +89,7 @@ protected: css::uno::Reference<css::ucb::XCommandEnvironment> const & xCmdEnv ) = 0; - virtual ~Package(); + virtual ~Package() override; Package( ::rtl::Reference<PackageRegistryBackend> const & myBackend, OUString const & url, OUString const & name, @@ -109,7 +109,7 @@ public: const OUString m_shortDescr; const sal_uInt16 m_smallIcon; public: - virtual ~TypeInfo(); + virtual ~TypeInfo() override; TypeInfo( OUString const & mediaType, OUString const & fileFilter, OUString const & shortDescr, @@ -308,7 +308,7 @@ protected: void check(); virtual void SAL_CALL disposing() override; - virtual ~PackageRegistryBackend(); + virtual ~PackageRegistryBackend() override; PackageRegistryBackend( css::uno::Sequence<css::uno::Any> const & args, css::uno::Reference<css::uno::XComponentContext> const & xContext ); diff --git a/desktop/source/deployment/registry/inc/dp_backenddb.hxx b/desktop/source/deployment/registry/inc/dp_backenddb.hxx index 8731cdc3d51e..85b4ee684bcc 100644 --- a/desktop/source/deployment/registry/inc/dp_backenddb.hxx +++ b/desktop/source/deployment/registry/inc/dp_backenddb.hxx @@ -155,7 +155,7 @@ class RegisteredDb: public BackendDb public: RegisteredDb( css::uno::Reference<css::uno::XComponentContext> const & xContext, OUString const & url); - virtual ~RegisteredDb() {}; + virtual ~RegisteredDb() override {}; void addEntry(OUString const & url); |