From ea91310384f2f677abc8e85ece54e71fba26ed0c Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 7 Jul 2014 10:55:06 +0200 Subject: use SimpleReferenceObject in accessibility to replace hand-rolled version Change-Id: I9dd8d02024702972722b43f2654db91eb3da3794 --- toolkit/Library_tk.mk | 1 + toolkit/source/helper/accessibilityclient.cxx | 25 ------------------------- 2 files changed, 1 insertion(+), 25 deletions(-) (limited to 'toolkit') diff --git a/toolkit/Library_tk.mk b/toolkit/Library_tk.mk index 9c2410e64474..5a219e0f3374 100644 --- a/toolkit/Library_tk.mk +++ b/toolkit/Library_tk.mk @@ -41,6 +41,7 @@ $(eval $(call gb_Library_use_libraries,tk,\ cppu \ cppuhelper \ sal \ + salhelper \ i18nlangtag \ tl \ utl \ diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx index 41ad0a28b0e4..7dc37943acae 100644 --- a/toolkit/source/helper/accessibilityclient.cxx +++ b/toolkit/source/helper/accessibilityclient.cxx @@ -58,14 +58,7 @@ namespace toolkit protected: virtual ~AccessibleDummyFactory(); - private: - oslInterlockedCount m_refCount; - public: - // IReference - virtual oslInterlockedCount SAL_CALL acquire() SAL_OVERRIDE; - virtual oslInterlockedCount SAL_CALL release() SAL_OVERRIDE; - // IAccessibleFactory ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessibleContext > createAccessibleContext( VCLXButton* /*_pXWindow*/ ) SAL_OVERRIDE @@ -131,7 +124,6 @@ namespace toolkit AccessibleDummyFactory::AccessibleDummyFactory() - : m_refCount(0) { } @@ -141,23 +133,6 @@ namespace toolkit } - 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; - } - - //= AccessibilityClient -- cgit