From 954e5e4b7820c5db3a6720dc9dc27e49cee449ac Mon Sep 17 00:00:00 2001
From: Michael Meeks <michael.meeks@collabora.com>
Date: Mon, 2 Mar 2015 22:02:19 +0000
Subject: prophylactic double dispose audit.

Change-Id: Ia18c0b7a76fb0894efe33afaf69a0079c4583228
---
 chart2/source/controller/dialogs/dlg_DataSource.cxx | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'chart2/source/controller/dialogs/dlg_DataSource.cxx')

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();
 }
 
-- 
cgit