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>

5 files changed, 10 insertions, 10 deletions

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index e85e8ca78d52..4bedcc0fdbfc 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -764,10 +764,10 @@ SdStyleSheet* SdStyleSheet::CreateEmptyUserStyle( SfxStyleSheetBasePool& rPool,
 
 void SAL_CALL SdStyleSheet::release(  ) throw ()
 {
-    if (osl_decrementInterlockedCount( &m_refCount ) == 0)
+    if (osl_atomic_decrement( &m_refCount ) == 0)
     {
         // restore reference count:
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         if (! mrBHelper.bDisposed) try
         {
             dispose();
diff --git a/sd/source/helper/simplereferencecomponent.cxx b/sd/source/helper/simplereferencecomponent.cxx
index 353a9e996b00..3dbb39daee47 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -51,7 +51,7 @@ SimpleReferenceComponent::~SimpleReferenceComponent()
 
 void SimpleReferenceComponent::acquire()
 {
-    osl_incrementInterlockedCount(&m_nCount);
+    osl_atomic_increment(&m_nCount);
 }
 
 void SimpleReferenceComponent::release()
@@ -75,7 +75,7 @@ void SimpleReferenceComponent::release()
         }
     }
 
-    if(osl_decrementInterlockedCount(&m_nCount) == 0) delete this;
+    if(osl_atomic_decrement(&m_nCount) == 0) delete this;
 }
 
 void SimpleReferenceComponent::Dispose()
diff --git a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
index fae7729860c7..0f75235624ee 100644
--- a/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
+++ b/sd/source/ui/toolpanel/ToolPanelViewShell.cxx
@@ -297,11 +297,11 @@ ConfigurationListener::ConfigurationListener( ToolPanelViewShell_Impl& i_rShellI
         xBroadcaster.set( pFrameworkHelper->GetConfigurationController().get() );
     ENSURE_OR_THROW( pFrameworkHelper.get(), "no access to the config controller" );
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         xBroadcaster->addConfigurationChangeListener( this, ::rtl::OUString(), Any() );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 // ---------------------------------------------------------------------------------------------------------------------
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 264fdec356eb..88b43ad7e4c8 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -284,10 +284,10 @@ void SAL_CALL SdXImpressDocument::acquire() throw ( )
 
 void SAL_CALL SdXImpressDocument::release() throw ( )
 {
-    if (osl_decrementInterlockedCount( &m_refCount ) == 0)
+    if (osl_atomic_decrement( &m_refCount ) == 0)
     {
         // restore reference count:
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         if(!mbDisposed)
         {
             try
diff --git a/sd/workben/custompanel/ctp_panel.cxx b/sd/workben/custompanel/ctp_panel.cxx
index c87611101f94..85a976313ed9 100644
--- a/sd/workben/custompanel/ctp_panel.cxx
+++ b/sd/workben/custompanel/ctp_panel.cxx
@@ -132,7 +132,7 @@ namespace sd { namespace colortoolpanel
         {
             DBG_UNHANDLED_EXCEPTION();
         }
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         if ( xParentWindow.is() )
         {
             m_xWindow = lcl_createPlainWindow_nothrow( m_xContext, xParentPeer );
@@ -144,7 +144,7 @@ namespace sd { namespace colortoolpanel
                 m_xWindow->setVisible( sal_True );
             }
         }
-        osl_decrementInterlockedCount( &m_refCount );
+        osl_atomic_decrement( &m_refCount );
     }
 
     //------------------------------------------------------------------------------------------------------------------