diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:18:35 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2014-04-01 19:22:54 +0200 |
commit | 362d4f0cd4e50111edfae9d30c90602c37ed65a2 (patch) | |
tree | 0b432c049d580dcac6130bca9fb028bab8af8fa8 /include/sfx2/mnuitem.hxx | |
parent | b66d87086804460c1986df1b832fd6b2ea075a90 (diff) |
Explicitly mark overriding destructors as "virtual"
It appears that the C++ standard allows overriding destructors to be marked
"override," but at least some MSVC versions complain about it, so at least make
sure such destructors are explicitly marked "virtual."
Change-Id: I0e1cafa7584fd16ebdce61f569eae2373a71b0a1
Diffstat (limited to 'include/sfx2/mnuitem.hxx')
-rw-r--r-- | include/sfx2/mnuitem.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx index 97892478c0c8..57e86382d00e 100644 --- a/include/sfx2/mnuitem.hxx +++ b/include/sfx2/mnuitem.hxx @@ -50,7 +50,7 @@ public: static SfxMenuControl* CreateImpl( sal_uInt16 nId, Menu &rMenu, SfxBindings &rBindings ); static void RegisterControl( sal_uInt16 nSlotId = 0, SfxModule *pMod=NULL ); - ~SfxMenuControl(); + virtual ~SfxMenuControl(); using SfxControllerItem::Bind; void Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId, @@ -79,7 +79,7 @@ public: SfxUnoMenuControl( const OUString&, sal_uInt16 nId, Menu&, const OUString&, SfxBindings&, SfxVirtualMenu* ); - ~SfxUnoMenuControl(); + virtual ~SfxUnoMenuControl(); }; typedef SfxMenuControl* (*SfxMenuControlCtor)( sal_uInt16 nId, Menu &, SfxBindings & ); @@ -131,7 +131,7 @@ protected: public: SFX_DECL_MENU_CONTROL(); SfxAppMenuControl_Impl( sal_uInt16 nPos, Menu& rMenu, SfxBindings& rBindings ); - ~SfxAppMenuControl_Impl(); + virtual ~SfxAppMenuControl_Impl(); struct ExecuteInfo { |