use SimpleReferenceObject in svtools module

to replace hand-rolled version

Change-Id: I7a1048ff1ea335c3934fe7e91a09489a4d7aeb96

10 files changed, 15 insertions, 147 deletions

diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 4704e4f28ed8..02f9dfb212ce 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -52,14 +52,7 @@ namespace svt
         protected:
             virtual ~AccessibleDummyFactory();
 
-        private:
-            oslInterlockedCount m_refCount;
-
         public:
-            // IReference
-            virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
-            virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
             // IAccessibleFactory
             virtual IAccessibleTabListBox*
                 createAccessibleTabListBox(
@@ -205,7 +198,6 @@ namespace svt
 
 
         AccessibleDummyFactory::AccessibleDummyFactory()
-            : m_refCount(0)
         {
         }
 
@@ -214,22 +206,6 @@ namespace svt
         {
         }
 
-
-        oslInterlockedCount SAL_CALL AccessibleDummyFactory::acquire()
-        {
-            return osl_atomic_increment( &m_refCount );
-        }
-
-
-        oslInterlockedCount SAL_CALL AccessibleDummyFactory::release()
-        {
-            if ( 0 == osl_atomic_decrement( &m_refCount ) )
-            {
-                delete this;
-                return 0;
-            }
-            return m_refCount;
-        }
     }
 
 
