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 /UnoControls/inc | |
| 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 'UnoControls/inc')
| -rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 2 | ||||
| -rw-r--r-- | UnoControls/inc/basecontrol.hxx | 2 | ||||
| -rw-r--r-- | UnoControls/inc/multiplexer.hxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index e62b9af8b0ad..908b8a2873b5 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -55,7 +55,7 @@ public: BaseContainerControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~BaseContainerControl(); + virtual ~BaseContainerControl() override; // XInterface diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 3970e75a925c..2be5cb5e68f9 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -119,7 +119,7 @@ public: BaseControl( const css::uno::Reference< css::uno::XComponentContext >& rxContext ); - virtual ~BaseControl(); + virtual ~BaseControl() override; // XInterface diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index d82f073419ac..f238293444f1 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -83,7 +83,7 @@ public: OMRCListenerMultiplexerHelper( const OMRCListenerMultiplexerHelper& aCopyInstance ); - virtual ~OMRCListenerMultiplexerHelper(); + virtual ~OMRCListenerMultiplexerHelper() override; // XInterface |