coverity#982160 unchecked return value

Change-Id: I94117e9f53f1929906b88b2a31d0fcfdf2e40c8d

1 files changed, 13 insertions, 1 deletions

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 5a37e12ddfa4..3c2cdb1b57d2 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -1025,7 +1025,19 @@ namespace accessibility
     void SAL_CALL AccessibleEditableTextPara::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) throw (uno::RuntimeException, std::exception)
     {
         if( getNotifierClientId() != -1 )
-            ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
+        {
+            const sal_Int32 nListenerCount = ::comphelper::AccessibleEventNotifier::removeEventListener( getNotifierClientId(), xListener );
+            if ( !nListenerCount )
+            {
+                // no listeners anymore
+                // -> revoke ourself. This may lead to the notifier thread dying (if we were the last client),
+                // and at least to us not firing any events anymore, in case somebody calls
+                // NotifyAccessibleEvent, again
+                ::comphelper::AccessibleEventNotifier::TClientId nId( getNotifierClientId() );
+                mnNotifierClientId = -1;
+                ::comphelper::AccessibleEventNotifier::revokeClient( nId );
+            }
+        }
     }
 
     // XAccessibleComponent