winaccessibility: fix exception handling in AccEventListener

RemoveMeFromBroadcaster() may catch a DisposedException and then not
call NotifyDestroy.

Change-Id: I2b766541c3e6800c88a83aa482de0093714d39c2

1 files changed, 12 insertions, 6 deletions

diff --git a/winaccessibility/source/service/AccEventListener.cxx b/winaccessibility/source/service/AccEventListener.cxx
index 73b043111f69..7874f4706321 100644
--- a/winaccessibility/source/service/AccEventListener.cxx
+++ b/winaccessibility/source/service/AccEventListener.cxx
@@ -233,14 +233,20 @@ void AccEventListener::RemoveMeFromBroadcaster()
         {
             return;
         }
-        Reference<XAccessibleEventBroadcaster> const xBroadcaster(
-                m_xAccessible->getAccessibleContext(), UNO_QUERY);
-        if (xBroadcaster.is())
+        try
         {
-            //remove the lister from accessible object
-            xBroadcaster->removeAccessibleEventListener(this);
-            pAgent->NotifyDestroy(m_xAccessible.get());
+            Reference<XAccessibleEventBroadcaster> const xBroadcaster(
+                    m_xAccessible->getAccessibleContext(), UNO_QUERY);
+            if (xBroadcaster.is())
+            {
+                //remove the lister from accessible object
+                xBroadcaster->removeAccessibleEventListener(this);
+            }
         }
+        catch (Exception const&)
+        {   // may throw if it's already disposed - ignore that
+        }
+        pAgent->NotifyDestroy(m_xAccessible.get());
         m_xAccessible.clear(); // release cyclic reference
     }
     catch(...)