summaryrefslogtreecommitdiff
path: root/svx/source/fmcomp/gridctrl.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-05-23 13:53:42 +0200
committerNoel Grandin <noelgrandin@gmail.com>2016-05-24 06:54:06 +0000
commit111de438ea3e512a541281dc0716cc728ea8d152 (patch)
tree2c9ca866e79ed0cfc9299e553a87239345c515a6 /svx/source/fmcomp/gridctrl.cxx
parentd3f21849ec8580fdb59a1f0b35453657f4050e0f (diff)
remove some manual ref-counting
triggered when I noticed a class doing acquire() in the constructor and then release() in the destructor. found mostly by git grep -n -B5 -e '->release()' Change-Id: Ie1abeaed75c1f861df185e3bde680272dbadc97f Reviewed-on: https://gerrit.libreoffice.org/25363 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/fmcomp/gridctrl.cxx')
-rw-r--r--svx/source/fmcomp/gridctrl.cxx13
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[] =