diff options
| author | Noel Grandin <noel@peralex.com> | 2014-07-09 13:49:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-07-10 11:06:03 +0200 |
| commit | 4789eab61c60466e5b6b7d7fad14b128fb851e6f (patch) | |
| tree | f28286cd0b244c6651ec8e7f1db410862321358a | |
| parent | bc30f938c0d27ee1ae20b0c10d3d8840557b2e93 (diff) | |
use SimpleReferenceObject in vcl/osx module
to replace hand-rolled version
Change-Id: Idf3f2dd20bacd3cb3de64931027ef62d9116200f
| -rw-r--r-- | vcl/inc/osx/keyboardfocuslistener.hxx | 3 | ||||
| -rw-r--r-- | vcl/osx/a11yfocuslistener.cxx | 12 | ||||
| -rw-r--r-- | vcl/osx/a11yfocuslistener.hxx | 10 |
3 files changed, 3 insertions, 22 deletions
diff --git a/vcl/inc/osx/keyboardfocuslistener.hxx b/vcl/inc/osx/keyboardfocuslistener.hxx index d31ac3123003..e9b652a8ec14 100644 --- a/vcl/inc/osx/keyboardfocuslistener.hxx +++ b/vcl/inc/osx/keyboardfocuslistener.hxx @@ -23,10 +23,11 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <rtl/ref.hxx> +#include <salhelper/simplereferenceobject.hxx> // - KeyboardFocusListener - -class KeyboardFocusListener : public rtl::IReference +class KeyboardFocusListener : public salhelper::SimpleReferenceObject { public: virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0; diff --git a/vcl/osx/a11yfocuslistener.cxx b/vcl/osx/a11yfocuslistener.cxx index 878d4c8b5c7f..398a5a24098b 100644 --- a/vcl/osx/a11yfocuslistener.cxx +++ b/vcl/osx/a11yfocuslistener.cxx @@ -81,16 +81,4 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc } } -oslInterlockedCount SAL_CALL -AquaA11yFocusListener::acquire() -{ - return ReferenceObject::acquire(); -} - -oslInterlockedCount SAL_CALL -AquaA11yFocusListener::release() -{ - return ReferenceObject::release(); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/a11yfocuslistener.hxx b/vcl/osx/a11yfocuslistener.hxx index 1f704305f32b..3b9ff0e9d5fa 100644 --- a/vcl/osx/a11yfocuslistener.hxx +++ b/vcl/osx/a11yfocuslistener.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX #define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX -#include <salhelper/refobj.hxx> - #include "osx/keyboardfocuslistener.hxx" #include "osx/osxvcltypes.h" -class AquaA11yFocusListener : - public KeyboardFocusListener, - public salhelper::ReferenceObject +class AquaA11yFocusListener : public KeyboardFocusListener { id m_focusedObject; @@ -43,10 +39,6 @@ public: // KeyboardFocusListener virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) SAL_OVERRIDE; - - // rtl::IReference - virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; - virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; }; #endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX |