replace remaining InterlockedCount() with inlined version

Change-Id: Ifcfa48fc87f905a91470a5b0fd597b02f220784c
Reviewed-on: https://gerrit.libreoffice.org/671
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>

27 files changed, 60 insertions, 60 deletions

diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx
index c2e4959527bd..e8bc7740cd2b 100644
--- a/dbaccess/source/core/api/RowSet.cxx
+++ b/dbaccess/source/core/api/RowSet.cxx
@@ -216,7 +216,7 @@ ORowSet::~ORowSet()
     if ( !m_rBHelper.bDisposed && !m_rBHelper.bInDispose )
     {
         OSL_FAIL("Please check who doesn't dispose this component!");
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx
index e36657e673c4..80a2dacd1edc 100644
--- a/dbaccess/source/core/api/RowSetRow.hxx
+++ b/dbaccess/source/core/api/RowSetRow.hxx
@@ -46,11 +46,11 @@ namespace dbaccess
 
         void acquire()
         {
-            osl_incrementInterlockedCount( &m_refCount );
+            osl_atomic_increment( &m_refCount );
         }
         void release()
         {
-            if (! osl_decrementInterlockedCount( &m_refCount ))
+            if (! osl_atomic_decrement( &m_refCount ))
                 delete this;
         }
         inline ORowSetRow getRow() const { return m_aRow; }
diff --git a/dbaccess/source/core/api/definitioncolumn.cxx b/dbaccess/source/core/api/definitioncolumn.cxx
index 1c378dfc160d..190da6017ae4 100644
--- a/dbaccess/source/core/api/definitioncolumn.cxx
+++ b/dbaccess/source/core/api/definitioncolumn.cxx
@@ -210,11 +210,11 @@ OQueryColumn::OQueryColumn( const Reference< XPropertySet >& _rxParserColumn, co
     }
 
     // determine the table column we're based on
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         m_xOriginalTableColumn = impl_determineOriginalTableColumn( _rxConnection );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 OQueryColumn::~OQueryColumn()
@@ -568,7 +568,7 @@ OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol,
             const bool _bPureWrap )
     :OTableColumnDescriptorWrapper( rCol, _bPureWrap, false )
 {
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     if ( _xColDefintion.is() )
     {
         try
@@ -580,7 +580,7 @@ OTableColumnWrapper::OTableColumnWrapper( const Reference< XPropertySet >& rCol,
             DBG_UNHANDLED_EXCEPTION();
         }
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 OTableColumnWrapper::~OTableColumnWrapper()
diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx
index 8ace09dd2f77..e89d80eae03a 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -88,7 +88,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
     registerProperties();
     ODataSettings::registerPropertiesFor(this);
 
-    osl_incrementInterlockedCount(&m_refCount);
+    osl_atomic_increment(&m_refCount);
     OSL_ENSURE(m_xCommandDefinition.is(), "OQuery::OQuery : invalid CommandDefinition object !");
     if ( m_xCommandDefinition.is() )
     {
@@ -106,7 +106,7 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition
         m_xCommandPropInfo = m_xCommandDefinition->getPropertySetInfo();
     }
     OSL_ENSURE(m_xConnection.is(), "OQuery::OQuery : invalid connection !");
-    osl_decrementInterlockedCount(&m_refCount);
+    osl_atomic_decrement(&m_refCount);
 }
 
 OQuery::~OQuery()
diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx
index bc4f690f84b3..66745a51e202 100644
--- a/dbaccess/source/core/dataaccess/ModelImpl.cxx
+++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx
@@ -1015,12 +1015,12 @@ Reference< XModel > ODatabaseModelImpl::createNewModel_deliverOwnership( bool _b
 
 oslInterlockedCount SAL_CALL ODatabaseModelImpl::acquire()
 {
-    return osl_incrementInterlockedCount(&m_refCount);
+    return osl_atomic_increment(&m_refCount);
 }
 
 oslInterlockedCount SAL_CALL ODatabaseModelImpl::release()
 {
-    if ( osl_decrementInterlockedCount(&m_refCount) == 0 )
+    if ( osl_atomic_decrement(&m_refCount) == 0 )
     {
         acquire();  // prevent multiple releases
         m_pDBContext->removeFromTerminateListener(*this);
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 44a4299f8656..8e5d5c48e2d2 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -301,7 +301,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "dataaccess", "Ocke.Janssen@sun.com", "OConnection::OConnection" );
     DBG_CTOR(OConnection,NULL);
-    osl_incrementInterlockedCount(&m_refCount);
+    osl_atomic_increment(&m_refCount);
 
     try
     {
@@ -377,7 +377,7 @@ OConnection::OConnection(ODatabaseSource& _rDB
     {
         DBG_UNHANDLED_EXCEPTION();
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 OConnection::~OConnection()
diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx
index bb37110ae416..4d8f3babc9a8 100644
--- a/dbaccess/source/core/dataaccess/databasecontext.cxx
+++ b/dbaccess/source/core/dataaccess/databasecontext.cxx
@@ -178,14 +178,14 @@ ODatabaseContext::ODatabaseContext( const Reference< XComponentContext >& _rxCon
     ::basic::BasicManagerRepository::registerCreationListener( *this );
 #endif
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         m_xDBRegistrationAggregate.set( createDataSourceRegistrations( m_aContext ), UNO_SET_THROW );
         m_xDatabaseRegistrations.set( m_xDBRegistrationAggregate, UNO_QUERY_THROW );
 
         m_xDBRegistrationAggregate->setDelegator( *this );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 ODatabaseContext::~ODatabaseContext()
diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e2c4c03d06aa..9b49dc4c62ba 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -174,7 +174,7 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
     DBG_CTOR(ODatabaseDocument,NULL);
     OSL_TRACE( "DD: ctor: %p: %p", this, m_pImpl.get() );
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         impl_reparent_nothrow( m_xForms );
         impl_reparent_nothrow( m_xReports );
@@ -183,7 +183,7 @@ ODatabaseDocument::ODatabaseDocument(const ::rtl::Reference<ODatabaseModelImpl>&
 
         m_pEventExecutor = new DocumentEventExecutor( m_pImpl->m_aContext, this );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 
     // if there previously was a document instance for the same Impl which was already initialized,
     // then consider ourself initialized, too.
diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx
index df2153e69006..061d873ef0a7 100644
--- a/dbaccess/source/core/dataaccess/datasource.cxx
+++ b/dbaccess/source/core/dataaccess/datasource.cxx
@@ -141,12 +141,12 @@ FlushNotificationAdapter::FlushNotificationAdapter( const Reference< XFlushable
     DBG_CTOR( FlushNotificationAdapter, NULL );
     OSL_ENSURE( _rxBroadcaster.is(), "FlushNotificationAdapter::FlushNotificationAdapter: invalid flushable!" );
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         if ( _rxBroadcaster.is() )
             _rxBroadcaster->addFlushListener( this );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
     OSL_ENSURE( m_refCount == 1, "FlushNotificationAdapter::FlushNotificationAdapter: broadcaster isn't holding by hard ref!?" );
 }
 
@@ -341,7 +341,7 @@ void SAL_CALL OSharedConnectionManager::disposing( const ::com::sun::star::lang:
     TSharedConnectionMap::iterator aFind = m_aSharedConnection.find(xConnection);
     if ( m_aSharedConnection.end() != aFind )
     {
-        osl_decrementInterlockedCount(&aFind->second->second.nALiveCount);
+        osl_atomic_decrement(&aFind->second->second.nALiveCount);
         if ( !aFind->second->second.nALiveCount )
         {
             ::comphelper::disposeComponent(aFind->second->second.xMasterConnection);
@@ -404,7 +404,7 @@ void OSharedConnectionManager::addEventListener(const Reference<XConnection>& _r
     Reference<XComponent> xComp(_rxConnection,UNO_QUERY);
     xComp->addEventListener(this);
     OSL_ENSURE( m_aConnections.end() != _rIter , "Iterator is end!");
-    osl_incrementInterlockedCount(&_rIter->second.nALiveCount);
+    osl_atomic_increment(&_rIter->second.nALiveCount);
 }
 
 namespace
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index 1f39d32ccb21..4593269de978 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -183,12 +183,12 @@ namespace dbaccess
             ,m_bInStateChange(false)
             ,m_bInChangingState(false)
         {
-            osl_incrementInterlockedCount( &m_refCount );
+            osl_atomic_increment( &m_refCount );
             {
                 if ( m_xBroadCaster.is() )
                     m_xBroadCaster->addStateChangeListener(this);
             }
-            osl_decrementInterlockedCount( &m_refCount );
+            osl_atomic_decrement( &m_refCount );
         }
 
         virtual void SAL_CALL changingState( const lang::EventObject& aEvent, ::sal_Int32 nOldState, ::sal_Int32 nNewState ) throw (embed::WrongStateException, uno::RuntimeException);
@@ -329,11 +329,11 @@ namespace dbaccess
             :m_xClient( _rxClient )
         {
             OSL_ENSURE( _rxActor.is(), "LifetimeCoupler::LifetimeCoupler: this will crash!" );
-            osl_incrementInterlockedCount( &m_refCount );
+            osl_atomic_increment( &m_refCount );
             {
                 _rxActor->addEventListener( this );
             }
-            osl_decrementInterlockedCount( &m_refCount );
+            osl_atomic_decrement( &m_refCount );
             OSL_ENSURE( m_refCount, "LifetimeCoupler::LifetimeCoupler: the actor is not holding us by hard ref - this won't work!" );
         }
 
diff --git a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
index 7d41a9ebd38a..0d835a0b206f 100644
--- a/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventexecutor.cxx
@@ -128,11 +128,11 @@ namespace dbaccess
     {
         Reference< XDocumentEventBroadcaster > xBroadcaster( _rxDocument, UNO_QUERY_THROW );
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             xBroadcaster->addDocumentEventListener( this );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
 
         try
         {
diff --git a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
index bfa12a539730..1bd422905b22 100644
--- a/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
+++ b/dbaccess/source/core/dataaccess/documenteventnotifier.cxx
@@ -137,12 +137,12 @@ namespace dbaccess
 
     void SAL_CALL DocumentEventNotifier_Impl::acquire()
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
     }
 
     void SAL_CALL DocumentEventNotifier_Impl::release()
     {
-        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        if ( 0 == osl_atomic_decrement( &m_refCount ) )
             delete this;
     }
 
diff --git a/dbaccess/source/core/inc/FilteredContainer.hxx b/dbaccess/source/core/inc/FilteredContainer.hxx
index c1b525ed8d10..049bdbc15103 100644
--- a/dbaccess/source/core/inc/FilteredContainer.hxx
+++ b/dbaccess/source/core/inc/FilteredContainer.hxx
@@ -72,12 +72,12 @@ namespace dbaccess
             EnsureReset( oslInterlockedCount& _rValueLocation)
                 :m_rValue( _rValueLocation )
             {
-                osl_incrementInterlockedCount(&m_rValue);
+                osl_atomic_increment(&m_rValue);
             }
 
             ~EnsureReset()
             {
-                osl_decrementInterlockedCount(&m_rValue);
+                osl_atomic_decrement(&m_rValue);
             }
 
         private:
diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx
index bd153d5b7340..de4dfa5bc710 100644
--- a/dbaccess/source/core/misc/ContainerMediator.cxx
+++ b/dbaccess/source/core/misc/ContainerMediator.cxx
@@ -53,7 +53,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
 
     if ( _xSettings.is() && _xContainer.is() )
     {
-        osl_incrementInterlockedCount(&m_refCount);
+        osl_atomic_increment(&m_refCount);
         try
         {
             m_xContainer->addContainerListener(this);
@@ -65,7 +65,7 @@ OContainerMediator::OContainerMediator( const Reference< XContainer >& _xContain
         {
             OSL_FAIL("OContainerMediator::OContainerMediator: caught an exception!");
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
     else
     {
diff --git a/dbaccess/source/core/misc/DatabaseDataProvider.cxx b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
index 64eeb96267de..80bb59906a0e 100644
--- a/dbaccess/source/core/misc/DatabaseDataProvider.cxx
+++ b/dbaccess/source/core/misc/DatabaseDataProvider.cxx
@@ -70,7 +70,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
     m_xRangeConversion.set(m_xInternal,uno::UNO_QUERY);
     m_xComplexDescriptionAccess.set(m_xInternal,uno::UNO_QUERY);
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         m_xRowSet.set( m_xContext->getServiceManager()->createInstanceWithContext(SERVICE_SDB_ROWSET,m_xContext ), uno::UNO_QUERY );
         m_xAggregate.set(m_xRowSet,uno::UNO_QUERY);
@@ -81,7 +81,7 @@ DatabaseDataProvider::DatabaseDataProvider(uno::Reference< uno::XComponentContex
         m_xAggregateSet->setPropertyValue(PROPERTY_COMMAND_TYPE,uno::makeAny(m_CommandType));
         m_xAggregateSet->setPropertyValue(PROPERTY_ESCAPE_PROCESSING,uno::makeAny(m_EscapeProcessing));
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 // -----------------------------------------------------------------------------
 void SAL_CALL DatabaseDataProvider::disposing()
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx b/dbaccess/source/core/misc/PropertyForward.cxx
index 428942fc1458..2894a7fe73e8 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -53,7 +53,7 @@ namespace dbaccess
     {
         DBG_CTOR(OPropertyForward,NULL);
 
-        osl_incrementInterlockedCount(&m_refCount);
+        osl_atomic_increment(&m_refCount);
         try
         {
             if ( _aPropertyList.empty() )
@@ -70,7 +70,7 @@ namespace dbaccess
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/core/misc/apitools.cxx b/dbaccess/source/core/misc/apitools.cxx
index fa6781066c39..cdf690b37895 100644
--- a/dbaccess/source/core/misc/apitools.cxx
+++ b/dbaccess/source/core/misc/apitools.cxx
@@ -78,7 +78,7 @@ void OSubComponent::release() throw ( )
     Reference< XInterface > x( xDelegator );
     if (! x.is())
     {
-        if (osl_decrementInterlockedCount( &m_refCount ) == 0 )
+        if (osl_atomic_decrement( &m_refCount ) == 0 )
         {
             if (! rBHelper.bDisposed)
             {
@@ -115,7 +115,7 @@ void OSubComponent::release() throw ( )
             }
         }
         // restore the reference count
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
     }
 
     // as we cover the job of the componenthelper we use the ...
diff --git a/dbaccess/source/core/recovery/settingsimport.cxx b/dbaccess/source/core/recovery/settingsimport.cxx
index 0f92f496012a..614c268d4b86 100644
--- a/dbaccess/source/core/recovery/settingsimport.cxx
+++ b/dbaccess/source/core/recovery/settingsimport.cxx
@@ -60,13 +60,13 @@ namespace dbaccess
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL SettingsImport::acquire()
     {
-        return osl_incrementInterlockedCount( &m_refCount );
+        return osl_atomic_increment( &m_refCount );
     }
 
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL SettingsImport::release()
     {
-        oslInterlockedCount newCount = osl_decrementInterlockedCount( &m_refCount );
+        oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
         if ( newCount == 0 )
             delete this;
         return newCount;
diff --git a/dbaccess/source/core/recovery/subcomponentloader.cxx b/dbaccess/source/core/recovery/subcomponentloader.cxx
index 5e3e86785b45..7238b39930e8 100644
--- a/dbaccess/source/core/recovery/subcomponentloader.cxx
+++ b/dbaccess/source/core/recovery/subcomponentloader.cxx
@@ -120,11 +120,11 @@ namespace dbaccess
         Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW );
         m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW );
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             m_pData->xAppComponentWindow->addWindowListener( this );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //--------------------------------------------------------------------
@@ -136,11 +136,11 @@ namespace dbaccess
         Reference< XController2 > xController( i_rApplicationController, UNO_QUERY_THROW );
         m_pData->xAppComponentWindow.set( xController->getComponentWindow(), UNO_SET_THROW );
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             m_pData->xAppComponentWindow->addWindowListener( this );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //--------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index 9fd4d3a31798..aaa71c380db0 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -320,7 +320,7 @@ OApplicationController::~OApplicationController()
     {
         OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
     SAL_WNODEPRECATED_DECLARATIONS_PUSH
diff --git a/dbaccess/source/ui/browser/dbexchange.cxx b/dbaccess/source/ui/browser/dbexchange.cxx
index 39502a4b72ea..fa2abaa9906d 100644
--- a/dbaccess/source/ui/browser/dbexchange.cxx
+++ b/dbaccess/source/ui/browser/dbexchange.cxx
@@ -71,13 +71,13 @@ namespace dbaui
         ,m_pHtml(NULL)
         ,m_pRtf(NULL)
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         lcl_setListener( _rxConnection, this, true );
 
         m_pHtml.set( new OHTMLImportExport( getDescriptor(), _rxORB, _rxFormatter ) );
         m_pRtf.set( new ORTFImportExport( getDescriptor(), _rxORB, _rxFormatter ) );
 
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     // -----------------------------------------------------------------------------
@@ -106,7 +106,7 @@ namespace dbaui
     {
         OSL_PRECOND( i_rORB.is(), "ODataClipboard::ODataClipboard: having no factory is not good ..." );
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
 
         Reference<XConnection> xConnection;
         getDescriptor()[ daConnection ] >>= xConnection;
@@ -136,7 +136,7 @@ namespace dbaui
             }
         }
 
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx b/dbaccess/source/ui/browser/genericcontroller.cxx
index 11178af047ec..cb8d8b947bb2 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -189,11 +189,11 @@ OGenericUnoController::OGenericUnoController(const Reference< XMultiServiceFacto
     ,m_bCurrentlyModified(sal_False)
     ,m_bExternalTitle(sal_False)
 {
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         m_pData.reset( new OGenericUnoController_Data( *this, getMutex() ) );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 
     DBG_CTOR(OGenericUnoController,NULL);
 
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index e50a64eb990f..0be575a803e7 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -247,7 +247,7 @@ SbaTableQueryBrowser::~SbaTableQueryBrowser()
     {
         OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx
index cf9242e92598..d768adf0358b 100644
--- a/dbaccess/source/ui/control/toolboxcontroller.cxx
+++ b/dbaccess/source/ui/control/toolboxcontroller.cxx
@@ -71,9 +71,9 @@ namespace dbaui
     OToolboxController::OToolboxController(const Reference< XMultiServiceFactory >& _rxORB)
         : m_nToolBoxId(1)
     {
-        osl_incrementInterlockedCount(&m_refCount);
+        osl_atomic_increment(&m_refCount);
         m_xServiceManager = _rxORB;
-        osl_decrementInterlockedCount(&m_refCount);
+        osl_atomic_decrement(&m_refCount);
 
     }
     // -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index ad091cc66c21..36c922cdc180 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -108,7 +108,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
 
     m_eDestEnc = osl_getThreadTextEncoding();
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     impl_initFromDescriptor( _aDataDescriptor, false );
 
     xub_StrLen nCount = comphelper::string::getTokenCount(rExchange, char(11));
@@ -118,7 +118,7 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
         for(xub_StrLen i=SBA_FORMAT_SELECTION_COUNT;i<nCount;++i)
             m_pRowMarker[i-SBA_FORMAT_SELECTION_COUNT] = rExchange.GetToken(i,char(11)).ToInt32();
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 // -----------------------------------------------------------------------------
 // import data
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index eb678236f3ba..7ae234877f80 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -352,7 +352,7 @@ OQueryController::~OQueryController()
     {
         OSL_FAIL("Please check who doesn't dispose this component!");
         // increment ref count to prevent double call of Dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 4329e16a90a5..c5613a75f767 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -37,13 +37,13 @@ OColumnPeer::OColumnPeer(Window* _pParent,const Reference<XMultiServiceFactory>&
     :m_xORB(_rxFactory)
     ,m_pActFieldDescr(NULL)
 {
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         OColumnControlWindow* pFieldControl = new OColumnControlWindow(_pParent,m_xORB);
         pFieldControl->SetComponentInterface(this);
         pFieldControl->Show();
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 // -----------------------------------------------------------------------------
 void OColumnPeer::setEditWidth(sal_Int32 _nWidth)