From 111de438ea3e512a541281dc0716cc728ea8d152 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Mon, 23 May 2016 13:53:42 +0200
Subject: 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>
---
 editeng/source/xml/editsource.hxx |  2 +-
 editeng/source/xml/xmltxtexp.cxx  | 34 +++++++---------------------------
 2 files changed, 8 insertions(+), 28 deletions(-)

(limited to 'editeng')

diff --git a/editeng/source/xml/editsource.hxx b/editeng/source/xml/editsource.hxx
index 4b49838448ad..a22728f34e4b 100644
--- a/editeng/source/xml/editsource.hxx
+++ b/editeng/source/xml/editsource.hxx
@@ -38,7 +38,7 @@ public:
 private:
     explicit SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl );
 
-    SvxEditEngineSourceImpl*    mpImpl;
+    rtl::Reference<SvxEditEngineSourceImpl> mxImpl;
 };
 
 #endif
diff --git a/editeng/source/xml/xmltxtexp.cxx b/editeng/source/xml/xmltxtexp.cxx
index 28e4f497ed8e..6535b6505603 100644
--- a/editeng/source/xml/xmltxtexp.cxx
+++ b/editeng/source/xml/xmltxtexp.cxx
@@ -59,28 +59,22 @@ using namespace cppu;
 
 class SvxEditEngineSourceImpl;
 
-class SvxEditEngineSourceImpl
+class SvxEditEngineSourceImpl : public salhelper::SimpleReferenceObject
 {
 private:
-    oslInterlockedCount maRefCount;
-
     EditEngine*             mpEditEngine;
     SvxTextForwarder*       mpTextForwarder;
 
-    ~SvxEditEngineSourceImpl();
+    virtual ~SvxEditEngineSourceImpl();
 
 public:
     explicit SvxEditEngineSourceImpl( EditEngine* pEditEngine );
 
-    void SAL_CALL acquire();
-    void SAL_CALL release();
-
     SvxTextForwarder*       GetTextForwarder();
 };
 
 SvxEditEngineSourceImpl::SvxEditEngineSourceImpl( EditEngine* pEditEngine )
-: maRefCount(0),
-  mpEditEngine( pEditEngine ),
+: mpEditEngine( pEditEngine ),
   mpTextForwarder(nullptr)
 {
 }
@@ -90,17 +84,6 @@ SvxEditEngineSourceImpl::~SvxEditEngineSourceImpl()
     delete mpTextForwarder;
 }
 
-void SAL_CALL SvxEditEngineSourceImpl::acquire()
-{
-    osl_atomic_increment( &maRefCount );
-}
-
-void SAL_CALL SvxEditEngineSourceImpl::release()
-{
-    if( ! osl_atomic_decrement( &maRefCount ) )
-        delete this;
-}
-
 SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder()
 {
     if (!mpTextForwarder)
@@ -111,30 +94,27 @@ SvxTextForwarder* SvxEditEngineSourceImpl::GetTextForwarder()
 
 // SvxTextEditSource
 SvxEditEngineSource::SvxEditEngineSource( EditEngine* pEditEngine )
+   : mxImpl( new SvxEditEngineSourceImpl( pEditEngine ) )
 {
-    mpImpl = new SvxEditEngineSourceImpl( pEditEngine );
-    mpImpl->acquire();
 }
 
 SvxEditEngineSource::SvxEditEngineSource( SvxEditEngineSourceImpl* pImpl )
+   : mxImpl(pImpl)
 {
-    mpImpl = pImpl;
-    mpImpl->acquire();
 }
 
 SvxEditEngineSource::~SvxEditEngineSource()
 {
-    mpImpl->release();
 }
 
 SvxEditSource* SvxEditEngineSource::Clone() const
 {
-    return new SvxEditEngineSource( mpImpl );
+    return new SvxEditEngineSource( mxImpl.get() );
 }
 
 SvxTextForwarder* SvxEditEngineSource::GetTextForwarder()
 {
-    return mpImpl->GetTextForwarder();
+    return mxImpl->GetTextForwarder();
 }
 
 
-- 
cgit