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>

13 files changed, 31 insertions, 31 deletions

diff --git a/extensions/source/logging/logger.cxx b/extensions/source/logging/logger.cxx
index e692919c78a2..9bdd202fcbc0 100644
--- a/extensions/source/logging/logger.cxx
+++ b/extensions/source/logging/logger.cxx
@@ -181,11 +181,11 @@ namespace logging
         ,m_nLogLevel( LogLevel::OFF )
         ,m_sName( _rName )
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             initializeLoggerFromConfiguration( m_aContext, this );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //--------------------------------------------------------------------
@@ -267,7 +267,7 @@ namespace logging
             m_sName,
             _rMessage,
             _nLevel,
-            osl_incrementInterlockedCount( &m_nEventNumber )
+            osl_atomic_increment( &m_nEventNumber )
         ) );
     }
 
@@ -280,7 +280,7 @@ namespace logging
             _rSourceMethod,
             _rMessage,
             _nLevel,
-            osl_incrementInterlockedCount( &m_nEventNumber )
+            osl_atomic_increment( &m_nEventNumber )
         ) );
     }
 
diff --git a/extensions/source/ole/servprov.cxx b/extensions/source/ole/servprov.cxx
index cdfb6aafb37b..c133405a0348 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -151,7 +151,7 @@ STDMETHODIMP ProviderOleWrapper_Impl::QueryInterface(REFIID riid, void FAR* FAR*
 
 STDMETHODIMP_(ULONG) ProviderOleWrapper_Impl::AddRef()
 {
-    return osl_incrementInterlockedCount( &m_refCount);
+    return osl_atomic_increment( &m_refCount);
 }
 
 STDMETHODIMP_(ULONG) ProviderOleWrapper_Impl::Release()
@@ -297,7 +297,7 @@ STDMETHODIMP OneInstanceOleWrapper_Impl::QueryInterface(REFIID riid, void FAR* F
 
 STDMETHODIMP_(ULONG) OneInstanceOleWrapper_Impl::AddRef()
 {
-    return osl_incrementInterlockedCount( &m_refCount);
+    return osl_atomic_increment( &m_refCount);
 }
 
 STDMETHODIMP_(ULONG) OneInstanceOleWrapper_Impl::Release()
diff --git a/extensions/source/ole/unoconversionutilities.hxx b/extensions/source/ole/unoconversionutilities.hxx
index 97782cca32ba..27245af578fc 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -2076,7 +2076,7 @@ void UnoConversionUtilities<T>::dispatchExObject2Sequence( const VARIANTARG* pva
                 // just copy the pointer of the uno_Sequence
                 // nelementSize should be 4 !!!!
                 memcpy( pDest, &p_unoSeq, nelementSize);
-                osl_incrementInterlockedCount( &p_unoSeq->nRefCount);
+                osl_atomic_increment( &p_unoSeq->nRefCount);
             }
             else // Element type is no Sequence -> do one conversion
             {
diff --git a/extensions/source/propctrlr/composeduiupdate.cxx b/extensions/source/propctrlr/composeduiupdate.cxx
index 0512dad4bf82..5104f15fbf65 100644
--- a/extensions/source/propctrlr/composeduiupdate.cxx
+++ b/extensions/source/propctrlr/composeduiupdate.cxx
@@ -232,13 +232,13 @@ namespace pcr
     //----------------------------------------------------------------
     void SAL_CALL CachedInspectorUI::acquire() throw()
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
     }
 
     //----------------------------------------------------------------
     void SAL_CALL CachedInspectorUI::release() throw()
     {
-        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        if ( 0 == osl_atomic_decrement( &m_refCount ) )
             delete this;
     }
 
@@ -789,14 +789,14 @@ namespace pcr
     void SAL_CALL ComposedPropertyUIUpdate::suspendAutoFire()
     {
         impl_checkDisposed();
-        osl_incrementInterlockedCount( &m_nSuspendCounter );
+        osl_atomic_increment( &m_nSuspendCounter );
     }
 
     //--------------------------------------------------------------------
     void SAL_CALL ComposedPropertyUIUpdate::resumeAutoFire()
     {
         impl_checkDisposed();
-        if ( 0 == osl_decrementInterlockedCount( &m_nSuspendCounter ) )
+        if ( 0 == osl_atomic_decrement( &m_nSuspendCounter ) )
             impl_fireAll_throw();
     }
 
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 813bd93ce98b..acf8a9ab7ebf 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -3004,12 +3004,12 @@ namespace pcr
 
             virtual oslInterlockedCount SAL_CALL acquire()
             {
-                return osl_incrementInterlockedCount( &m_refCount );
+                return osl_atomic_increment( &m_refCount );
             }
 
             virtual oslInterlockedCount SAL_CALL release()
             {
-                if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+                if ( 0 == osl_atomic_decrement( &m_refCount ) )
                 {
                     delete this;
                     return 0;
diff --git a/extensions/source/propctrlr/formcontroller.cxx b/extensions/source/propctrlr/formcontroller.cxx
index 8956acb854a5..0c7e71063ab5 100644
--- a/extensions/source/propctrlr/formcontroller.cxx
+++ b/extensions/source/propctrlr/formcontroller.cxx
@@ -90,7 +90,7 @@ namespace pcr
         ,FormController_PropertyBase1( m_aBHelper )
         ,m_aServiceDescriptor( _aServiceDescriptor )
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             Reference< XObjectInspectorModel > xModel(
                 *(new DefaultFormComponentInspectorModel( _rxContext, _bUseFormFormComponentHandlers )),
@@ -98,7 +98,7 @@ namespace pcr
             );
             setInspectorModel( xModel );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/formgeometryhandler.cxx b/extensions/source/propctrlr/formgeometryhandler.cxx
index 3a9d88d3bd7c..af89b028d16c 100644
--- a/extensions/source/propctrlr/formgeometryhandler.cxx
+++ b/extensions/source/propctrlr/formgeometryhandler.cxx
@@ -784,7 +784,7 @@ namespace pcr
     //--------------------------------------------------------------------
     void ShapeGeometryChangeNotifier::impl_init_nothrow()
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         try
         {
             Reference< XPropertySet > xShapeProperties( m_xShape, UNO_QUERY_THROW );
@@ -794,7 +794,7 @@ namespace pcr
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/formmetadata.cxx b/extensions/source/propctrlr/formmetadata.cxx
index 8d5cadcacb67..7b96b8d73676 100644
--- a/extensions/source/propctrlr/formmetadata.cxx
+++ b/extensions/source/propctrlr/formmetadata.cxx
@@ -685,13 +685,13 @@ namespace pcr
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::acquire()
     {
-        return osl_incrementInterlockedCount( &m_refCount );
+        return osl_atomic_increment( &m_refCount );
     }
 
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL DefaultEnumRepresentation::release()
     {
-        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        if ( 0 == osl_atomic_decrement( &m_refCount ) )
         {
            delete this;
            return 0;
diff --git a/extensions/source/propctrlr/genericpropertyhandler.cxx b/extensions/source/propctrlr/genericpropertyhandler.cxx
index 4d19034ce73e..3a06449f0151 100644
--- a/extensions/source/propctrlr/genericpropertyhandler.cxx
+++ b/extensions/source/propctrlr/genericpropertyhandler.cxx
@@ -202,13 +202,13 @@ namespace pcr
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL EnumRepresentation::acquire()
     {
-        return osl_incrementInterlockedCount( &m_refCount );
+        return osl_atomic_increment( &m_refCount );
     }
 
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL EnumRepresentation::release()
     {
-        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        if ( 0 == osl_atomic_decrement( &m_refCount ) )
         {
            delete this;
            return 0;
@@ -249,11 +249,11 @@ namespace pcr
         if ( !_rxControl.is() )
             throw NullPointerException();
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             _rxControl->addActionListener( this );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
         OSL_ENSURE( m_refCount > 0, "UrlClickHandler::UrlClickHandler: leaking!" );
 
         DBG_CTOR( UrlClickHandler, NULL );
diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx
index ecc18697fb23..aaa95754be90 100644
--- a/extensions/source/propctrlr/propcontroller.cxx
+++ b/extensions/source/propctrlr/propcontroller.cxx
@@ -355,11 +355,11 @@ namespace pcr
     //------------------------------------------------------------------------
     void OPropertyBrowserController::createWithModel( const Reference< XObjectInspectorModel >& _rxModel )
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             setInspectorModel( _rxModel );
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
 
         m_bConstructed = true;
     }
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 1d6aea4574c0..3869dbd2a9aa 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -100,7 +100,7 @@ namespace pcr
         if ( m_aSlaveHandlers.empty() )
             throw IllegalArgumentException();
 
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         {
             Reference< XPropertyChangeListener > xMeMyselfAndI( this );
             for (   HandlerArray::const_iterator loop = m_aSlaveHandlers.begin();
@@ -113,7 +113,7 @@ namespace pcr
                 (*loop)->addPropertyChangeListener( xMeMyselfAndI );
             }
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //--------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/sqlcommanddesign.cxx b/extensions/source/propctrlr/sqlcommanddesign.cxx
index 96d164c50953..c6405ea43631 100644
--- a/extensions/source/propctrlr/sqlcommanddesign.cxx
+++ b/extensions/source/propctrlr/sqlcommanddesign.cxx
@@ -222,7 +222,7 @@ namespace pcr
         OSL_PRECOND( !isActive(),
             "SQLCommandDesigner::impl_doOpenDesignerFrame_nothrow: already active!" );
         OSL_PRECOND( m_xConnection.is(), "SQLCommandDesigner::impl_doOpenDesignerFrame_nothrow: this will crash!" );
-        osl_incrementInterlockedCount(&m_refCount);
+        osl_atomic_increment(&m_refCount);
 
         try
         {
@@ -279,7 +279,7 @@ namespace pcr
             DBG_UNHANDLED_EXCEPTION();
             m_xDesigner.clear();
         }
-        osl_decrementInterlockedCount(&m_refCount);
+        osl_atomic_decrement(&m_refCount);
     }
 
     //------------------------------------------------------------------------
diff --git a/extensions/source/propctrlr/xsddatatypes.cxx b/extensions/source/propctrlr/xsddatatypes.cxx
index 547abdbf948a..e7e82310c9cd 100644
--- a/extensions/source/propctrlr/xsddatatypes.cxx
+++ b/extensions/source/propctrlr/xsddatatypes.cxx
@@ -107,13 +107,13 @@ namespace pcr
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL XSDDataType::acquire()
     {
-        return osl_incrementInterlockedCount( &m_refCount );
+        return osl_atomic_increment( &m_refCount );
     }
 
     //--------------------------------------------------------------------
     oslInterlockedCount SAL_CALL XSDDataType::release()
     {
-        if ( 0 == osl_decrementInterlockedCount( &m_refCount ) )
+        if ( 0 == osl_atomic_decrement( &m_refCount ) )
         {
            delete this;
            return 0;