prophylactic double dispose audit.

Change-Id: Ia18c0b7a76fb0894efe33afaf69a0079c4583228

9 files changed, 24 insertions, 3 deletions

diff --git a/chart2/source/controller/dialogs/dlg_ChartType.cxx b/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 9ef9432ded04..33cf74763515 100644
--- a/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -61,6 +61,7 @@ ChartTypeDialog::~ChartTypeDialog()
 void ChartTypeDialog::dispose()
 {
     delete m_pChartTypeTabPage;
+    m_pChartTypeTabPage = NULL;
     ModalDialog::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_DataSource.cxx b/chart2/source/controller/dialogs/dlg_DataSource.cxx
index e59c95e25624..88c1a41f64fd 100644
--- a/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -165,10 +165,15 @@ DataSourceDialog::~DataSourceDialog()
 void DataSourceDialog::dispose()
 {
     delete m_pRangeChooserTabePage;
+    m_pRangeChooserTabePage = NULL;
     delete m_pDataSourceTabPage;
-
-    m_nLastPageId = m_pTabControl->GetCurPageId();
-    delete m_pTabControl;
+    m_pDataSourceTabPage = NULL;
+    if (m_pTabControl)
+    {
+        m_nLastPageId = m_pTabControl->GetCurPageId();
+        delete m_pTabControl;
+        m_pTabControl = NULL;
+    }
     TabDialog::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 25b87fc892d9..0a563e2a0c31 100644
--- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -487,7 +487,9 @@ SchAttribTabDlg::~SchAttribTabDlg()
 void SchAttribTabDlg::dispose()
 {
     delete m_pSymbolShapeProperties;
+    m_pSymbolShapeProperties = NULL;
     delete m_pAutoSymbolGraphic;
+    m_pAutoSymbolGraphic = NULL;
     SfxTabDialog::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/dlg_View3D.cxx b/chart2/source/controller/dialogs/dlg_View3D.cxx
index 6308f587af61..3769f2ef91c6 100644
--- a/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -72,8 +72,11 @@ View3DDialog::~View3DDialog()
 void View3DDialog::dispose()
 {
     delete m_pGeometry;
+    m_pGeometry = NULL;
     delete m_pAppearance;
+    m_pAppearance = NULL;
     delete m_pIllumination;
+    m_pIllumination = NULL;
 
     m_nLastPageId = m_pTabControl->GetCurPageId();
     TabDialog::dispose();
diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index defb3343ef73..2c92a7521c1f 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -300,6 +300,7 @@ ThreeD_SceneIllumination_TabPage::~ThreeD_SceneIllumination_TabPage()
 void ThreeD_SceneIllumination_TabPage::dispose()
 {
     delete[] m_pLightSourceInfoList;
+    m_pLightSourceInfoList = NULL;
     TabPage::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 85b6570a03b5..0cded264a300 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -78,6 +78,7 @@ SchAxisLabelTabPage::~SchAxisLabelTabPage()
 void SchAxisLabelTabPage::dispose()
 {
     delete m_pOrientHlp;
+    m_pOrientHlp = NULL;
     SfxTabPage::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_ChartType.cxx b/chart2/source/controller/dialogs/tp_ChartType.cxx
index 2b41ab2483ab..c7179039ae66 100644
--- a/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -780,11 +780,17 @@ void ChartTypeTabPage::dispose()
 
     //delete all resource helper
     delete m_pDim3DLookResourceGroup;
+    m_pDim3DLookResourceGroup = NULL;
     delete m_pStackingResourceGroup;
+    m_pStackingResourceGroup = NULL;
     delete m_pSplineResourceGroup;
+    m_pSplineResourceGroup = NULL;
     delete m_pGeometryResourceGroup;
+    m_pGeometryResourceGroup = NULL;
     delete m_pSortByXValuesResourceGroup;
+    m_pSortByXValuesResourceGroup = NULL;
     delete m_pGL3DResourceGroup;
+    m_pGL3DResourceGroup = NULL;
     svt::OWizardPage::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index c65ef3a69c63..dc8e84c9606e 100644
--- a/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -45,6 +45,7 @@ SchLayoutTabPage::~SchLayoutTabPage()
 void SchLayoutTabPage::dispose()
 {
     delete m_pGeometryResources;
+    m_pGeometryResources = NULL;
     SfxTabPage::dispose();
 }
 
diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 45ee08762e65..a83373dcbc8b 100644
--- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -63,6 +63,7 @@ SchAlignmentTabPage::~SchAlignmentTabPage()
 void SchAlignmentTabPage::dispose()
 {
     delete m_pOrientHlp;
+    m_pOrientHlp = NULL;
     SfxTabPage::dispose();
 }