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, 16 insertions, 16 deletions

diff --git a/sc/source/ui/Accessibility/AccessibleCell.cxx b/sc/source/ui/Accessibility/AccessibleCell.cxx
index 3b1705b4c784..60a035b4f0d2 100644
--- a/sc/source/ui/Accessibility/AccessibleCell.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCell.cxx
@@ -80,7 +80,7 @@ ScAccessibleCell::~ScAccessibleCell()
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessibleContextBase.cxx b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
index 9044530a1387..1245ed9dbe08 100644
--- a/sc/source/ui/Accessibility/AccessibleContextBase.cxx
+++ b/sc/source/ui/Accessibility/AccessibleContextBase.cxx
@@ -71,7 +71,7 @@ ScAccessibleContextBase::~ScAccessibleContextBase(void)
     if (!IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
index 0f72ad9ba4cf..febd32795a25 100644
--- a/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleCsvControl.cxx
@@ -272,7 +272,7 @@ void ScAccessibleCsvControl::implDispose()
     if( implIsAlive() )
     {
         // prevent multiple call of dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
index 0b826fa1f016..ffac59b95eaa 100644
--- a/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDataPilotControl.cxx
@@ -164,7 +164,7 @@ ScAccessibleDataPilotControl::~ScAccessibleDataPilotControl(void)
     if (!IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
@@ -542,7 +542,7 @@ ScAccessibleDataPilotButton::~ScAccessibleDataPilotButton(void)
     if (!IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 5f2ab065b98a..aa5f778e040c 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1243,7 +1243,7 @@ ScAccessibleDocument::~ScAccessibleDocument(void)
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index f3ccf181cf1f..f9c7736bc35d 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -1274,7 +1274,7 @@ ScAccessibleDocumentPagePreview::~ScAccessibleDocumentPagePreview(void)
     if (!ScAccessibleDocumentBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessibleEditObject.cxx b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
index 0ef44ef1020b..553f29374bfc 100644
--- a/sc/source/ui/Accessibility/AccessibleEditObject.cxx
+++ b/sc/source/ui/Accessibility/AccessibleEditObject.cxx
@@ -71,7 +71,7 @@ ScAccessibleEditObject::~ScAccessibleEditObject()
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index a0e9a71c8d3d..5af2ec182fbc 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -102,7 +102,7 @@ ScAccessiblePageHeader::~ScAccessiblePageHeader()
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
index 16e5d459bebc..bc98e1f0008d 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeaderArea.cxx
@@ -74,7 +74,7 @@ ScAccessiblePageHeaderArea::~ScAccessiblePageHeaderArea(void)
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
index 3161c39710bc..36f9b9778770 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewCell.cxx
@@ -67,7 +67,7 @@ ScAccessiblePreviewCell::~ScAccessiblePreviewCell()
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         // call dispose to inform object wich have a weak reference to this object
         dispose();
     }
diff --git a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
index 40e95da69131..3db344cb5d4e 100644
--- a/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePreviewTable.cxx
@@ -73,7 +73,7 @@ ScAccessiblePreviewTable::~ScAccessiblePreviewTable()
     if (!ScAccessibleContextBase::IsDefunc() && !rBHelper.bInDispose)
     {
         // increment refcount to prevent double call off dtor
-        osl_incrementInterlockedCount( &m_refCount );
+        osl_atomic_increment( &m_refCount );
         dispose();
     }
 }
diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx
index bc8c95478fd5..136f2316e64f 100644
--- a/sc/source/ui/unoobj/fielduno.cxx
+++ b/sc/source/ui/unoobj/fielduno.cxx
@@ -312,7 +312,7 @@ ScCellFieldsObj::~ScCellFieldsObj()
     delete mpEditSource;
 
     // increment refcount to prevent double call off dtor
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
 
     if (mpRefreshListeners)
     {
@@ -492,7 +492,7 @@ ScHeaderFieldsObj::~ScHeaderFieldsObj()
     delete mpEditSource;
 
     // increment refcount to prevent double call off dtor
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
 
     if (mpRefreshListeners)
     {
diff --git a/sc/source/ui/vba/vbawindow.cxx b/sc/source/ui/vba/vbawindow.cxx
index f56c79fc23b0..9aaf008b85ab 100644
--- a/sc/source/ui/vba/vbawindow.cxx
+++ b/sc/source/ui/vba/vbawindow.cxx
@@ -225,7 +225,7 @@ ScVbaWindow::init()
         the own refcount to be non-zero, otherwise this instance will be
         desctructed immediately! Guard the call to ActivePane() in try/catch to
         not miss the decrementation of the reference count on exception. */
-    osl_incrementInterlockedCount( &m_refCount );
+    osl_atomic_increment( &m_refCount );
     try
     {
        m_xPane = ActivePane();
@@ -233,7 +233,7 @@ ScVbaWindow::init()
     catch( uno::Exception& )
     {
     }
-    osl_decrementInterlockedCount( &m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 uno::Reference< beans::XPropertySet >