From ed2cea3e5087b90cd3686d8fd9da7e74981c8da6 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Tue, 13 Jan 2015 14:52:40 +0200
Subject: 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
---
 svx/source/tbxctrls/fillctrl.cxx | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'svx/source/tbxctrls/fillctrl.cxx')

diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index c889e98f6fbf..0ce6f92d7bce 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -561,9 +561,15 @@ FillControl::FillControl(vcl::Window* pParent,WinBits nStyle)
 }
 
 FillControl::~FillControl()
+{
+    dispose();
+}
+
+void FillControl::dispose()
 {
     delete mpLbFillType;
     delete mpLbFillAttr;
+    vcl::Window::dispose();
 }
 
 void FillControl::InitializeFillStyleAccordingToGivenFillType(drawing::FillStyle aFillStyle)
-- 
cgit