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>

3 files changed, 12 insertions, 12 deletions

diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx
index 0ddd918e84fa..32af6f6e2a7f 100644
--- a/svx/source/accessibility/AccessibleControlShape.cxx
+++ b/svx/source/accessibility/AccessibleControlShape.cxx
@@ -135,11 +135,11 @@ AccessibleControlShape::AccessibleControlShape (
     m_pChildManager = new OWrappedAccessibleChildrenManager( getProcessServiceFactory() );
     m_pChildManager->acquire();
 
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     {
         m_pChildManager->setOwningAccessible( this );
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 //-----------------------------------------------------------------------------
@@ -280,14 +280,14 @@ void AccessibleControlShape::Init()
                     OSL_VERIFY( xNativeControlContext->queryInterface( ::getCppuType( &m_xControlContextComponent ) ) >>= m_xControlContextComponent );
 
                     // aggregate the proxy
-                    osl_incrementInterlockedCount( &m_refCount );
+                    osl_atomic_increment( &m_refCount );
                     if ( m_xControlContextProxy.is() )
                     {
                         // At this point in time, the proxy has a ref count of exactly one - in m_xControlContextProxy.
                         // Remember to _not_ reset this member unles the delegator of the proxy has been reset, too!
                         m_xControlContextProxy->setDelegator( *this );
                     }
-                    osl_decrementInterlockedCount( &m_refCount );
+                    osl_atomic_decrement( &m_refCount );
 
                     m_bDisposeNativeContext = sal_True;
 
diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx
index 252c6ab29b21..dd67a8293147 100644
--- a/svx/source/accessibility/charmapacc.cxx
+++ b/svx/source/accessibility/charmapacc.cxx
@@ -57,11 +57,11 @@ SvxShowCharSetVirtualAcc::SvxShowCharSetVirtualAcc( SvxShowCharSet* pParent ) :
 ,mpParent( pParent )
 ,m_pTable(NULL)
 {
-    osl_incrementInterlockedCount(&m_refCount);
+    osl_atomic_increment(&m_refCount);
     {
         lateInit(this);
     }
-    osl_decrementInterlockedCount(&m_refCount);
+    osl_atomic_decrement(&m_refCount);
 }
 
 // -----------------------------------------------------------------------------
@@ -298,11 +298,11 @@ void SvxShowCharSetItem::ClearAccessible()
 SvxShowCharSetAcc::SvxShowCharSetAcc( SvxShowCharSetVirtualAcc* _pParent ) : OAccessibleSelectionHelper(new VCLExternalSolarLock())
   ,m_pParent( _pParent )
 {
-    osl_incrementInterlockedCount(&m_refCount);
+    osl_atomic_increment(&m_refCount);
     {
         lateInit(this);
     }
-    osl_decrementInterlockedCount(&m_refCount);
+    osl_atomic_decrement(&m_refCount);
 }
 
 // -----------------------------------------------------------------------------
@@ -641,11 +641,11 @@ SvxShowCharSetItemAcc::SvxShowCharSetItemAcc( SvxShowCharSetItem* pParent ) : OA
 ,mpParent( pParent )
 {
     OSL_ENSURE(pParent,"NO parent supplied!");
-    osl_incrementInterlockedCount(&m_refCount);
+    osl_atomic_increment(&m_refCount);
     { // #b6211265 #
         lateInit(this);
     }
-    osl_decrementInterlockedCount(&m_refCount);
+    osl_atomic_decrement(&m_refCount);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 3035a08abbb9..12732ab9597a 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -188,7 +188,7 @@ SvxRectCtlAccessibleContext::~SvxRectCtlAccessibleContext()
 
     if( IsAlive() )
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();      // set mpRepr = NULL & release all children
     }
 }
@@ -782,7 +782,7 @@ SvxRectCtlChildAccessibleContext::~SvxRectCtlChildAccessibleContext()
 
     if( IsAlive() )
     {
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();      // set mpRepr = NULL & release all children
     }
 }