1 files changed, 11 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx
index 8c64920aad01..8189fca44a92 100644
--- a/extensions/source/propctrlr/taborder.cxx
+++ b/extensions/source/propctrlr/taborder.cxx
@@ -118,10 +118,20 @@ namespace pcr
 
     TabOrderDialog::~TabOrderDialog()
     {
+        disposeOnce();
+    }
+
+    void TabOrderDialog::dispose()
+    {
         m_pLB_Controls->Hide();
         //  delete pLB_Controls;
         delete pImageList;
-
+        m_pLB_Controls.clear();
+        m_pPB_OK.clear();
+        m_pPB_MoveUp.clear();
+        m_pPB_MoveDown.clear();
+        m_pPB_AutoOrder.clear();
+        ModalDialog::dispose();
     }