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/svx | |
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/svx')
74 files changed, 103 insertions, 103 deletions
diff --git a/include/svx/EnhancedCustomShape2d.hxx b/include/svx/EnhancedCustomShape2d.hxx index 2d7ef9da7ce1..692455af94a6 100644 --- a/include/svx/EnhancedCustomShape2d.hxx +++ b/include/svx/EnhancedCustomShape2d.hxx @@ -185,7 +185,7 @@ class EnhancedCustomShape2d : public SfxItemSet SVX_DLLPUBLIC bool SetHandleControllerPosition( const sal_uInt32 nIndex, const com::sun::star::awt::Point& rPosition ); SVX_DLLPUBLIC EnhancedCustomShape2d( SdrObject* pSdrObjCustomShape ); - SVX_DLLPUBLIC ~EnhancedCustomShape2d(); + SVX_DLLPUBLIC virtual ~EnhancedCustomShape2d(); enum EnumFunc { diff --git a/include/svx/SmartTagCtl.hxx b/include/svx/SmartTagCtl.hxx index 9833516c1726..3a8793f4a647 100644 --- a/include/svx/SmartTagCtl.hxx +++ b/include/svx/SmartTagCtl.hxx @@ -67,7 +67,7 @@ private: public: SvxSmartTagsControl( sal_uInt16 nId, Menu&, SfxBindings& ); - ~SvxSmartTagsControl(); + virtual ~SvxSmartTagsControl(); virtual PopupMenu* GetPopup() const SAL_OVERRIDE; SFX_DECL_MENU_CONTROL(); diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx index 29003e2bc74c..95a7b8669724 100644 --- a/include/svx/bmpmask.hxx +++ b/include/svx/bmpmask.hxx @@ -148,7 +148,7 @@ public: SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); - ~SvxBmpMask(); + virtual ~SvxBmpMask(); void SetColor( const Color& rColor ); void PipetteClicked(); diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx index 813c7e4bebdf..b402e7435757 100644 --- a/include/svx/charmap.hxx +++ b/include/svx/charmap.hxx @@ -45,7 +45,7 @@ class SVX_DLLPUBLIC SvxShowCharSet : public Control public: SvxShowCharSet( Window* pParent, const ResId& rResId ); SvxShowCharSet( Window* pParent ); - ~SvxShowCharSet(); + virtual ~SvxShowCharSet(); void SetFont( const Font& rFont ); diff --git a/include/svx/checklbx.hxx b/include/svx/checklbx.hxx index 08986983d9f4..ba379019d970 100644 --- a/include/svx/checklbx.hxx +++ b/include/svx/checklbx.hxx @@ -47,7 +47,7 @@ public: SvxCheckListBox( Window* pParent, const ResId& rResId ); SvxCheckListBox( Window* pParent, const ResId& rResId, const Image& rNormalStaticImage ); - ~SvxCheckListBox(); + virtual ~SvxCheckListBox(); void InsertEntry ( const OUString& rStr, sal_uLong nPos = TREELIST_APPEND, diff --git a/include/svx/clipboardctl.hxx b/include/svx/clipboardctl.hxx index 813fafb3285e..9faedb483924 100644 --- a/include/svx/clipboardctl.hxx +++ b/include/svx/clipboardctl.hxx @@ -43,7 +43,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxClipBoardControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxClipBoardControl(); + virtual ~SvxClipBoardControl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx index a2b01ef38c83..2a1df616d24e 100644 --- a/include/svx/colrctrl.hxx +++ b/include/svx/colrctrl.hxx @@ -104,7 +104,7 @@ public: SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); - ~SvxColorDockingWindow(); + virtual ~SvxColorDockingWindow(); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; diff --git a/include/svx/contdlg.hxx b/include/svx/contdlg.hxx index 1a8ecd45417c..37d1a942a827 100644 --- a/include/svx/contdlg.hxx +++ b/include/svx/contdlg.hxx @@ -75,7 +75,7 @@ public: SvxContourDlg( SfxBindings *pBindings, SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); - ~SvxContourDlg(); + virtual ~SvxContourDlg(); const Graphic& GetGraphic() const; bool IsGraphicChanged() const; diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 703a75c1fd2a..9d97b3e7cb71 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -73,7 +73,7 @@ public: SvLBoxColorString( SvTreeListEntry*, sal_uInt16 nFlags, const OUString& rStr, const Color& rCol); SvLBoxColorString(); - ~SvLBoxColorString(); + virtual ~SvLBoxColorString(); virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) SAL_OVERRIDE; @@ -113,7 +113,7 @@ protected: public: SvxRedlinTable(SvSimpleTableContainer& rParent, WinBits nBits = WB_BORDER); - ~SvxRedlinTable(); + virtual ~SvxRedlinTable(); // For FilterPage only { void SetFilterDate(bool bFlag=true); @@ -315,7 +315,7 @@ private: public: SvxTPView(Window * pParent); - ~SvxTPView(); + virtual ~SvxTPView(); void InsertWriterHeader(); void InsertCalcHeader(); @@ -375,7 +375,7 @@ private: public: SvxAcceptChgCtr(Window* pParent); - ~SvxAcceptChgCtr(); + virtual ~SvxAcceptChgCtr(); void ShowFilterPage(); void ShowViewPage(); diff --git a/include/svx/dbtoolsclient.hxx b/include/svx/dbtoolsclient.hxx index 5a5542ba2cfe..bae28bfd338c 100644 --- a/include/svx/dbtoolsclient.hxx +++ b/include/svx/dbtoolsclient.hxx @@ -158,7 +158,7 @@ namespace svxform { public: DBToolsObjectFactory(); - ~DBToolsObjectFactory(); + virtual ~DBToolsObjectFactory(); ::std::auto_ptr< ::dbtools::FormattedColumnValue > createFormattedColumnValue( const css::uno::Reference<css::uno::XComponentContext>& _rContext, diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index c102022aa621..3ebb61fb21c2 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -57,7 +57,7 @@ protected: public: Svx3DPreviewControl(Window* pParent, const ResId& rResId); Svx3DPreviewControl(Window* pParent, WinBits nStyle = 0); - ~Svx3DPreviewControl(); + virtual ~Svx3DPreviewControl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -112,7 +112,7 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl public: Svx3DLightControl(Window* pParent, WinBits nStyle = 0); - ~Svx3DLightControl(); + virtual ~Svx3DLightControl(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; @@ -167,7 +167,7 @@ private: public: SvxLightCtl3D( Window* pParent, const ResId& rResId); SvxLightCtl3D( Window* pParent); - ~SvxLightCtl3D(); + virtual ~SvxLightCtl3D(); // react to size changes virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index 2d09ad61f28f..7a74c33ba447 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -182,7 +182,7 @@ protected: public: SvxPixelCtl( Window* pParent, sal_uInt16 nNumber = 8 ); - ~SvxPixelCtl(); + virtual ~SvxPixelCtl(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/include/svx/e3ditem.hxx b/include/svx/e3ditem.hxx index b425583a268f..8340b3d3d603 100644 --- a/include/svx/e3ditem.hxx +++ b/include/svx/e3ditem.hxx @@ -38,7 +38,7 @@ public: SvxB3DVectorItem(); SvxB3DVectorItem( sal_uInt16 nWhich, const basegfx::B3DVector& rVal ); SvxB3DVectorItem( const SvxB3DVectorItem& ); - ~SvxB3DVectorItem(); + virtual ~SvxB3DVectorItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/extrusionbar.hxx b/include/svx/extrusionbar.hxx index 47800a22c16c..fd1effac0781 100644 --- a/include/svx/extrusionbar.hxx +++ b/include/svx/extrusionbar.hxx @@ -42,7 +42,7 @@ public: SFX_DECL_INTERFACE(SVX_INTERFACE_EXTRUSION_BAR) ExtrusionBar(SfxViewShell* pViewShell ); - ~ExtrusionBar(); + virtual ~ExtrusionBar(); static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void getState( SdrView* pSdrView, SfxItemSet& rSet ); diff --git a/include/svx/extrusioncolorcontrol.hxx b/include/svx/extrusioncolorcontrol.hxx index c205a69096f1..668b7109eadc 100644 --- a/include/svx/extrusioncolorcontrol.hxx +++ b/include/svx/extrusioncolorcontrol.hxx @@ -35,7 +35,7 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); ExtrusionColorControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~ExtrusionColorControl(); + virtual ~ExtrusionColorControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; diff --git a/include/svx/fillctrl.hxx b/include/svx/fillctrl.hxx index d42dc13d222b..c409aecfcf2d 100644 --- a/include/svx/fillctrl.hxx +++ b/include/svx/fillctrl.hxx @@ -60,7 +60,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxFillToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFillToolBoxControl(); + virtual ~SvxFillToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -87,7 +87,7 @@ private: virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; public: FillControl( Window* pParent, WinBits nStyle = 0 ); - ~FillControl(); + virtual ~FillControl(); virtual void Resize() SAL_OVERRIDE; }; diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx index 3dfdd8ebe9c9..c88fa556f392 100644 --- a/include/svx/float3d.hxx +++ b/include/svx/float3d.hxx @@ -239,7 +239,7 @@ protected: public: Svx3DWin( SfxBindings* pBindings, SfxChildWindow *pCW, Window* pParent ); - ~Svx3DWin(); + virtual ~Svx3DWin(); void InitColorLB( const SdrModel* pDoc ); bool IsUpdateMode() const { return bUpdate; } diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx index 26241fe26977..4b6c11620035 100644 --- a/include/svx/fmgridcl.hxx +++ b/include/svx/fmgridcl.hxx @@ -42,7 +42,7 @@ protected: public: FmGridHeader( BrowseBox* pParent, WinBits nWinBits = WB_STDHEADERBAR | WB_DRAG ); - ~FmGridHeader(); + virtual ~FmGridHeader(); public: struct AccessControl { friend class FmGridControl; private: AccessControl() { } }; diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index a89bdf445b16..1b548f6b7a6c 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -373,7 +373,7 @@ protected: public: FmXGridPeer(const ::css::uno::Reference< ::css::uno::XComponentContext >&); - ~FmXGridPeer(); + virtual ~FmXGridPeer(); // spaeter Constructor, immer nach dem realen Constructor zu rufen ! void Create(Window* pParent, WinBits nStyle); diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx index acbd8ad5a98c..e011e26d9938 100644 --- a/include/svx/fmpage.hxx +++ b/include/svx/fmpage.hxx @@ -49,7 +49,7 @@ public: FmFormPage(FmFormModel& rModel, bool bMasterPage=false); FmFormPage(const FmFormPage& rPage); - ~FmFormPage(); + virtual ~FmFormPage(); virtual void SetModel(SdrModel* pNewModel) SAL_OVERRIDE; diff --git a/include/svx/fntctl.hxx b/include/svx/fntctl.hxx index 5e2c2bd73eb0..b37575c131eb 100644 --- a/include/svx/fntctl.hxx +++ b/include/svx/fntctl.hxx @@ -44,7 +44,7 @@ private: public: SvxFontMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); - ~SvxFontMenuControl(); + virtual ~SvxFontMenuControl(); virtual PopupMenu* GetPopup() const SAL_OVERRIDE; diff --git a/include/svx/fntszctl.hxx b/include/svx/fntszctl.hxx index b9bfad768d81..2c7562f1cd64 100644 --- a/include/svx/fntszctl.hxx +++ b/include/svx/fntszctl.hxx @@ -44,7 +44,7 @@ protected: public: SvxFontSizeMenuControl( sal_uInt16 nId, Menu&, SfxBindings& ); - ~SvxFontSizeMenuControl(); + virtual ~SvxFontSizeMenuControl(); virtual PopupMenu* GetPopup() const SAL_OVERRIDE; diff --git a/include/svx/fontwork.hxx b/include/svx/fontwork.hxx index c44550ae5d1f..5292cc180f69 100644 --- a/include/svx/fontwork.hxx +++ b/include/svx/fontwork.hxx @@ -160,7 +160,7 @@ class SVX_DLLPUBLIC SvxFontWorkDialog : public SfxDockingWindow SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); - ~SvxFontWorkDialog(); + virtual ~SvxFontWorkDialog(); void SetColorList(const XColorListRef &pTable); void SetActive(bool bActivate = true); diff --git a/include/svx/fontworkbar.hxx b/include/svx/fontworkbar.hxx index 9efd7dc76dab..2ca04ca7a3be 100644 --- a/include/svx/fontworkbar.hxx +++ b/include/svx/fontworkbar.hxx @@ -42,7 +42,7 @@ public: SFX_DECL_INTERFACE(SVX_INTERFACE_FONTWORK_BAR) FontworkBar(SfxViewShell* pViewShell ); - ~FontworkBar(); + virtual ~FontworkBar(); static void execute( SdrView* pSdrView, SfxRequest& rReq, SfxBindings& rBindings ); static void getState( SdrView* pSdrView, SfxItemSet& rSet ); diff --git a/include/svx/fontworkgallery.hxx b/include/svx/fontworkgallery.hxx index ba4a2f2e096c..a635aed3e6ce 100644 --- a/include/svx/fontworkgallery.hxx +++ b/include/svx/fontworkgallery.hxx @@ -55,7 +55,7 @@ class SVX_DLLPUBLIC FontWorkShapeTypeControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); FontWorkShapeTypeControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~FontWorkShapeTypeControl(); + virtual ~FontWorkShapeTypeControl(); virtual void Select( sal_Bool bMod1 = sal_False ); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; @@ -100,7 +100,7 @@ class SVX_DLLPUBLIC FontWorkGalleryDialog : public ModalDialog public: FontWorkGalleryDialog( SdrView* pView, Window* pParent, sal_uInt16 nSID ); - ~FontWorkGalleryDialog(); + virtual ~FontWorkGalleryDialog(); // SJ: if the SdrObject** is set, the SdrObject is not inserted into the page when executing the dialog void SetSdrObjectRef( SdrObject**, SdrModel* pModel ); diff --git a/include/svx/formatpaintbrushctrl.hxx b/include/svx/formatpaintbrushctrl.hxx index 38c6dba622ce..5e7bc7c16669 100644 --- a/include/svx/formatpaintbrushctrl.hxx +++ b/include/svx/formatpaintbrushctrl.hxx @@ -42,7 +42,7 @@ class SVX_DLLPUBLIC FormatPaintBrushToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); FormatPaintBrushToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~FormatPaintBrushToolBoxControl(); + virtual ~FormatPaintBrushToolBoxControl(); virtual void DoubleClick() SAL_OVERRIDE; virtual void Click() SAL_OVERRIDE; diff --git a/include/svx/galbrws.hxx b/include/svx/galbrws.hxx index f4753f6614d3..169db3dbe52e 100644 --- a/include/svx/galbrws.hxx +++ b/include/svx/galbrws.hxx @@ -30,7 +30,7 @@ class SVX_DLLPUBLIC GalleryChildWindow : public SfxChildWindow { public: GalleryChildWindow( Window*, sal_uInt16, SfxBindings*, SfxChildWinInfo* ); - ~GalleryChildWindow(); + virtual ~GalleryChildWindow(); SFX_DECL_CHILDWINDOW_WITHID( GalleryChildWindow ); }; @@ -72,7 +72,7 @@ public: GalleryBrowser( SfxBindings* pBindings, SfxChildWindow* pCW, Window* pParent, const ResId& rResId ); - ~GalleryBrowser(); + virtual ~GalleryBrowser(); sal_Bool KeyInput( const KeyEvent& rKEvt, Window* pWindow ); }; diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx index 5b5fff429ef5..752fdf38cc6c 100644 --- a/include/svx/galctrl.hxx +++ b/include/svx/galctrl.hxx @@ -109,7 +109,7 @@ private: public: GalleryIconView( GalleryBrowser2* pParent, GalleryTheme* pTheme ); - ~GalleryIconView(); + virtual ~GalleryIconView(); }; class GalleryListView : public BrowseBox @@ -144,7 +144,7 @@ private: public: GalleryListView( GalleryBrowser2* pParent, GalleryTheme* pTheme ); - ~GalleryListView(); + virtual ~GalleryListView(); void SetSelectHdl( const Link& rSelectHdl ) { maSelectHdl = rSelectHdl; } diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx index f60ee4089604..1a496dc45709 100644 --- a/include/svx/gallery1.hxx +++ b/include/svx/gallery1.hxx @@ -121,7 +121,7 @@ private: void ImplDeleteCachedTheme( GalleryTheme* pTheme ); SVX_DLLPUBLIC Gallery( const OUString& rMultiPath ); - SVX_DLLPUBLIC ~Gallery(); + SVX_DLLPUBLIC virtual ~Gallery(); public: diff --git a/include/svx/galleryitem.hxx b/include/svx/galleryitem.hxx index 1a252b18b693..9d9b48ce5f47 100644 --- a/include/svx/galleryitem.hxx +++ b/include/svx/galleryitem.hxx @@ -49,7 +49,7 @@ public: SvxGalleryItem(); SvxGalleryItem( const SvxGalleryItem& ); - ~SvxGalleryItem(); + virtual ~SvxGalleryItem(); sal_Int8 GetType() const { return m_nType; } const rtl::OUString GetURL() const { return m_aURL; } diff --git a/include/svx/galmisc.hxx b/include/svx/galmisc.hxx index f8f86ed0c62b..8c19c4add446 100644 --- a/include/svx/galmisc.hxx +++ b/include/svx/galmisc.hxx @@ -170,7 +170,7 @@ private: protected: GalleryTransferable( GalleryTheme* pTheme, sal_uIntPtr nObjectPos, bool bLazy ); - ~GalleryTransferable(); + virtual ~GalleryTransferable(); void InitData( bool bLazy ); diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index a842b79f2da3..548aca7d223f 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -129,7 +129,7 @@ private: GalleryTheme(); GalleryTheme( Gallery* pGallery, GalleryThemeEntry* pThemeEntry ); - ~GalleryTheme(); + virtual ~GalleryTheme(); public: diff --git a/include/svx/grafctrl.hxx b/include/svx/grafctrl.hxx index 98b8807ef140..a5412f2b5985 100644 --- a/include/svx/grafctrl.hxx +++ b/include/svx/grafctrl.hxx @@ -50,7 +50,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxGrafFilterToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxGrafFilterToolBoxControl(); + virtual ~SvxGrafFilterToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; @@ -65,7 +65,7 @@ class SvxGrafToolBoxControl : public SfxToolBoxControl { public: SvxGrafToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxGrafToolBoxControl(); + virtual ~SvxGrafToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; @@ -157,7 +157,7 @@ class SVX_DLLPUBLIC SvxGrafModeToolBoxControl : public SfxToolBoxControl, public public: SFX_DECL_TOOLBOX_CONTROL(); SvxGrafModeToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxGrafModeToolBoxControl(); + virtual ~SvxGrafModeToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx index 738d0eada4b9..495ba9ff8d71 100644 --- a/include/svx/graphctl.hxx +++ b/include/svx/graphctl.hxx @@ -82,7 +82,7 @@ public: GraphCtrl( Window* pParent, const ResId& rResId ); GraphCtrl( Window* pParent, WinBits nStyle ); - ~GraphCtrl(); + virtual ~GraphCtrl(); void SetWinStyle( WinBits nWinBits ); WinBits GetWinStyle() const { return nWinStyle; } diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx index 18a4e2ba804a..d42cfa3fdf95 100644 --- a/include/svx/gridctrl.hxx +++ b/include/svx/gridctrl.hxx @@ -74,7 +74,7 @@ public: DbGridRow(CursorWrapper* pCur, bool bPaintCursor); void SetState(CursorWrapper* pCur, bool bPaintCursor); - ~DbGridRow(); + virtual ~DbGridRow(); bool HasField(sal_uInt32 nPos) const { return nPos < m_aVariants.size(); } const ::svxform::DataColumn& GetField(sal_uInt32 nPos) const { return *m_aVariants[ nPos ]; } diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index d581593a641f..7345c1262676 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -119,7 +119,7 @@ public: SvxIMapDlg( SfxBindings *pBindings, SfxChildWindow *pCW, Window* pParent, const ResId& rResId ); - ~SvxIMapDlg(); + virtual ~SvxIMapDlg(); void SetExecState( bool bEnable ); diff --git a/include/svx/insctrl.hxx b/include/svx/insctrl.hxx index 4344072a1716..d9ec00dca797 100644 --- a/include/svx/insctrl.hxx +++ b/include/svx/insctrl.hxx @@ -35,7 +35,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxInsertStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - ~SvxInsertStatusBarControl(); + virtual ~SvxInsertStatusBarControl(); private: bool bInsert; diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx index 9084a62166de..8dc402025340 100644 --- a/include/svx/itemwin.hxx +++ b/include/svx/itemwin.hxx @@ -49,7 +49,7 @@ public: SvxLineBox( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); - ~SvxLineBox(); + virtual ~SvxLineBox(); void FillControl(); @@ -81,7 +81,7 @@ public: const OUString& rCommand, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); - ~SvxColorBox(); + virtual ~SvxColorBox(); void Update( const XLineColorItem* pItem ); @@ -120,7 +120,7 @@ public: SvxMetricField( Window* pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, WinBits nBits = WB_BORDER | WB_SPIN | WB_REPEAT ); - ~SvxMetricField(); + virtual ~SvxMetricField(); void Update( const XLineWidthItem* pItem ); void SetCoreUnit( SfxMapUnit eUnit ); @@ -133,7 +133,7 @@ class SvxFillTypeBox : public FillTypeLB { public: SvxFillTypeBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); - ~SvxFillTypeBox(); + virtual ~SvxFillTypeBox(); void Selected() { bSelect = true; } bool IsRelease() { return bRelease;} @@ -156,7 +156,7 @@ class SvxFillAttrBox : public FillAttrLB { public: SvxFillAttrBox( Window* pParent, WinBits nBits = WB_BORDER | WB_DROPDOWN | WB_AUTOHSCROLL ); - ~SvxFillAttrBox(); + virtual ~SvxFillAttrBox(); bool IsRelease() { return bRelease;} diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index de5289b0b7b4..8885064d01fa 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -69,7 +69,7 @@ private: public: SvxLanguageBox(Window* pParent, WinBits nBits, bool bCheck = false); - ~SvxLanguageBox(); + virtual ~SvxLanguageBox(); void SetLanguageList( sal_Int16 nLangList, bool bHasLangNone, bool bLangNoneIsLangAll = false, diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx index 1477e5a06020..9652aea57322 100644 --- a/include/svx/layctrl.hxx +++ b/include/svx/layctrl.hxx @@ -40,7 +40,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxTableToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxTableToolBoxControl(); + virtual ~SvxTableToolBoxControl(); }; // class SvxColumnsToolBoxControl ---------------------------------------- @@ -56,7 +56,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxColumnsToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxColumnsToolBoxControl(); + virtual ~SvxColumnsToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, diff --git a/include/svx/linectrl.hxx b/include/svx/linectrl.hxx index 114accbba131..1419b653a814 100644 --- a/include/svx/linectrl.hxx +++ b/include/svx/linectrl.hxx @@ -48,7 +48,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxLineStyleToolBoxControl(); + virtual ~SvxLineStyleToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -66,7 +66,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineWidthToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxLineWidthToolBoxControl(); + virtual ~SvxLineWidthToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -83,7 +83,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxLineColorToolBoxControl(); + virtual ~SvxLineColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -135,7 +135,7 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& rFrame, Window* pParentWindow, const OUString& rWndTitle ); - ~SvxLineEndWindow(); + virtual ~SvxLineEndWindow(); void StartSelection(); @@ -153,7 +153,7 @@ class SVX_DLLPUBLIC SvxLineEndToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SvxLineEndToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxLineEndToolBoxControl(); + virtual ~SvxLineEndToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; diff --git a/include/svx/measctrl.hxx b/include/svx/measctrl.hxx index f9efa90b3f49..2c037e2320a2 100644 --- a/include/svx/measctrl.hxx +++ b/include/svx/measctrl.hxx @@ -42,7 +42,7 @@ private: public: SvxXMeasurePreview(Window* pParent, WinBits nStyle); - ~SvxXMeasurePreview(); + virtual ~SvxXMeasurePreview(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void Resize() SAL_OVERRIDE; diff --git a/include/svx/numinf.hxx b/include/svx/numinf.hxx index f0db983277cd..9a9a30f36583 100644 --- a/include/svx/numinf.hxx +++ b/include/svx/numinf.hxx @@ -47,7 +47,7 @@ public: SvxNumberInfoItem( SvNumberFormatter* pNumFormatter, const double& rVal, const OUString& rValueStr, const sal_uInt16 nId ); SvxNumberInfoItem( const SvxNumberInfoItem& ); - ~SvxNumberInfoItem(); + virtual ~SvxNumberInfoItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE; diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx index 0bd5efb9f559..ff64b4850175 100644 --- a/include/svx/numvset.hxx +++ b/include/svx/numvset.hxx @@ -68,7 +68,7 @@ class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet public: SvxNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); void init(sal_uInt16 nType); - ~SvxNumValueSet(); + virtual ~SvxNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -106,7 +106,7 @@ class SVX_DLLPUBLIC SvxBmpNumValueSet : public SvxNumValueSet public: SvxBmpNumValueSet(Window* pParent, WinBits nWinBits = WB_TABSTOP); - ~SvxBmpNumValueSet(); + virtual ~SvxBmpNumValueSet(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/pagectrl.hxx b/include/svx/pagectrl.hxx index ebec43cf2d75..e91281803158 100644 --- a/include/svx/pagectrl.hxx +++ b/include/svx/pagectrl.hxx @@ -79,7 +79,7 @@ protected: public: SvxPageWindow( Window* pParent ); - ~SvxPageWindow(); + virtual ~SvxPageWindow(); void SetWidth( long nW ) { aSize.Width() = nW; } void SetHeight( long nH ) { aSize.Height() = nH; } diff --git a/include/svx/passwd.hxx b/include/svx/passwd.hxx index 6c74fa237a03..3b2f95800d5b 100644 --- a/include/svx/passwd.hxx +++ b/include/svx/passwd.hxx @@ -52,7 +52,7 @@ private: public: SvxPasswordDialog( Window* pParent, bool bAllowEmptyPasswords = false, bool bDisableOldPassword = false ); - ~SvxPasswordDialog(); + virtual ~SvxPasswordDialog(); OUString GetOldPassword() const { return m_pOldPasswdED->GetText(); } OUString GetNewPassword() const { return m_pNewPasswdED->GetText(); } diff --git a/include/svx/prtqry.hxx b/include/svx/prtqry.hxx index fc65fef8e9c1..3a1446610639 100644 --- a/include/svx/prtqry.hxx +++ b/include/svx/prtqry.hxx @@ -26,7 +26,7 @@ class SVX_DLLPUBLIC SvxPrtQryBox : public MessBox { public: SvxPrtQryBox(Window* pParent); - ~SvxPrtQryBox(); + virtual ~SvxPrtQryBox(); }; #endif diff --git a/include/svx/pszctrl.hxx b/include/svx/pszctrl.hxx index 827a06a882c5..92c390687dc7 100644 --- a/include/svx/pszctrl.hxx +++ b/include/svx/pszctrl.hxx @@ -38,7 +38,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxPosSizeStatusBarControl( sal_uInt16 nSlotId, sal_uInt16 nId, StatusBar& rStb ); - ~SvxPosSizeStatusBarControl(); + virtual ~SvxPosSizeStatusBarControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; diff --git a/include/svx/rotmodit.hxx b/include/svx/rotmodit.hxx index 69082b8b247a..938a9f2e3288 100644 --- a/include/svx/rotmodit.hxx +++ b/include/svx/rotmodit.hxx @@ -41,7 +41,7 @@ public: SvxRotateModeItem( SvxRotateMode eMode=SVX_ROTATE_MODE_STANDARD, sal_uInt16 nWhich=0); SvxRotateModeItem( const SvxRotateModeItem& rItem ); - ~SvxRotateModeItem(); + virtual ~SvxRotateModeItem(); virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE; virtual OUString GetValueText( sal_uInt16 nVal ) const; diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx index b4c6515eecdc..fee6b3c855b5 100644 --- a/include/svx/ruler.hxx +++ b/include/svx/ruler.hxx @@ -253,7 +253,7 @@ public: SvxRuler(Window* pParent, Window *pEditWin, sal_uInt16 nRulerFlags, SfxBindings &rBindings, WinBits nWinStyle = WB_STDRULER); - ~SvxRuler(); + virtual ~SvxRuler(); void SetMinFrameSize(long lSize); long GetMinFrameSize() const ; diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 8f689d190257..f1b72681a640 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -180,7 +180,7 @@ public: SvxColumnItem(sal_uInt16 nAct = 0); SvxColumnItem(sal_uInt16 nActCol, sal_uInt16 nLeft, sal_uInt16 nRight = 0); // Table with borders SvxColumnItem(const SvxColumnItem& aItem); - ~SvxColumnItem(); + virtual ~SvxColumnItem(); const SvxColumnItem &operator=(const SvxColumnItem &); diff --git a/include/svx/sdasaitm.hxx b/include/svx/sdasaitm.hxx index 0ea1eaba7ded..a1b8be1d10b1 100644 --- a/include/svx/sdasaitm.hxx +++ b/include/svx/sdasaitm.hxx @@ -46,7 +46,7 @@ class SdrCustomShapeAdjustmentItem : public SfxPoolItem TYPEINFO_OVERRIDE(); SVX_DLLPUBLIC SdrCustomShapeAdjustmentItem(); SdrCustomShapeAdjustmentItem( SvStream& rIn, sal_uInt16 nVersion ); - SVX_DLLPUBLIC ~SdrCustomShapeAdjustmentItem(); + SVX_DLLPUBLIC virtual ~SdrCustomShapeAdjustmentItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 992a0f397238..3fd8bd3cb4f6 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -76,7 +76,7 @@ private: SdrCustomShapeGeometryItem(); SdrCustomShapeGeometryItem( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& ); SdrCustomShapeGeometryItem( SvStream& rIn, sal_uInt16 nVersion ); - ~SdrCustomShapeGeometryItem(); + virtual ~SdrCustomShapeGeometryItem(); virtual bool operator==( const SfxPoolItem& ) const SAL_OVERRIDE; virtual SfxItemPresentation GetPresentation(SfxItemPresentation ePresentation, diff --git a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx index 23f9daa1adaf..a1ade08cd65f 100644 --- a/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx +++ b/include/svx/sdr/contact/viewobjectcontactofunocontrol.hxx @@ -89,7 +89,7 @@ namespace sdr { namespace contact { void onControlChangedOrModified( ImplAccess ) { impl_onControlChangedOrModified(); } protected: - ~ViewObjectContactOfUnoControl(); + virtual ~ViewObjectContactOfUnoControl(); // support for Primitive2D virtual drawinglayer::primitive2d::Primitive2DSequence createPrimitive2DSequence(const DisplayInfo& rDisplayInfo) const SAL_OVERRIDE; @@ -112,7 +112,7 @@ namespace sdr { namespace contact { { public: UnoControlPrintOrPreviewContact( ObjectContactOfPageView& _rObjectContact, ViewContactOfUnoControl& _rViewContact ); - ~UnoControlPrintOrPreviewContact(); + virtual ~UnoControlPrintOrPreviewContact(); private: UnoControlPrintOrPreviewContact(); // never implemented diff --git a/include/svx/sidebar/ValueSetWithTextControl.hxx b/include/svx/sidebar/ValueSetWithTextControl.hxx index 3b80efd4e8bc..5542e2bac2cb 100644 --- a/include/svx/sidebar/ValueSetWithTextControl.hxx +++ b/include/svx/sidebar/ValueSetWithTextControl.hxx @@ -130,7 +130,7 @@ class SVX_DLLPUBLIC SvxNumValueSet2 : public ValueSet public: SvxNumValueSet2( Window* pParent, const ResId& rResId); - ~SvxNumValueSet2(); + virtual ~SvxNumValueSet2(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; @@ -147,7 +147,7 @@ class SVX_DLLPUBLIC SvxNumValueSet3 : public ValueSet { public: SvxNumValueSet3( Window* pParent, const ResId& rResId); - ~SvxNumValueSet3(); + virtual ~SvxNumValueSet3(); virtual void UserDraw( const UserDrawEvent& rUDEvt ) SAL_OVERRIDE; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 606bbe40db93..56cd87b224ee 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -94,7 +94,7 @@ public: SvxSearchDialogWrapper( Window*pParent, sal_uInt16 nId, SfxBindings* pBindings, SfxChildWinInfo* pInfo ); - ~SvxSearchDialogWrapper (); + virtual ~SvxSearchDialogWrapper (); SvxSearchDialog *getDialog (); static void SetSearchLabel(const SearchLabel& rSL); SFX_DECL_CHILDWINDOW_WITHID(SvxSearchDialogWrapper); @@ -119,7 +119,7 @@ friend class SvxJSearchOptionsDialog; public: SvxSearchDialog( Window* pParent, SfxChildWindow* pChildWin, SfxBindings& rBind ); - ~SvxSearchDialog(); + virtual ~SvxSearchDialog(); virtual bool Close() SAL_OVERRIDE; diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx index 7b6e1202a52e..8a53be59d32b 100644 --- a/include/svx/stddlg.hxx +++ b/include/svx/stddlg.hxx @@ -29,7 +29,7 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog public: SvxStandardDialog( Window* pParent, const ResId& rResId ); SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); - ~SvxStandardDialog(); + virtual ~SvxStandardDialog(); short Execute() SAL_OVERRIDE; diff --git a/include/svx/subtoolboxcontrol.hxx b/include/svx/subtoolboxcontrol.hxx index 0f3bf6cbbf70..e7f2904a456f 100644 --- a/include/svx/subtoolboxcontrol.hxx +++ b/include/svx/subtoolboxcontrol.hxx @@ -33,7 +33,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxSubToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxSubToolBoxControl(); + virtual ~SvxSubToolBoxControl(); virtual SfxPopupWindowType GetPopupWindowType() const SAL_OVERRIDE; virtual SfxPopupWindow* CreatePopupWindow() SAL_OVERRIDE; diff --git a/include/svx/svdopage.hxx b/include/svx/svdopage.hxx index 48a9235afbf2..74168ebc2274 100644 --- a/include/svx/svdopage.hxx +++ b/include/svx/svdopage.hxx @@ -45,7 +45,7 @@ public: TYPEINFO_OVERRIDE(); SdrPageObj(SdrPage* pNewPage = 0L); SdrPageObj(const Rectangle& rRect, SdrPage* pNewPage = 0L); - ~SdrPageObj(); + virtual ~SdrPageObj(); // #111111# SdrPage* GetReferencedPage() const; diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index a790b4283685..b5de0c81f162 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -74,7 +74,7 @@ protected: public: SvxSwFrameExample(Window* pParent, WinBits nStyle); - ~SvxSwFrameExample(); + virtual ~SvxSwFrameExample(); inline void SetWrap(sal_uInt16 nW) { nWrap = nW; } diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx index 4ed93da0036d..8254825a5ca5 100644 --- a/include/svx/tbcontrl.hxx +++ b/include/svx/tbcontrl.hxx @@ -174,7 +174,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxStyleToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxStyleToolBoxControl(); + virtual ~SvxStyleToolBoxControl(); virtual Window* CreateItemWindow( Window *pParent ) SAL_OVERRIDE; @@ -247,7 +247,7 @@ class SVX_DLLPUBLIC SvxFontColorToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SvxFontColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFontColorToolBoxControl(); + virtual ~SvxFontColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -275,7 +275,7 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl public: SFX_DECL_TOOLBOX_CONTROL(); SvxColorExtToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxColorExtToolBoxControl(); + virtual ~SvxColorExtToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -298,7 +298,7 @@ class SVX_DLLPUBLIC SvxColorToolBoxControl : public SfxToolBoxControl public: SvxColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxColorToolBoxControl(); + virtual ~SvxColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -362,7 +362,7 @@ public: SvxFrameLineColorToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxFrameLineColorToolBoxControl(); + virtual ~SvxFrameLineColorToolBoxControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -378,7 +378,7 @@ private: public: SFX_DECL_TOOLBOX_CONTROL(); SvxSimpleUndoRedoController( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxSimpleUndoRedoController(); + virtual ~SvxSimpleUndoRedoController(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx index f56f8e68fc07..00a98d1eaf80 100644 --- a/include/svx/tbxalign.hxx +++ b/include/svx/tbxalign.hxx @@ -37,7 +37,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxTbxCtlAlign( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxTbxCtlAlign() {} + virtual ~SvxTbxCtlAlign() {} private: OUString m_aSubTbName; OUString m_aSubTbResName; diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx index 99c129b74378..2be7c75b8023 100644 --- a/include/svx/tbxctl.hxx +++ b/include/svx/tbxctl.hxx @@ -40,7 +40,7 @@ protected: public: SvxTbxCtlDraw( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxTbxCtlDraw() {} + virtual ~SvxTbxCtlDraw() {} SFX_DECL_TOOLBOX_CONTROL(); diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx index e7b6a46c29bc..5aee5c45b48f 100644 --- a/include/svx/tbxcustomshapes.hxx +++ b/include/svx/tbxcustomshapes.hxx @@ -41,7 +41,7 @@ public: SFX_DECL_TOOLBOX_CONTROL(); SvxTbxCtlCustomShapes( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxTbxCtlCustomShapes() {} + virtual ~SvxTbxCtlCustomShapes() {} //interface XSubToolbarController: virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/svx/tbxdraw.hxx b/include/svx/tbxdraw.hxx index 8b7ce59a6e6e..37862f672a91 100644 --- a/include/svx/tbxdraw.hxx +++ b/include/svx/tbxdraw.hxx @@ -47,7 +47,7 @@ public: WindowAlign eAlign, ResId aRIdWin, ResId aRIdTbx ); - ~SvxPopupWindowTbxMgr(); + virtual ~SvxPopupWindowTbxMgr(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) SAL_OVERRIDE; diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx index a63ef943823b..2e88a2bb1aee 100644 --- a/include/svx/txencbox.hxx +++ b/include/svx/txencbox.hxx @@ -34,7 +34,7 @@ private: public: SvxTextEncodingBox( Window* pParent, WinBits nBits ); - ~SvxTextEncodingBox(); + virtual ~SvxTextEncodingBox(); /** Fill with all known encodings but exclude those matching one or more given flags as defined in rtl/tencinfo.h diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx index d2bb5863f828..b49e5e81ce8a 100644 --- a/include/svx/verttexttbxctrl.hxx +++ b/include/svx/verttexttbxctrl.hxx @@ -30,7 +30,7 @@ class SvxVertCTLTextTbxCtrl : public SfxToolBoxControl bool bCheckVertical; //determines whether vertical mode or CTL mode has to be checked public: SvxVertCTLTextTbxCtrl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx ); - ~SvxVertCTLTextTbxCtrl(); + virtual ~SvxVertCTLTextTbxCtrl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; diff --git a/include/svx/viewlayoutitem.hxx b/include/svx/viewlayoutitem.hxx index 4ce2858c8b23..7bf8a84e8b55 100644 --- a/include/svx/viewlayoutitem.hxx +++ b/include/svx/viewlayoutitem.hxx @@ -34,7 +34,7 @@ public: SvxViewLayoutItem( sal_uInt16 nColumns = 0, bool bBookMode = false, sal_uInt16 nWhich = SID_ATTR_VIEWLAYOUT ); SvxViewLayoutItem( const SvxViewLayoutItem& ); - ~SvxViewLayoutItem(); + virtual ~SvxViewLayoutItem(); void SetBookMode( bool bNew ) {mbBookMode = bNew; } bool IsBookMode() const {return mbBookMode; } diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index 7ea554d39585..3a90619509a0 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -50,7 +50,7 @@ public: const OUString& rName = OUString()); NameOrIndex(sal_uInt16 nWhich, SvStream& rIn); NameOrIndex(const NameOrIndex& rNameOrIndex); - ~NameOrIndex() {}; + virtual ~NameOrIndex() {}; virtual bool operator==(const SfxPoolItem& rItem) const SAL_OVERRIDE; virtual SfxPoolItem* Clone(SfxItemPool* pPool = 0) const SAL_OVERRIDE; diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index 9b6c885f26b0..61ed78d6cba3 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -100,7 +100,7 @@ private: protected: SvXMLEmbeddedObjectHelper(); - ~SvXMLEmbeddedObjectHelper(); + virtual ~SvXMLEmbeddedObjectHelper(); void Init( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, ::comphelper::IEmbeddedHelper& rDocPersist, SvXMLEmbeddedObjectHelperMode eCreateMode ); diff --git a/include/svx/xmlgrhlp.hxx b/include/svx/xmlgrhlp.hxx index 7a9f7e29eed6..3f620de568ce 100644 --- a/include/svx/xmlgrhlp.hxx +++ b/include/svx/xmlgrhlp.hxx @@ -84,7 +84,7 @@ private: protected: SvXMLGraphicHelper(); - ~SvXMLGraphicHelper(); + virtual ~SvXMLGraphicHelper(); void Init( const ::com::sun::star::uno::Reference < ::com::sun::star::embed::XStorage >& xXMLStorage, SvXMLGraphicHelperMode eCreateMode, bool bDirect ); diff --git a/include/svx/xmlsecctrl.hxx b/include/svx/xmlsecctrl.hxx index 59016e62f403..4e6902f2d2cc 100644 --- a/include/svx/xmlsecctrl.hxx +++ b/include/svx/xmlsecctrl.hxx @@ -39,7 +39,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); XmlSecStatusBarControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); - ~XmlSecStatusBarControl(); + virtual ~XmlSecStatusBarControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; diff --git a/include/svx/zoomsliderctrl.hxx b/include/svx/zoomsliderctrl.hxx index 2a39cde88a2a..a15121782c2c 100644 --- a/include/svx/zoomsliderctrl.hxx +++ b/include/svx/zoomsliderctrl.hxx @@ -40,7 +40,7 @@ public: SFX_DECL_STATUSBAR_CONTROL(); SvxZoomSliderControl( sal_uInt16 _nSlotId, sal_uInt16 _nId, StatusBar& _rStb ); - ~SvxZoomSliderControl(); + virtual ~SvxZoomSliderControl(); virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; virtual void Paint( const UserDrawEvent& rEvt ) SAL_OVERRIDE; diff --git a/include/svx/zoomslideritem.hxx b/include/svx/zoomslideritem.hxx index 4f49b64c1522..0cb37424ef19 100644 --- a/include/svx/zoomslideritem.hxx +++ b/include/svx/zoomslideritem.hxx @@ -37,7 +37,7 @@ public: SvxZoomSliderItem( sal_uInt16 nCurrentZoom = 100, sal_uInt16 nMinZoom = 20, sal_uInt16 nMaxZoom = 600, sal_uInt16 nWhich = SID_ATTR_ZOOMSLIDER ); SvxZoomSliderItem( const SvxZoomSliderItem& ); - ~SvxZoomSliderItem(); + virtual ~SvxZoomSliderItem(); void AddSnappingPoint( sal_Int32 nNew ); const com::sun::star::uno::Sequence < sal_Int32 >& GetSnappingPoints() const; |