diff options
author | Noel Grandin <noel@peralex.com> | 2015-01-13 14:52:40 +0200 |
---|---|---|
committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-09 21:21:05 +0100 |
commit | ed2cea3e5087b90cd3686d8fd9da7e74981c8da6 (patch) | |
tree | acf3852fcd4550285a8ebc014ac5134ff045035a /svx/source/dialog/_contdlg.cxx | |
parent | 232eec872bdaf1dd6d87df97baa3b9ad432a7acd (diff) |
vcl: VclPtr conversion in svx.
Change-Id: I3a1000baa049b11728c46efbc2f0af0d8f34cf2b
Conflicts:
include/svx/charmap.hxx
include/svx/float3d.hxx
include/svx/fontwork.hxx
include/svx/galctrl.hxx
svx/inc/svdibrow.hxx
svx/source/dialog/dlgctl3d.cxx
svx/source/dialog/fontwork.cxx
svx/source/engine3d/float3d.cxx
svx/source/fmcomp/gridctrl.cxx
svx/source/gallery2/galbrws1.cxx
svx/source/inc/docrecovery.hxx
Diffstat (limited to 'svx/source/dialog/_contdlg.cxx')
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index c94ed569173f..25016d30e241 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -86,10 +86,6 @@ SvxContourDlg::SvxContourDlg(SfxBindings* _pBindings, SfxChildWindow* pCW, { } -SvxContourDlg::~SvxContourDlg() -{ -} - tools::PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic, const Rectangle* pRect, const sal_uIntPtr nFlags ) @@ -282,9 +278,15 @@ SvxSuperContourDlg::SvxSuperContourDlg(SfxBindings *_pBindings, SfxChildWindow * SvxSuperContourDlg::~SvxSuperContourDlg() { + dispose(); +} + +void SvxSuperContourDlg::dispose() +{ SvtMiscOptions aMiscOptions; aMiscOptions.RemoveListenerLink( LINK(this, SvxSuperContourDlg, MiscHdl) ); delete m_pContourWnd; + SvxContourDlg::dispose(); } bool SvxSuperContourDlg::Close() |