mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

winaccessibility: remove AccEventListener::m_isDisposed

Browse Source 
It's disposed iff m_xAccessible is 0.

Change-Id: I3f8bc104784adf82be43bcaf43b7573a9897f82a
This commit is contained in:
Michael Stahl
2013-11-26 20:33:32 +01:00
parent 83ccdb0285
commit a2afe344c6
2 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
winaccessibility/inc/AccEventListener.hxx
View File

@@ -44,8 +44,6 @@ protected:
com::sun::star::accessibility::XAccessible> m_xAccessible; com::sun::star::accessibility::XAccessible> m_xAccessible;
//agent pointer for objects' manager //agent pointer for objects' manager
AccObjectManagerAgent* pAgent; AccObjectManagerAgent* pAgent;
//disposed state indicator
bool m_isDisposed;
public: public:
AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent); AccEventListener( com::sun::star::accessibility::XAccessible* pAcc, AccObjectManagerAgent* Agent);
virtual ~AccEventListener(); virtual ~AccEventListener();

5
winaccessibility/source/service/AccEventListener.cxx
View File

@@ -47,7 +47,6 @@ AccEventListener::AccEventListener(com::sun::star::accessibility::XAccessible* p
AccObjectManagerAgent* Agent) AccObjectManagerAgent* Agent)
: m_xAccessible(pAcc) : m_xAccessible(pAcc)
, pAgent(Agent) , pAgent(Agent)
, m_isDisposed(false)
{} {}
AccEventListener::~AccEventListener() AccEventListener::~AccEventListener()
@@ -230,9 +229,6 @@ void AccEventListener::RemoveMeFromBroadcaster()
{ {
try try
{ {
if(m_isDisposed)
return;
if (!m_xAccessible.is()) if (!m_xAccessible.is())
{ {
return; return;
@@ -243,7 +239,6 @@ void AccEventListener::RemoveMeFromBroadcaster()
{ {
//remove the lister from accessible object //remove the lister from accessible object
xBroadcaster->removeAccessibleEventListener(this); xBroadcaster->removeAccessibleEventListener(this);
m_isDisposed = true;
pAgent->NotifyDestroy(m_xAccessible.get()); pAgent->NotifyDestroy(m_xAccessible.get());
} }
m_xAccessible.clear(); // release cyclic reference m_xAccessible.clear(); // release cyclic reference