svtools/source/control/accessibleruler.cxx | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
New commits: commit 7a81b0263a4c87d600837a78a899c424e47c2ab4 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Aug 29 20:08:01 2024 +0100 Commit: Michael Stahl <[email protected]> CommitDate: Mon Sep 2 12:12:30 2024 +0200 cid#1607370 Check of thread-shared field evades lock acquisition apparently since: commit 8228227168a7eb3ebf14629bec87f01536c23970 CommitDate: Thu Dec 8 17:27:05 2016 +0000 convert OSL_ENSURE to assert in AccessibleEventNotifier Change-Id: If4ad0459e39e44a9417dd074560538f2a87586b8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172615 Tested-by: Caolán McNamara <[email protected]> Reviewed-by: Caolán McNamara <[email protected]> (cherry picked from commit 9626fe5447e0ce71e0d13a5cea5c323c77113304) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172684 Tested-by: Jenkins Reviewed-by: Michael Stahl <[email protected]> diff --git a/svtools/source/control/accessibleruler.cxx b/svtools/source/control/accessibleruler.cxx index 35cd3a92e53f..d0481f9106ea 100644 --- a/svtools/source/control/accessibleruler.cxx +++ b/svtools/source/control/accessibleruler.cxx @@ -230,11 +230,14 @@ void SAL_CALL SvtRulerAccessible::addAccessibleEventListener( const uno::Referen void SAL_CALL SvtRulerAccessible::removeAccessibleEventListener( const uno::Reference< XAccessibleEventListener >& xListener ) { - if (!(xListener.is() && mnClientId)) + if (!xListener.is()) return; std::unique_lock aGuard( m_aMutex ); + if (!mnClientId) + return; + sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, xListener ); if ( !nListenerCount ) {
