From 4592d27dca75e73218ddca2039b1a1332adc828c Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Tue, 21 Apr 2015 08:39:10 +0200
Subject: Get rid of trivial comphelper::in-/decrement wrappers

Change-Id: Id3a12ef9d56c30719f483e610c8a8b08caf05def
---
 svx/source/form/fmshimp.cxx                 | 4 ++--
 svx/source/form/formcontroller.cxx          | 5 ++---
 svx/source/form/formdispatchinterceptor.cxx | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

(limited to 'svx/source')

diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index e03d9a076051..c82c85e78231 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -654,10 +654,10 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
     m_xAttachedFrame = _pViewFrame->GetFrame().GetFrameInterface();
 
     // to prevent deletion of this we acquire our refcounter once
-    ::comphelper::increment(FmXFormShell_BASE::m_refCount);
+    osl_atomic_increment(&m_refCount);
 
     // correct the refcounter
-    ::comphelper::decrement(FmXFormShell_BASE::m_refCount);
+    osl_atomic_decrement(&m_refCount);
 
     // cache the current configuration settings we're interested in
     implAdjustConfigCache();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 04fddee8576e..90daba66ed28 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -71,7 +71,6 @@
 #include <comphelper/propagg.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequence.hxx>
-#include <comphelper/uno3.hxx>
 #include <comphelper/flagguard.hxx>
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/supportsservice.hxx>
@@ -570,13 +569,13 @@ FormController::FormController(const Reference< css::uno::XComponentContext > &
                   ,m_bSuspendFilterTextListening( false )
 {
 
-    ::comphelper::increment(m_refCount);
+    osl_atomic_increment(&m_refCount);
     {
         m_xTabController = TabController::create( m_xComponentContext );
         m_xAggregate = Reference< XAggregation >( m_xTabController, UNO_QUERY_THROW );
         m_xAggregate->setDelegator( *this );
     }
-    ::comphelper::decrement(m_refCount);
+    osl_atomic_decrement(&m_refCount);
 
     m_aTabActivationIdle.SetPriority( SchedulerPriority::LOWEST );
     m_aTabActivationIdle.SetIdleHdl( LINK( this, FormController, OnActivateTabOrder ) );
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index 603f27421f1b..318fa8e116cd 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -52,7 +52,7 @@ namespace svxform
     {
 
         ::osl::MutexGuard aGuard( *m_pMutex );
-        ::comphelper::increment(m_refCount);
+        osl_atomic_increment(&m_refCount);
         if (_rxToIntercept.is())
         {
             _rxToIntercept->registerDispatchProviderInterceptor((XDispatchProviderInterceptor*)this);
@@ -65,7 +65,7 @@ namespace svxform
                 m_bListening = true;
             }
         }
-        ::comphelper::decrement(m_refCount);
+        osl_atomic_decrement(&m_refCount);
     }
 
 
-- 
cgit