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/tbxctrl.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/tbxctrl.hxx')
-rw-r--r-- | include/sfx2/tbxctrl.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx index 5c40c48747a3..906d2271bf6e 100644 --- a/include/sfx2/tbxctrl.hxx +++ b/include/sfx2/tbxctrl.hxx @@ -149,7 +149,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const ResId &rId ); - ~SfxPopupWindow(); + virtual ~SfxPopupWindow(); virtual SfxPopupWindow* Clone() const; virtual void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -372,7 +372,7 @@ protected: public: SFX_DECL_TOOLBOX_CONTROL(); SfxAddonsToolBoxControl_Impl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rBox ); - ~SfxAddonsToolBoxControl_Impl(); + virtual ~SfxAddonsToolBoxControl_Impl(); void RefreshMenuImages( Menu* pMenu ); }; |