From 584e6c6051d8a8371941d61603672891a8aa3013 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 26 Jan 2015 13:23:37 +0200
Subject: vcl: VclPtr conversion in sw

Change-Id: Ie084a4b14f8371ff81fe6a95e73660e38cd376f2
---
 sw/source/uibase/sidebar/PageMarginControl.hxx | 27 +++++++++++++-------------
 1 file changed, 14 insertions(+), 13 deletions(-)

(limited to 'sw/source/uibase/sidebar/PageMarginControl.hxx')

diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 908b1c6ba180..8ab4c1b34917 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -60,25 +60,26 @@ public:
         const bool bLandscape,
         const FieldUnit eFUnit,
         const SfxMapUnit eUnit );
-    virtual ~PageMarginControl(void);
+    virtual ~PageMarginControl();
+    virtual void dispose() SAL_OVERRIDE;
 
 private:
     ::svx::sidebar::ValueSetWithTextControl* mpMarginValueSet;
 
-    FixedText maCustom;
-    FixedText maLeft;
-    FixedText maInner;
-    MetricField maLeftMarginEdit;
-    FixedText maRight;
-    FixedText maOuter;
-    MetricField maRightMarginEdit;
-    FixedText maTop;
-    MetricField maTopMarginEdit;
-    FixedText maBottom;
-    MetricField maBottomMarginEdit;
+    VclPtr<FixedText> maCustom;
+    VclPtr<FixedText> maLeft;
+    VclPtr<FixedText> maInner;
+    VclPtr<MetricField> maLeftMarginEdit;
+    VclPtr<FixedText> maRight;
+    VclPtr<FixedText> maOuter;
+    VclPtr<MetricField> maRightMarginEdit;
+    VclPtr<FixedText> maTop;
+    VclPtr<MetricField> maTopMarginEdit;
+    VclPtr<FixedText> maBottom;
+    VclPtr<MetricField> maBottomMarginEdit;
 
     // hidden metric field
-    MetricField maWidthHeightField;
+    VclPtr<MetricField> maWidthHeightField;
 
     long mnPageLeftMargin;
     long mnPageRightMargin;
-- 
cgit