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 /framework/inc/services | |
| 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 'framework/inc/services')
| -rw-r--r-- | framework/inc/services/desktop.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/services/layoutmanager.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/services/mediatypedetectionhelper.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/services/uriabbreviation.hxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 6e0c21551589..4c9f19c3d1f0 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -115,7 +115,7 @@ class Desktop : private cppu::BaseMutex, // constructor / destructor Desktop( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~Desktop( ); + virtual ~Desktop( ) override; void constructorInit(); diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 8051dc60ac96..5a1ec877fe9d 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -81,7 +81,7 @@ namespace framework enum { DOCKINGAREAS_COUNT = 4 }; LayoutManager( const css::uno::Reference< css::uno::XComponentContext >& xContext ); - virtual ~LayoutManager(); + virtual ~LayoutManager() override; /** declaration of XInterface, XTypeProvider, XServiceInfo */ FWK_DECLARE_XINTERFACE diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index e19923a84184..7c5af808c924 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -65,7 +65,7 @@ class MediaTypeDetectionHelper : public ::cppu::WeakImplHelper< css::util::XS @descr This method destruct an instance of this class and clear some member. *//*-*****************************************************************************************************/ - virtual ~MediaTypeDetectionHelper(); + virtual ~MediaTypeDetectionHelper() override; // XInterface, XTypeProvider, XServiceInfo diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 79b38831c0af..9357a6255fbc 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -48,7 +48,7 @@ private: UriAbbreviation(UriAbbreviation &) = delete; void operator =(UriAbbreviation &) = delete; - virtual ~UriAbbreviation() {} + virtual ~UriAbbreviation() override {} }; } // namespace framework |