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>

8 files changed, 15 insertions, 15 deletions

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)