3 files changed, 7 insertions, 3 deletions
diff --git a/svx/source/dialog/docrecovery.cxx b/svx/source/dialog/docrecovery.cxx
index 9542c99fcba4..f704de3a0cd1 100644
--- a/svx/source/dialog/docrecovery.cxx
+++ b/svx/source/dialog/docrecovery.cxx
@@ -909,6 +909,7 @@ RecoveryDialog::~RecoveryDialog()
 void RecoveryDialog::dispose()
 {
     delete m_pFileListLB;
+    m_pFileListLB = NULL;
     Dialog::dispose();
 }
 
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx
index 860c6ac49f84..e1ed4afcb96e 100644
--- a/svx/source/fmcomp/fmgridcl.cxx
+++ b/svx/source/fmcomp/fmgridcl.cxx
@@ -141,7 +141,7 @@ void FmGridHeader::dispose()
 {
     delete m_pImpl;
     m_pImpl = NULL;
-    FmGridHeader::dispose();
+    svt::EditBrowserHeader::dispose();
 }
 
 sal_uInt16 FmGridHeader::GetModelColumnPos(sal_uInt16 nId) const
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index a60522a62698..89caf2621282 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -956,9 +956,10 @@ DbGridControl::~DbGridControl()
 
 void DbGridControl::dispose()
 {
-    RemoveColumns();
-
+    if (!IsDisposed())
     {
+        RemoveColumns();
+
         m_bWantDestruction = true;
         osl::MutexGuard aGuard(m_aDestructionSafety);
         if (m_pFieldListeners)
@@ -984,7 +985,9 @@ void DbGridControl::dispose()
     m_xRowSetListener.clear();
 
     delete m_pDataCursor;
+    m_pDataCursor = NULL;
     delete m_pSeekCursor;
+    m_pSeekCursor = NULL;
 
     m_aBar.disposeAndClear();