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 /include/svx/dlgctl3d.hxx | |
| 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 'include/svx/dlgctl3d.hxx')
| -rw-r--r-- | include/svx/dlgctl3d.hxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index a17e9a81ab4a..41c1b9c9a695 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -51,6 +51,7 @@ protected: public: Svx3DPreviewControl(vcl::Window* pParent, WinBits nStyle = 0); virtual ~Svx3DPreviewControl(); + virtual void dispose() SAL_OVERRIDE; virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; @@ -104,7 +105,6 @@ class SVX_DLLPUBLIC Svx3DLightControl : public Svx3DPreviewControl public: Svx3DLightControl(vcl::Window* pParent, WinBits nStyle = 0); - virtual ~Svx3DLightControl(); virtual void Paint(const Rectangle& rRect) SAL_OVERRIDE; virtual void MouseButtonDown(const MouseEvent& rMEvt) SAL_OVERRIDE; @@ -145,18 +145,19 @@ class SVX_DLLPUBLIC SvxLightCtl3D : public Control { private: // local controls - Svx3DLightControl maLightControl; - ScrollBar maHorScroller; - ScrollBar maVerScroller; - PushButton maSwitcher; + VclPtr<Svx3DLightControl> maLightControl; + VclPtr<ScrollBar> maHorScroller; + VclPtr<ScrollBar> maVerScroller; + VclPtr<PushButton> maSwitcher; // callback for interactive changes - Link maUserInteractiveChangeCallback; - Link maUserSelectionChangeCallback; + Link maUserInteractiveChangeCallback; + Link maUserSelectionChangeCallback; public: SvxLightCtl3D(vcl::Window* pParent); virtual ~SvxLightCtl3D(); + virtual void dispose() SAL_OVERRIDE; // react to size changes virtual void Resize() SAL_OVERRIDE; @@ -166,7 +167,7 @@ public: void CheckSelection(); // bring further settings to the outside world - Svx3DLightControl& GetSvx3DLightControl() { return maLightControl; } + Svx3DLightControl& GetSvx3DLightControl() { return *maLightControl.get(); } // register user callback void SetUserInteractiveChangeCallback(Link aNew) { maUserInteractiveChangeCallback = aNew; } |