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 /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 'ucbhelper')
| -rw-r--r-- | ucbhelper/source/client/content.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/client/proxydecider.cxx | 2 | ||||
| -rw-r--r-- | ucbhelper/source/provider/resultset.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ucbhelper/source/client/content.cxx b/ucbhelper/source/client/content.cxx index 82af44ced486..bcc44b686970 100644 --- a/ucbhelper/source/client/content.cxx +++ b/ucbhelper/source/client/content.cxx @@ -181,7 +181,7 @@ public: const Reference< XContent >& rContent, const Reference< XCommandEnvironment >& rEnv ); - virtual ~Content_Impl(); + virtual ~Content_Impl() override; const OUString& getURL() const; Reference< XContent > getContent(); diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index d64cbd5df979..e8a3b76c5aa1 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -134,7 +134,7 @@ private: public: explicit InternetProxyDecider_Impl( const uno::Reference< uno::XComponentContext >& rxContext ); - virtual ~InternetProxyDecider_Impl(); + virtual ~InternetProxyDecider_Impl() override; void dispose(); diff --git a/ucbhelper/source/provider/resultset.cxx b/ucbhelper/source/provider/resultset.cxx index 54ec956210ba..d8e34acce752 100644 --- a/ucbhelper/source/provider/resultset.cxx +++ b/ucbhelper/source/provider/resultset.cxx @@ -93,7 +93,7 @@ public: PropertySetInfo( const PropertyInfo* pProps, sal_Int32 nProps ); - virtual ~PropertySetInfo(); + virtual ~PropertySetInfo() override; // XInterface virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) |