From d0b5b9ca886fe4a518ae86f5799fd5b1f17e4c38 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Tue, 26 Nov 2013 20:33:32 +0100 Subject: winaccessibility: remove AccEventListener::m_isDisposed It's disposed iff m_xAccessible is 0. Change-Id: I3f8bc104784adf82be43bcaf43b7573a9897f82a (cherry picked from commit a2afe344c6badf432983ce341d4154441837baf3) --- winaccessibility/inc/AccEventListener.hxx | 2 -- winaccessibility/source/service/AccEventListener.cxx | 5 ----- 2 files changed, 7 deletions(-) diff --git a/winaccessibility/inc/AccEventListener.hxx b/winaccessibility/inc/AccEventListener.hxx index f17fb2fba828..8f544005bba6 100644 --- a/winaccessibility/inc/AccEventListener.hxx +++ b/winaccessibility/inc/AccEventListener.hxx @@ -44,8 +44,6 @@ protected: com::sun::star::accessibility::XAccessible> m_xAccessible; //agent pointer for objects' manager AccObjectManagerAgent* pAgent; - //disposed state indicator - bool m_isDisposed; public: AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); virtual ~AccEventListener(); diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx index d52b1142882d..73b043111f69 100644 --- a/winaccessibility/source/service/AccEventListener.cxx +++ b/winaccessibility/source/service/AccEventListener.cxx @@ -47,7 +47,6 @@ AccEventListener::AccEventListener(com::sun::star::accessibility::XAccessible* p AccObjectManagerAgent* Agent) : m_xAccessible(pAcc) , pAgent(Agent) - , m_isDisposed(false) {} AccEventListener::~AccEventListener() @@ -230,9 +229,6 @@ void AccEventListener::RemoveMeFromBroadcaster() { try { - if(m_isDisposed) - return; - if (!m_xAccessible.is()) { return; @@ -243,7 +239,6 @@ void AccEventListener::RemoveMeFromBroadcaster() { //remove the lister from accessible object xBroadcaster->removeAccessibleEventListener(this); - m_isDisposed = true; pAgent->NotifyDestroy(m_xAccessible.get()); } m_xAccessible.clear(); // release cyclic reference -- cgit