1 files changed, 10 insertions, 2 deletions
diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx
index 534b0168b3cd..b7a9c2e256d9 100644
--- a/svx/source/dialog/imapdlg.cxx
+++ b/svx/source/dialog/imapdlg.cxx
@@ -96,7 +96,7 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16
             SfxChildWindow( _pParent, nId )
 {
     pWindow = new SvxIMapDlg( pBindings, this, _pParent );
-    SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(pWindow);
+    SvxIMapDlg* pDlg = static_cast<SvxIMapDlg*>(pWindow.get());
 
     if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN )
         pDlg->RollUp();
@@ -223,8 +223,16 @@ SvxIMapDlg::~SvxIMapDlg()
 void SvxIMapDlg::dispose()
 {
     // Delete URL-List
-    delete pIMapWnd;
+    pIMapWnd.clear();
     delete pOwnData;
+    m_pTbxIMapDlg1.clear();
+    m_pFtURL.clear();
+    m_pURLBox.clear();
+    m_pFtText.clear();
+    m_pEdtText.clear();
+    m_pFtTarget.clear();
+    m_pCbbTarget.clear();
+    m_pStbStatus.clear();
     SfxModelessDialog::dispose();
 }