1 files changed, 45 insertions, 1 deletions
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index f7cfbb5adfd2..9174328463cc 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -392,6 +392,18 @@ NewObjectDialog::NewObjectDialog(vcl::Window * pParent, ObjectMode::Mode eMode,
         m_pOKButton->SetClickHdl(LINK(this, NewObjectDialog, OkButtonHandler));
 }
 
+NewObjectDialog::~NewObjectDialog()
+{
+    dispose();
+}
+
+void NewObjectDialog::dispose()
+{
+    m_pEdit.clear();
+    m_pOKButton.clear();
+    ModalDialog::dispose();
+}
+
 // GotoLineDialog
 GotoLineDialog::GotoLineDialog(vcl::Window * pParent )
     : ModalDialog(pParent, "GotoLineDialog",
@@ -403,6 +415,18 @@ GotoLineDialog::GotoLineDialog(vcl::Window * pParent )
     m_pOKButton->SetClickHdl(LINK(this, GotoLineDialog, OkButtonHandler));
 }
 
+GotoLineDialog::~GotoLineDialog()
+{
+    dispose();
+}
+
+void GotoLineDialog::dispose()
+{
+    m_pEdit.clear();
+    m_pOKButton.clear();
+    ModalDialog::dispose();
+}
+
 sal_Int32 GotoLineDialog::GetLineNumber() const
 {
     return m_pEdit->GetText().toInt32();
@@ -437,6 +461,18 @@ ExportDialog::ExportDialog(vcl::Window * pParent)
     m_pOKButton->SetClickHdl(LINK(this, ExportDialog, OkButtonHandler));
 }
 
+ExportDialog::~ExportDialog()
+{
+    dispose();
+}
+
+void ExportDialog::dispose()
+{
+    m_pExportAsPackageButton.clear();
+    m_pOKButton.clear();
+    ModalDialog::dispose();
+}
+
 // LibPage
 LibPage::LibPage(vcl::Window * pParent)
     : TabPage(pParent, "LibPage",
@@ -497,8 +533,16 @@ void LibPage::dispose()
             DocumentEntry* pEntry = static_cast<DocumentEntry*>(m_pBasicsBox->GetEntryData( i ));
             delete pEntry;
         }
-        m_pBasicsBox = NULL;
     }
+    m_pBasicsBox.clear();
+    m_pLibBox.clear();
+    m_pEditButton.clear();
+    m_pPasswordButton.clear();
+    m_pNewLibButton.clear();
+    m_pInsertLibButton.clear();
+    m_pExportButton.clear();
+    m_pDelButton.clear();
+    pTabDlg.clear();
     TabPage::dispose();
 }