1 files changed, 4 insertions, 9 deletions
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index 20830d55b552..a54b3035a965 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -197,7 +197,7 @@ class DisposeListenerGridBridge : public FmXDisposeListener
 {
     osl::Mutex              m_aMutex;
     DbGridControl&          m_rParent;
-    FmXDisposeMultiplexer*  m_pRealListener;
+    css::uno::Reference<FmXDisposeMultiplexer>  m_xRealListener;
 
 public:
     DisposeListenerGridBridge(  DbGridControl& _rParent, const Reference< XComponent >& _rxObject);
@@ -209,25 +209,20 @@ public:
 DisposeListenerGridBridge::DisposeListenerGridBridge(DbGridControl& _rParent, const Reference< XComponent >& _rxObject)
     :FmXDisposeListener(m_aMutex)
     ,m_rParent(_rParent)
-    ,m_pRealListener(nullptr)
 {
 
     if (_rxObject.is())
     {
-        m_pRealListener = new FmXDisposeMultiplexer(this, _rxObject);
-        m_pRealListener->acquire();
+        m_xRealListener = new FmXDisposeMultiplexer(this, _rxObject);
     }
 }
 
 DisposeListenerGridBridge::~DisposeListenerGridBridge()
 {
-    if (m_pRealListener)
+    if (m_xRealListener.is())
     {
-        m_pRealListener->dispose();
-        m_pRealListener->release();
-        m_pRealListener = nullptr;
+        m_xRealListener->dispose();
     }
-
 }
 
 static const sal_uInt16 ControlMap[] =