prophylactic double dispose audit.

Change-Id: Ia18c0b7a76fb0894efe33afaf69a0079c4583228

1 files changed, 18 insertions, 1 deletions

diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index 7ffcd79d9592..56d500e35164 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -225,7 +225,9 @@ SvxSingleNumPickTabPage::~SvxSingleNumPickTabPage()
 void SvxSingleNumPickTabPage::dispose()
 {
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
 
@@ -392,7 +394,9 @@ SvxBulletPickTabPage::~SvxBulletPickTabPage()
 void SvxBulletPickTabPage::dispose()
 {
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
 
@@ -595,7 +599,9 @@ SvxNumPickTabPage::~SvxNumPickTabPage()
 void SvxNumPickTabPage::dispose()
 {
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
 
@@ -842,7 +848,9 @@ SvxBitmapPickTabPage::~SvxBitmapPickTabPage()
 void SvxBitmapPickTabPage::dispose()
 {
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
 
@@ -1154,9 +1162,15 @@ SvxNumOptionsTabPage::~SvxNumOptionsTabPage()
 
 void SvxNumOptionsTabPage::dispose()
 {
-    delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId);
+    if (m_pBitmapMB)
+    {
+        delete m_pBitmapMB->GetPopupMenu()->GetPopupMenu(m_nGalleryId);
+        m_pBitmapMB = NULL;
+    }
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
 
@@ -2719,9 +2733,12 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage()
 void SvxNumPositionTabPage::dispose()
 {
     delete pActNum;
+    pActNum = NULL;
     delete pSaveNum;
+    pSaveNum = NULL;
     SfxTabPage::dispose();
 }
+
 /*-------------------------------------------------------*/
 
 #if OSL_DEBUG_LEVEL > 1