sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 4db9d6927cf6da214bf636e694f644984ee8703d
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 29 20:04:37 2024 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon Sep 2 11:14:49 2024 +0200
cid#1607212 Check of thread-shared field evades lock acquisition
it changed to this at:
commit 0c876d497dd3320cbc06cf21b7b14ab859755bac
AccessibleEventNotifier AccessibleSlideSorterObject (sd)
Change-Id: I8b272b8466a05f817eb9cad5673920b54b599a37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172614
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
(cherry picked from commit 42546d4a0a6f73bf2408108a767be91030cc17f6)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172683
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index 61749bda2b0b..fa1a804b6715 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -251,11 +251,14 @@ void SAL_CALL
AccessibleSlideSorterObject::removeAccessibleEventListener(
const Reference<XAccessibleEventListener>& rxListener)
{
ThrowIfDisposed();
- if (!(rxListener.is() && mnClientId))
+ if (!rxListener.is())
return;
const std::unique_lock aGuard(m_aMutex);
+ if (!mnClientId)
+ return;
+
sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( mnClientId,
rxListener );
if ( !nListenerCount )
{
