Kaydet (Commit) 4789eab6 authored tarafından Noel Grandin's avatar Noel Grandin

use SimpleReferenceObject in vcl/osx module

to replace hand-rolled version

Change-Id: Idf3f2dd20bacd3cb3de64931027ef62d9116200f
üst bc30f938
...@@ -23,10 +23,11 @@ ...@@ -23,10 +23,11 @@
#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessible.hpp>
#include <rtl/ref.hxx> #include <rtl/ref.hxx>
#include <salhelper/simplereferenceobject.hxx>
// - KeyboardFocusListener - // - KeyboardFocusListener -
class KeyboardFocusListener : public rtl::IReference class KeyboardFocusListener : public salhelper::SimpleReferenceObject
{ {
public: public:
virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0; virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) = 0;
......
...@@ -81,16 +81,4 @@ AquaA11yFocusListener::focusedObjectChanged(const Reference< XAccessible >& xAcc ...@@ -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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -20,14 +20,10 @@ ...@@ -20,14 +20,10 @@
#ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX #ifndef INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
#define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX #define INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
#include <salhelper/refobj.hxx>
#include "osx/keyboardfocuslistener.hxx" #include "osx/keyboardfocuslistener.hxx"
#include "osx/osxvcltypes.h" #include "osx/osxvcltypes.h"
class AquaA11yFocusListener : class AquaA11yFocusListener : public KeyboardFocusListener
public KeyboardFocusListener,
public salhelper::ReferenceObject
{ {
id m_focusedObject; id m_focusedObject;
...@@ -43,10 +39,6 @@ public: ...@@ -43,10 +39,6 @@ public:
// KeyboardFocusListener // KeyboardFocusListener
virtual void SAL_CALL focusedObjectChanged(const ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& xAccessible) SAL_OVERRIDE; 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 #endif // INCLUDED_VCL_OSX_A11YFOCUSLISTENER_HXX
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment