don't check isDisposed inside dispose()

my fault, from a recent commit. besides defeating the dispose(), it
should also be checked from the call sites.

Change-Id: Ia09580d4224bcf78e5684015c747105fa6606878
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116383
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

1 files changed, 6 insertions, 9 deletions

diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index d631d87eef58..ab8f128a7b29 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -751,16 +751,13 @@ DbGridControl::~DbGridControl()
 
 void DbGridControl::dispose()
 {
-    if (!isDisposed())
-    {
-        RemoveColumns();
+    RemoveColumns();
 
-        m_bWantDestruction = true;
-        osl::MutexGuard aGuard(m_aDestructionSafety);
-        if (m_pFieldListeners)
-            DisconnectFromFields();
-        m_pCursorDisposeListener.reset();
-    }
+    m_bWantDestruction = true;
+    osl::MutexGuard aGuard(m_aDestructionSafety);
+    if (m_pFieldListeners)
+        DisconnectFromFields();
+    m_pCursorDisposeListener.reset();
 
     if (m_nDeleteEvent)
         Application::RemoveUserEvent(m_nDeleteEvent);