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/workben | |
| 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/workben')
| -rw-r--r-- | svx/workben/pixelctl.cxx | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/svx/workben/pixelctl.cxx b/svx/workben/pixelctl.cxx index 09cb0201c6b1..414448819e8b 100644 --- a/svx/workben/pixelctl.cxx +++ b/svx/workben/pixelctl.cxx @@ -79,11 +79,12 @@ SAL_IMPLEMENT_MAIN() class MyWin : public WorkWindow { - SvxPixelCtl maPixelCtl; + VclPtr<SvxPixelCtl> maPixelCtl; public: MyWin( vcl::Window* pParent, WinBits nWinStyle ); - + virtual ~MyWin() { dispose(); } + virtual void dispose() SAL_OVERRIDE; void MouseMove( const MouseEvent& rMEvt ) SAL_OVERRIDE; void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; void MouseButtonUp( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -106,11 +107,17 @@ void Main() MyWin::MyWin( vcl::Window* pParent, WinBits nWinStyle ) : WorkWindow( pParent, nWinStyle ), - maPixelCtl( this ) + maPixelCtl( new SvxPixelCtl(this) ) { - maPixelCtl.SetPosSizePixel( Point( 10, 10 ), Size( 200, 200 ) ); - maPixelCtl.Show(); + maPixelCtl->SetPosSizePixel( Point( 10, 10 ), Size( 200, 200 ) ); + maPixelCtl->Show(); + +} +void MyWin::dispose() +{ + maPixelCtl.disposeAndClear(); + WorkWindow::dispose(); } bool MyWin::Close() |