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 /svx/source/inc/tbxform.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 'svx/source/inc/tbxform.hxx')
-rw-r--r-- | svx/source/inc/tbxform.hxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/inc/tbxform.hxx b/svx/source/inc/tbxform.hxx index 2d7c265df9f5..dad095000501 100644 --- a/svx/source/inc/tbxform.hxx +++ b/svx/source/inc/tbxform.hxx @@ -32,7 +32,7 @@ class SvxFmAbsRecWin : public NumericField // for invalidating our content whe losing the focus public: SvxFmAbsRecWin( Window* _pParent, SfxToolBoxControl* _pController ); - ~SvxFmAbsRecWin(); + virtual ~SvxFmAbsRecWin(); virtual void KeyInput( const KeyEvent& rKeyEvt ) SAL_OVERRIDE; virtual void LoseFocus() SAL_OVERRIDE; @@ -50,7 +50,7 @@ private: public: SvxFmConfigWin( sal_uInt16 nId, ResId aRIdWin, ResId aRIdTbx ); - ~SvxFmConfigWin(); + virtual ~SvxFmConfigWin(); void Update(); virtual void PopupModeEnd() SAL_OVERRIDE; @@ -70,7 +70,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFmTbxCtlConfig( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFmTbxCtlConfig() {} + virtual ~SvxFmTbxCtlConfig() {} virtual void Select( sal_uInt16 nModifier ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, @@ -87,7 +87,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFmTbxCtlAbsRec( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFmTbxCtlAbsRec(); + virtual ~SvxFmTbxCtlAbsRec(); virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; @@ -102,7 +102,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFmTbxCtlRecText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFmTbxCtlRecText(); + virtual ~SvxFmTbxCtlRecText(); virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; }; @@ -114,7 +114,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFmTbxCtlRecFromText( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFmTbxCtlRecFromText(); + virtual ~SvxFmTbxCtlRecFromText(); virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; }; @@ -128,7 +128,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFmTbxCtlRecTotal( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFmTbxCtlRecTotal(); + virtual ~SvxFmTbxCtlRecTotal(); virtual Window* CreateItemWindow( Window* pParent ) SAL_OVERRIDE; virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, |