1 files changed, 44 insertions, 19 deletions

diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index c7179039ae66..7618ef79adb0 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -56,8 +56,8 @@ private:
     DECL_LINK( SelectSchemeHdl, void* );
 
 private:
-    CheckBox* m_pCB_3DLook;
-    ListBox*  m_pLB_Scheme;
+    VclPtr<CheckBox> m_pCB_3DLook;
+    VclPtr<ListBox>  m_pLB_Scheme;
 };
 
 Dim3DLookResourceGroup::Dim3DLookResourceGroup(VclBuilderContainer* pWindow)
@@ -129,7 +129,7 @@ private:
     DECL_LINK( SortByXValuesCheckHdl, void* );
 
 private:
-    CheckBox* m_pCB_XValueSorting;
+    VclPtr<CheckBox> m_pCB_XValueSorting;
 };
 
 SortByXValuesResourceGroup::SortByXValuesResourceGroup(VclBuilderContainer* pWindow )
@@ -176,10 +176,10 @@ private:
     DECL_LINK( StackingEnableHdl, void* );
 
 private:
-    CheckBox*    m_pCB_Stacked;
-    RadioButton* m_pRB_Stack_Y;
-    RadioButton* m_pRB_Stack_Y_Percent;
-    RadioButton* m_pRB_Stack_Z;
+    VclPtr<CheckBox>    m_pCB_Stacked;
+    VclPtr<RadioButton> m_pRB_Stack_Y;
+    VclPtr<RadioButton> m_pRB_Stack_Y_Percent;
+    VclPtr<RadioButton> m_pRB_Stack_Z;
 
     bool m_bShowDeepStacking;
 };
@@ -278,7 +278,7 @@ public:
 private:
     DECL_LINK( SettingChangedHdl, void* );
 private:
-    CheckBox* m_pCB_RoundedEdge;
+    VclPtr<CheckBox> m_pCB_RoundedEdge;
 };
 
 GL3DResourceGroup::GL3DResourceGroup( VclBuilderContainer* pWindow )
@@ -313,6 +313,8 @@ class SplinePropertiesDialog : public ModalDialog
 {
 public:
     SplinePropertiesDialog( vcl::Window* pParent );
+    virtual ~SplinePropertiesDialog() { dispose(); }
+    virtual void dispose() SAL_OVERRIDE;
 
     void fillControls( const ChartTypeParameter& rParameter );
     void fillParameter( ChartTypeParameter& rParameter, bool bSmoothLines );
@@ -323,11 +325,11 @@ private:
     DECL_LINK( SplineTypeListBoxHdl, void* );
 
 private:
-    ListBox* m_pLB_Spline_Type;
+    VclPtr<ListBox>      m_pLB_Spline_Type;
 
-    NumericField* m_pMF_SplineResolution;
-    FixedText*    m_pFT_SplineOrder;
-    NumericField* m_pMF_SplineOrder;
+    VclPtr<NumericField> m_pMF_SplineResolution;
+    VclPtr<FixedText>    m_pFT_SplineOrder;
+    VclPtr<NumericField> m_pMF_SplineOrder;
 };
 
 const sal_uInt16 CUBIC_SPLINE_POS = 0;
@@ -346,6 +348,15 @@ SplinePropertiesDialog::SplinePropertiesDialog( vcl::Window* pParent )
     m_pLB_Spline_Type->SetSelectHdl( LINK (this, SplinePropertiesDialog, SplineTypeListBoxHdl ) );
 }
 
+void SplinePropertiesDialog::dispose()
+{
+    m_pLB_Spline_Type.clear();
+    m_pMF_SplineResolution.clear();
+    m_pFT_SplineOrder.clear();
+    m_pMF_SplineOrder.clear();
+    ModalDialog::dispose();
+}
+
 void SplinePropertiesDialog::StateChanged( StateChangedType nType )
 {
     Dialog::StateChanged( nType );
@@ -395,6 +406,8 @@ class SteppedPropertiesDialog : public ModalDialog
 {
 public:
     SteppedPropertiesDialog( vcl::Window* pParent );
+    virtual ~SteppedPropertiesDialog() { dispose(); }
+    virtual void dispose() SAL_OVERRIDE;
 
     void fillControls( const ChartTypeParameter& rParameter );
     void fillParameter( ChartTypeParameter& rParameter, bool bSteppedLines );
@@ -404,10 +417,10 @@ public:
 private:
 
 private:
-    RadioButton* m_pRB_Start;
-    RadioButton* m_pRB_End;
-    RadioButton* m_pRB_CenterX;
-    RadioButton* m_pRB_CenterY;
+    VclPtr<RadioButton> m_pRB_Start;
+    VclPtr<RadioButton> m_pRB_End;
+    VclPtr<RadioButton> m_pRB_CenterX;
+    VclPtr<RadioButton> m_pRB_CenterY;
 };
 
 SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent )
@@ -421,6 +434,15 @@ SteppedPropertiesDialog::SteppedPropertiesDialog( vcl::Window* pParent )
     SetText(SCH_RESSTR(STR_DLG_STEPPED_LINE_PROPERTIES));
 }
 
+void SteppedPropertiesDialog::dispose()
+{
+    m_pRB_Start.clear();
+    m_pRB_End.clear();
+    m_pRB_CenterX.clear();
+    m_pRB_CenterY.clear();
+    ModalDialog::dispose();
+}
+
 void SteppedPropertiesDialog::StateChanged( StateChangedType nType )
 {
     Dialog::StateChanged( nType );
@@ -480,9 +502,9 @@ private:
     SteppedPropertiesDialog& getSteppedPropertiesDialog();
 
 private:
-    FixedText*  m_pFT_LineType;
-    ListBox*    m_pLB_LineType;
-    PushButton* m_pPB_DetailsDialog;
+    VclPtr<FixedText>  m_pFT_LineType;
+    VclPtr<ListBox>    m_pLB_LineType;
+    VclPtr<PushButton> m_pPB_DetailsDialog;
     boost::scoped_ptr< SplinePropertiesDialog > m_pSplinePropertiesDialog;
     boost::scoped_ptr< SteppedPropertiesDialog > m_pSteppedPropertiesDialog;
 };
@@ -791,6 +813,9 @@ void ChartTypeTabPage::dispose()
     m_pSortByXValuesResourceGroup = NULL;
     delete m_pGL3DResourceGroup;
     m_pGL3DResourceGroup = NULL;
+    m_pFT_ChooseType.clear();
+    m_pMainTypeList.clear();
+    m_pSubTypeList.clear();
     svt::OWizardPage::dispose();
 }