diff --git a/svtools/source/table/defaultinputhandler.cxx b/svtools/source/table/defaultinputhandler.cxx
index ff006aa711a3..292121eefb6f 100644
--- a/svtools/source/table/defaultinputhandler.cxx
+++ b/svtools/source/table/defaultinputhandler.cxx
@@ -32,7 +32,7 @@ namespace svt { namespace table
 {
 
 
-    typedef ::rtl::Reference< IMouseFunction >  PMouseFunction;
+    typedef ::rtl::Reference< MouseFunction >  PMouseFunction;
     typedef ::std::vector< PMouseFunction >     MouseFunctions;
     struct DefaultInputHandler_Impl
     {
@@ -61,7 +61,7 @@ namespace svt { namespace table
     namespace
     {
         bool lcl_delegateMouseEvent( DefaultInputHandler_Impl& i_impl, ITableControl& i_control, const MouseEvent& i_event,
-            FunctionResult ( IMouseFunction::*i_handlerMethod )( ITableControl&, const MouseEvent& ) )
+            FunctionResult ( MouseFunction::*i_handlerMethod )( ITableControl&, const MouseEvent& ) )
         {
             if ( i_impl.pActiveFunction.is() )
             {
@@ -118,19 +118,19 @@ namespace svt { namespace table
 
     bool DefaultInputHandler::MouseMove( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
-        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseMove );
+        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &MouseFunction::handleMouseMove );
     }
 
 
     bool DefaultInputHandler::MouseButtonDown( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
-        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseDown );
+        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &MouseFunction::handleMouseDown );
     }
 
 
     bool DefaultInputHandler::MouseButtonUp( ITableControl& i_tableControl, const MouseEvent& i_event )
     {
-        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &IMouseFunction::handleMouseUp );
+        return lcl_delegateMouseEvent( *m_pImpl, i_tableControl, i_event, &MouseFunction::handleMouseUp );
     }
 
 
diff --git a/svtools/source/table/mousefunction.cxx b/svtools/source/table/mousefunction.cxx
index f921435c7901..dcd55b0797ae 100644
--- a/svtools/source/table/mousefunction.cxx
+++ b/svtools/source/table/mousefunction.cxx
@@ -30,27 +30,6 @@ namespace svt { namespace table
 
 
 
-    //= MouseFunction
-
-
-    oslInterlockedCount MouseFunction::acquire()
-    {
-        return osl_atomic_increment( &m_refCount );
-    }
-
-
-    oslInterlockedCount MouseFunction::release()
-    {
-        oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
-        if ( newCount == 0 )
-        {
-            delete this;
-            return 0;
-        }
-        return newCount;
-    }
-
-
     //= ColumnResize
 
 
diff --git a/svtools/source/table/mousefunction.hxx b/svtools/source/table/mousefunction.hxx
index 71f7aa032cc2..6256259e6bd6 100644
--- a/svtools/source/table/mousefunction.hxx
+++ b/svtools/source/table/mousefunction.hxx
@@ -23,6 +23,7 @@
 #include <svtools/table/tabletypes.hxx>
 
 #include <rtl/ref.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 
 #include <boost/noncopyable.hpp>
 
@@ -48,40 +49,18 @@ namespace svt { namespace table
     };
 
 
-    //= IMouseFunction
+    //= MouseFunction
 
-    class IMouseFunction : public ::rtl::IReference, public ::boost::noncopyable
+    class MouseFunction : public ::salhelper::SimpleReferenceObject, public ::boost::noncopyable
     {
     public:
+        MouseFunction() {}
         virtual FunctionResult  handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
         virtual FunctionResult  handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
         virtual FunctionResult  handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) = 0;
 
     protected:
-        virtual ~IMouseFunction() { }
-    };
-
-
-    //= MouseFunction
-
-    class MouseFunction : public IMouseFunction
-    {
-    public:
-        MouseFunction()
-            :m_refCount( 0 )
-        {
-        }
-    protected:
-        virtual ~MouseFunction()
-        {
-        }
-
-    public:
-        virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE;
-        virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE;
-
-    private:
-        oslInterlockedCount m_refCount;
+        virtual ~MouseFunction() { }
     };
 
 
@@ -96,7 +75,7 @@ namespace svt { namespace table
         }
 
     public:
-        // IMouseFunction
+        // MouseFunction
         virtual FunctionResult  handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
@@ -117,7 +96,7 @@ namespace svt { namespace table
         }
 
     public:
-        // IMouseFunction
+        // MouseFunction
         virtual FunctionResult  handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
@@ -138,7 +117,7 @@ namespace svt { namespace table
         }
 
     public:
-        // IMouseFunction
+        // MouseFunction
         virtual FunctionResult  handleMouseMove( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseDown( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
         virtual FunctionResult  handleMouseUp( ITableControl& i_tableControl, MouseEvent const & i_event ) SAL_OVERRIDE;
diff --git a/svtools/source/toolpanel/drawerlayouter.cxx b/svtools/source/toolpanel/drawerlayouter.cxx
index 565d8588ec27..97ff39552519 100644
--- a/svtools/source/toolpanel/drawerlayouter.cxx
+++ b/svtools/source/toolpanel/drawerlayouter.cxx
@@ -57,9 +57,6 @@ namespace svt
     }
 
 
-    IMPLEMENT_IREFERENCE( DrawerDeckLayouter )
-
-
     Rectangle DrawerDeckLayouter::Layout( const Rectangle& i_rDeckPlayground )
     {
         const size_t nPanelCount( m_rPanelDeck.GetPanelCount() );
diff --git a/svtools/source/toolpanel/dummypanel.cxx b/svtools/source/toolpanel/dummypanel.cxx
index 1b40bf04fc6f..95dffda0f0a2 100644
--- a/svtools/source/toolpanel/dummypanel.cxx
+++ b/svtools/source/toolpanel/dummypanel.cxx
@@ -42,9 +42,6 @@ namespace svt
     }
 
 
-    IMPLEMENT_IREFERENCE( DummyPanel )
-
-
     void DummyPanel::Activate( Window& )
     {
     }
diff --git a/svtools/source/toolpanel/dummypanel.hxx b/svtools/source/toolpanel/dummypanel.hxx
index 0632786e911c..f4a884aaad27 100644
--- a/svtools/source/toolpanel/dummypanel.hxx
+++ b/svtools/source/toolpanel/dummypanel.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_SVTOOLS_SOURCE_TOOLPANEL_DUMMYPANEL_HXX
 
 #include <svtools/toolpanel/toolpanel.hxx>
-#include <svtools/toolpanel/refbase.hxx>
+#include <salhelper/simplereferenceobject.hxx>
 
 
 namespace svt
@@ -32,8 +32,7 @@ namespace svt
     //= DummyPanel
 
     /// is a dummy implementation of the IToolPanel interface
-    class DummyPanel    :public RefBase
-                        ,public IToolPanel
+    class DummyPanel    :public IToolPanel
     {
     public:
         DummyPanel();
@@ -52,8 +51,6 @@ namespace svt
                     CreatePanelAccessible(
                         const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& i_rParentAccessible
                     ) SAL_OVERRIDE;
-
-        DECLARE_IREFERENCE()
     };
 
 
diff --git a/svtools/source/toolpanel/refbase.cxx b/svtools/source/toolpanel/refbase.cxx
deleted file mode 100644
index 4ff9969330c6..000000000000
--- a/svtools/source/toolpanel/refbase.cxx
+++ /dev/null
@@ -1,50 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-
-#include <svtools/toolpanel/refbase.hxx>
-
-
-namespace svt
-{
-
-
-
-    //= RefBase
-
-
-    oslInterlockedCount SAL_CALL RefBase::acquire()
-    {
-        return osl_atomic_increment( &m_refCount );
-    }
-
-
-    oslInterlockedCount SAL_CALL RefBase::release()
-    {
-        oslInterlockedCount newCount = osl_atomic_decrement( &m_refCount );
-        if ( 0 == newCount )
-            delete this;
-        return newCount;
-    }
-
-
-} // namespace svt
-
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/toolpanel/tablayouter.cxx b/svtools/source/toolpanel/tablayouter.cxx
index 518b088e96f5..0f82dd40b0a4 100644
--- a/svtools/source/toolpanel/tablayouter.cxx
+++ b/svtools/source/toolpanel/tablayouter.cxx
@@ -92,9 +92,6 @@ namespace svt
     }
 
 
-    IMPLEMENT_IREFERENCE( TabDeckLayouter )
-
-
     TabItemContent TabDeckLayouter::GetTabItemContent() const
     {
         if ( lcl_checkDisposed( *m_pData ) )
diff --git a/svtools/source/toolpanel/toolpanel.cxx b/svtools/source/toolpanel/toolpanel.cxx
index b0e65c8e9161..59185651f733 100644
--- a/svtools/source/toolpanel/toolpanel.cxx
+++ b/svtools/source/toolpanel/toolpanel.cxx
@@ -38,10 +38,6 @@ namespace svt
     {
     }
 
-
-    IMPLEMENT_IREFERENCE( ToolPanelBase )
-
-
 } // namespace svt