Accessibility for IconView

Change-Id: I65ca9d43f70a50e2e95aabfc3b8ba1b15f9ff8be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135226
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 25fd9532c758..591bbeafbba5 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -84,8 +84,7 @@ void SmGraphicAccessible::ClearWin()
 
     if ( nClientId )
     {
-        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( nClientId, *this );
-        nClientId =  0;
+        comphelper::AccessibleEventNotifier::revokeClientNotifyDisposing( std::exchange(nClientId, 0), *this );
     }
 }
 
@@ -391,8 +390,7 @@ void SAL_CALL SmGraphicAccessible::removeAccessibleEventListener(
         // -> 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::revokeClient( nClientId );
-        nClientId = 0;
+        comphelper::AccessibleEventNotifier::revokeClient( std::exchange(nClientId, 0) );
     }
 }