mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ODatabaseModelImpl doesn't need to be using rtl::IReference

Browse Source 
Change-Id: Ia08d57b33af93ceb5c60c48602c403f893bbccc2
This commit is contained in:
Noel Grandin
2014-07-11 16:01:03 +02:00
parent ae4004548a
commit 96afb3cf40
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
dbaccess/source/core/dataaccess/ModelImpl.cxx
View File

@@ -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()

11
dbaccess/source/core/dataaccess/ModelImpl.hxx
View File

@@ -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();