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 /include/sfx2/infobar.hxx | |
| 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 'include/sfx2/infobar.hxx')
| -rw-r--r-- | include/sfx2/infobar.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/infobar.hxx b/include/sfx2/infobar.hxx index 1e5a31ea87d9..96359a1205fd 100644 --- a/include/sfx2/infobar.hxx +++ b/include/sfx2/infobar.hxx @@ -30,7 +30,7 @@ class SFX2_DLLPUBLIC SfxInfoBarContainerChild : public SfxChildWindow sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - virtual ~SfxInfoBarContainerChild(); + virtual ~SfxInfoBarContainerChild() override; SFX_DECL_CHILDWINDOW_WITHID( SfxInfoBarContainerChild ); @@ -56,7 +56,7 @@ class SfxInfoBarWindow : public vcl::Window const basegfx::BColor* pForegroundColor, const basegfx::BColor* pMessageColor, WinBits nMessageStyle ); - virtual ~SfxInfoBarWindow( ); + virtual ~SfxInfoBarWindow( ) override; virtual void dispose() override; const OUString& getId() const { return m_sId; } @@ -81,7 +81,7 @@ class SfxInfoBarContainerWindow : public vcl::Window public: SfxInfoBarContainerWindow(SfxInfoBarContainerChild* pChildWin); - virtual ~SfxInfoBarContainerWindow( ); + virtual ~SfxInfoBarContainerWindow( ) override; virtual void dispose() override; SfxInfoBarWindow* appendInfoBar(const OUString& sId, |