protect against double dispose.

Change-Id: Ib168188f7cfd8d4e0e6fe0617c5c9b7de840016b

protect against double dispose.
Change-Id: Ib168188f7cfd8d4e0e6fe0617c5c9b7de840016b
6b7bad4d · Michael Meeks · 94e31983 · 6b7bad4d
Kaydet (Commit) 6b7bad4d authored Şub 17, 2015 tarafından Michael Meeks
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

ivctrl.cxx svtools/source/contnr/ivctrl.cxx +6 -2

No files found.
--- a/svtools/source/contnr/ivctrl.cxx
+++ b/svtools/source/contnr/ivctrl.cxx
@@ -93,8 +93,12 @@ SvtIconChoiceCtrl::~SvtIconChoiceCtrl()
 void SvtIconChoiceCtrl::dispose()
 {
-    _pImp->CallEventListeners( VCLEVENT_OBJECT_DYING );
+    if (_pImp)
-    delete _pImp;
+    {
+        _pImp->CallEventListeners( VCLEVENT_OBJECT_DYING );
+        delete _pImp;
+        _pImp = NULL;
+    }
    Control::dispose();
 }