1 files changed, 32 insertions, 31 deletions

diff --git a/sw/source/uibase/inc/column.hxx b/sw/source/uibase/inc/column.hxx
index d5efa31c7e59..fda9458182d6 100644
--- a/sw/source/uibase/inc/column.hxx
+++ b/sw/source/uibase/inc/column.hxx
@@ -42,10 +42,10 @@ class SwColumnPage;
 
 class SwColumnDlg : public SfxModalDialog
 {
-    ListBox*            m_pApplyToLB;
+    VclPtr<ListBox>            m_pApplyToLB;
 
     SwWrtShell&         rWrtShell;
-    SwColumnPage*       pTabPage;
+    VclPtr<SwColumnPage>       pTabPage;
     SfxItemSet*         pPageSet;
     SfxItemSet*         pSectionSet;
     SfxItemSet*         pSelectionSet;
@@ -66,6 +66,7 @@ class SwColumnDlg : public SfxModalDialog
 public:
     SwColumnDlg(vcl::Window* pParent, SwWrtShell& rSh);
     virtual ~SwColumnDlg();
+    virtual void dispose() SAL_OVERRIDE;
 
     SwWrtShell&     GetWrtShell()   { return rWrtShell; }
 };
@@ -88,39 +89,39 @@ public:
 // column dialog now as TabPage
 class SwColumnPage : public SfxTabPage
 {
-    NumericField*   m_pCLNrEdt;
-    ColumnValueSet* m_pDefaultVS;
-    CheckBox*       m_pBalanceColsCB;
+    VclPtr<NumericField>   m_pCLNrEdt;
+    VclPtr<ColumnValueSet> m_pDefaultVS;
+    VclPtr<CheckBox>       m_pBalanceColsCB;
 
-    PushButton*     m_pBtnBack;
-    FixedText*      m_pLbl1;
+    VclPtr<PushButton>     m_pBtnBack;
+    VclPtr<FixedText>      m_pLbl1;
     PercentField aEd1;
-    FixedText*      m_pLbl2;
+    VclPtr<FixedText>      m_pLbl2;
     PercentField aEd2;
-    FixedText*      m_pLbl3;
+    VclPtr<FixedText>      m_pLbl3;
     PercentField aEd3;
-    PushButton*     m_pBtnNext;
+    VclPtr<PushButton>     m_pBtnNext;
     PercentField aDistEd1;
     PercentField aDistEd2;
-    CheckBox*       m_pAutoWidthBox;
-
-    FixedText*      m_pLineTypeLbl;
-    LineListBox*    m_pLineTypeDLB;
-    FixedText*      m_pLineWidthLbl;
-    MetricField*    m_pLineWidthEdit;
-    FixedText*      m_pLineColorLbl;
-    ColorListBox*   m_pLineColorDLB;
-    FixedText*      m_pLineHeightLbl;
-    MetricField*    m_pLineHeightEdit;
-    FixedText*      m_pLinePosLbl;
-    ListBox*        m_pLinePosDLB;
-
-    FixedText*      m_pTextDirectionFT;
-    ListBox*        m_pTextDirectionLB;
+    VclPtr<CheckBox>       m_pAutoWidthBox;
+
+    VclPtr<FixedText>      m_pLineTypeLbl;
+    VclPtr<LineListBox>    m_pLineTypeDLB;
+    VclPtr<FixedText>      m_pLineWidthLbl;
+    VclPtr<MetricField>    m_pLineWidthEdit;
+    VclPtr<FixedText>      m_pLineColorLbl;
+    VclPtr<ColorListBox>   m_pLineColorDLB;
+    VclPtr<FixedText>      m_pLineHeightLbl;
+    VclPtr<MetricField>    m_pLineHeightEdit;
+    VclPtr<FixedText>      m_pLinePosLbl;
+    VclPtr<ListBox>        m_pLinePosDLB;
+
+    VclPtr<FixedText>      m_pTextDirectionFT;
+    VclPtr<ListBox>        m_pTextDirectionLB;
 
     // Example
-    SwColExample*   m_pPgeExampleWN;
-    SwColumnOnlyExample* m_pFrmExampleWN;
+    VclPtr<SwColExample>   m_pPgeExampleWN;
+    VclPtr<SwColumnOnlyExample> m_pFrmExampleWN;
 
     SwColMgr*       pColMgr;
 
@@ -131,7 +132,7 @@ class SwColumnPage : public SfxTabPage
     sal_uInt16          nMinWidth;
     PercentField*   pModifiedField;
 
-    std::map<MetricField*, PercentField*> m_aPercentFieldsMap;
+    std::map<VclPtr<MetricField>, PercentField*> m_aPercentFieldsMap;
 
     bool            bFormat;
     bool            bFrm;
@@ -163,8 +164,6 @@ class SwColumnPage : public SfxTabPage
     virtual void    ActivatePage(const SfxItemSet& rSet) SAL_OVERRIDE;
     virtual sfxpg   DeactivatePage(SfxItemSet *pSet) SAL_OVERRIDE;
 
-    SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
-
     void connectPercentField(PercentField &rWrap, const OString &rName);
 
     bool isLineNotNone() const;
@@ -172,9 +171,11 @@ class SwColumnPage : public SfxTabPage
     static const sal_uInt16 aPageRg[];
 
 public:
+    SwColumnPage(vcl::Window *pParent, const SfxItemSet &rSet);
     virtual ~SwColumnPage();
+    virtual void dispose() SAL_OVERRIDE;
 
-    static SfxTabPage *Create(vcl::Window *pParent, const SfxItemSet *rSet);
+    static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet);
     static const sal_uInt16* GetRanges() { return aPageRg; }
 
     virtual bool    FillItemSet(SfxItemSet *rSet) SAL_OVERRIDE;