Get rid of trivial comphelper::in-/decrement wrappers

Change-Id: Id3a12ef9d56c30719f483e610c8a8b08caf05def

3 files changed, 7 insertions, 8 deletions

diff --git a/sc/source/ui/unoobj/dispuno.cxx b/sc/source/ui/unoobj/dispuno.cxx
index ff084b900688..cf99598f3f49 100644
--- a/sc/source/ui/unoobj/dispuno.cxx
+++ b/sc/source/ui/unoobj/dispuno.cxx
@@ -18,7 +18,6 @@
  */
 
 #include <sfx2/viewfrm.hxx>
-#include <comphelper/uno3.hxx>
 #include <svx/dataaccessdescriptor.hxx>
 #include <svl/smplhint.hxx>
 #include <vcl/svapp.hxx>
@@ -58,7 +57,7 @@ ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pVi
         m_xIntercepted.set(uno::Reference<frame::XDispatchProviderInterception>(pViewShell->GetViewFrame()->GetFrame().GetFrameInterface(), uno::UNO_QUERY));
         if (m_xIntercepted.is())
         {
-            comphelper::increment( m_refCount );
+            osl_atomic_increment( &m_refCount );
 
             m_xIntercepted->registerDispatchProviderInterceptor(
                         static_cast<frame::XDispatchProviderInterceptor*>(this));
@@ -68,7 +67,7 @@ ScDispatchProviderInterceptor::ScDispatchProviderInterceptor(ScTabViewShell* pVi
             if (xInterceptedComponent.is())
                 xInterceptedComponent->addEventListener(static_cast<lang::XEventListener*>(this));
 
-            comphelper::decrement( m_refCount );
+            osl_atomic_decrement( &m_refCount );
         }
 
         StartListening(*pViewShell);
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 6bbc54010a72..2c84022e5c96 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -394,7 +394,7 @@ uno::Reference< uno::XAggregation> ScModelObj::GetFormatter()
     {
         // setDelegator veraendert den RefCount, darum eine Referenz selber halten
         // (direkt am m_refCount, um sich beim release nicht selbst zu loeschen)
-        comphelper::increment( m_refCount );
+        osl_atomic_increment( &m_refCount );
         // waehrend des queryInterface braucht man ein Ref auf das
         // SvNumberFormatsSupplierObj, sonst wird es geloescht.
         uno::Reference<util::XNumberFormatsSupplier> xFormatter(new SvNumberFormatsSupplierObj(pDocShell->GetDocument().GetFormatTable() ));
@@ -408,7 +408,7 @@ uno::Reference< uno::XAggregation> ScModelObj::GetFormatter()
 
         if (xNumberAgg.is())
             xNumberAgg->setDelegator( (cppu::OWeakObject*)this );
-        comphelper::decrement( m_refCount );
+        osl_atomic_decrement( &m_refCount );
     } // if ( !xNumberAgg.is() )
     return xNumberAgg;
 }
diff --git a/sc/source/ui/unoobj/shapeuno.cxx b/sc/source/ui/unoobj/shapeuno.cxx
index 43754db37c4a..432950168a53 100644
--- a/sc/source/ui/unoobj/shapeuno.cxx
+++ b/sc/source/ui/unoobj/shapeuno.cxx
@@ -19,7 +19,7 @@
 
 #include <sal/config.h>
 
-#include <comphelper/uno3.hxx>
+#include <comphelper/sequence.hxx>
 #include <svtools/unoevent.hxx>
 #include <svtools/unoimap.hxx>
 #include <svx/svdobj.hxx>
@@ -96,7 +96,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
       bIsNoteCaption(false),
       bInitializedNotifier(false)
 {
-    comphelper::increment( m_refCount );
+    osl_atomic_increment( &m_refCount );
 
     {
         mxShapeAgg = uno::Reference<uno::XAggregation>( xShape, uno::UNO_QUERY );
@@ -124,7 +124,7 @@ ScShapeObj::ScShapeObj( uno::Reference<drawing::XShape>& xShape ) :
         }
     }
 
-    comphelper::decrement( m_refCount );
+    osl_atomic_decrement( &m_refCount );
 }
 
 ScShapeObj::~ScShapeObj()