From 96afb3cf40d913dfcfc6f51240efd33f9d0740a6 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel@peralex.com>
Date: Fri, 11 Jul 2014 16:01:03 +0200
Subject: ODatabaseModelImpl doesn't need to be using rtl::IReference

Change-Id: Ia08d57b33af93ceb5c60c48602c403f893bbccc2
---
 dbaccess/source/core/dataaccess/ModelImpl.cxx |  8 +++-----
 dbaccess/source/core/dataaccess/ModelImpl.hxx | 11 +++--------
 2 files changed, 6 insertions(+), 13 deletions(-)

(limited to 'dbaccess')

diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index 05e6e30a43dc..1a3fa23f376e 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -981,12 +981,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
     return xModel;
 }
 
-oslInterlockedCount SAL_CALL ODatabaseModelImpl::acquire()
+void SAL_CALL ODatabaseModelImpl::acquire()
 {
-    return osl_atomic_increment(&m_refCount);
+    osl_atomic_increment(&m_refCount);
 }
 
-oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
+void SAL_CALL ODatabaseModelImpl::release()
 {
     if ( osl_atomic_decrement(&m_refCount) == 0 )
     {
@@ -996,9 +996,7 @@ oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
         m_pDBContext->storeTransientProperties(*this);
         revokeDataSource();
         delete this;
-        return 0;
     }
-    return m_refCount;
 }
 
 void ODatabaseModelImpl::commitStorages()
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.hxx b/dbaccess/source/core/dataaccess/ModelImpl.hxx
index bfe6b23d2b51..1c7d0d85ccab 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.hxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.hxx
@@ -144,8 +144,7 @@ typedef ::utl::SharedUNOComponent< ::com::sun::star::embed::XStorage >  SharedSt
 class ODatabaseContext;
 class DocumentStorageAccess;
 class OSharedConnectionManager;
-class ODatabaseModelImpl    :public ::rtl::IReference
-                            ,public ::sfx2::IMacroDocumentAccess
+class ODatabaseModelImpl    :public ::sfx2::IMacroDocumentAccess
                             ,public ::sfx2::IModifiableDocument
 {
 public:
@@ -374,13 +373,9 @@ public:
 
     inline const ::comphelper::SharedMutex& getSharedMutex() const { return m_aMutex; }
 
-    /** @see osl_incrementInterlockedCount.
-     */
-    virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
+    void SAL_CALL acquire();
 
-    /** @see osl_decrementInterlockedCount.
-     */
-    virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
+    void SAL_CALL release();
 
     /// returns a all known data source settings, including their default values
     static const AsciiPropertyValue* getDefaultDataSourceSettings();
-- 
cgit