summaryrefslogtreecommitdiff
path: root/include/vcl/menu.hxx
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-09-13 13:09:01 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-09-13 13:19:22 +0200
commit91dd2db17bd6cb9b357d1d69b187174e31eabef0 (patch)
treed634de3a1a6820904b5699c2136b79b1a5a807c7 /include/vcl/menu.hxx
parent6f8ea7e89ea190b9462c945d55a3ad8777b2f3ef (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/vcl/menu.hxx')
-rw-r--r--include/vcl/menu.hxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx
index efb55d52b65a..6504edc8befc 100644
--- a/include/vcl/menu.hxx
+++ b/include/vcl/menu.hxx
@@ -229,7 +229,7 @@ protected:
Menu();
public:
- virtual ~Menu();
+ virtual ~Menu() override;
virtual void dispose() override;
void Activate();
@@ -427,7 +427,7 @@ protected:
public:
MenuBar();
MenuBar( const MenuBar& rMenu );
- virtual ~MenuBar();
+ virtual ~MenuBar() override;
virtual void dispose() override;
MenuBar& operator =( const MenuBar& rMenu );
@@ -509,7 +509,7 @@ public:
PopupMenu();
PopupMenu( const PopupMenu& rMenu );
explicit PopupMenu( const ResId& );
- virtual ~PopupMenu();
+ virtual ~PopupMenu() override;
virtual void dispose() override;
virtual bool IsMenuBar() const override { return false; }