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 /shell | |
| 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 'shell')
4 files changed, 4 insertions, 4 deletions
diff --git a/shell/source/backends/desktopbe/desktopbackend.cxx b/shell/source/backends/desktopbe/desktopbackend.cxx index fdbe4d4e9d61..db220c3e85df 100644 --- a/shell/source/backends/desktopbe/desktopbackend.cxx +++ b/shell/source/backends/desktopbe/desktopbackend.cxx @@ -75,7 +75,7 @@ public: Default& operator=(const Default&) = delete; private: - virtual ~Default() {} + virtual ~Default() override {} virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/shell/source/backends/kde4be/kde4backend.cxx b/shell/source/backends/kde4be/kde4backend.cxx index 013e5321d507..bd0b2d49edd4 100644 --- a/shell/source/backends/kde4be/kde4backend.cxx +++ b/shell/source/backends/kde4be/kde4backend.cxx @@ -73,7 +73,7 @@ public: Service& operator=(const Service&) = delete; private: - virtual ~Service() {} + virtual ~Service() override {} virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override diff --git a/shell/source/backends/localebe/localebackend.hxx b/shell/source/backends/localebe/localebackend.hxx index 5d7a2e732c48..5927f4cbd585 100644 --- a/shell/source/backends/localebe/localebackend.hxx +++ b/shell/source/backends/localebe/localebackend.hxx @@ -123,7 +123,7 @@ class LocaleBackend : public ::cppu::WeakImplHelper < LocaleBackend(); /** Destructor */ - virtual ~LocaleBackend() ; + virtual ~LocaleBackend() override ; private: // Returns the user locale diff --git a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx index 236f293586bf..afbfa92b47cf 100644 --- a/shell/source/sessioninstall/SyncDbusSessionHelper.hxx +++ b/shell/source/sessioninstall/SyncDbusSessionHelper.hxx @@ -21,7 +21,7 @@ namespace shell { namespace sessioninstall { public: SyncDbusSessionHelper(css::uno::Reference< css::uno::XComponentContext> const&); - virtual ~SyncDbusSessionHelper() {} + virtual ~SyncDbusSessionHelper() override {} // XModify Methods virtual void SAL_CALL InstallPackageFiles( ::sal_uInt32 xid, const css::uno::Sequence< OUString >& files, const OUString& interaction ) throw (css::uno::RuntimeException, std::exception) override; |