sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 13 ++++++-------
sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 10 ++++------
2 files changed, 10 insertions(+), 13 deletions(-)
New commits:
commit c143160737e0aa6a44f7ca23392171b55091a120
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 27 15:31:04 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Dec 27 20:20:51 2021 +0100
use comphelper::WeakComponentImplHelper in AccessibleSlideSorterObject
Change-Id: I18a77111cf8285d5b66ce400624fa417fefc9e4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127563
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
index a9b757cc73ff..13fc60db0ab8 100644
--- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
+++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx
@@ -54,8 +54,7 @@ AccessibleSlideSorterObject::AccessibleSlideSorterObject(
const Reference<XAccessible>& rxParent,
::sd::slidesorter::SlideSorter& rSlideSorter,
sal_uInt16 nPageNumber)
- : AccessibleSlideSorterObjectBase(m_aMutex),
- mxParent(rxParent),
+ : mxParent(rxParent),
mnPageNumber(nPageNumber),
mrSlideSorter(rSlideSorter),
mnClientId(0)
@@ -86,7 +85,7 @@ void AccessibleSlideSorterObject::FireAccessibleEvent (
}
}
-void SAL_CALL AccessibleSlideSorterObject::disposing()
+void AccessibleSlideSorterObject::disposing(std::unique_lock<std::mutex>&)
{
// Send a disposing to all listeners.
if (mnClientId != 0)
@@ -234,7 +233,7 @@ void SAL_CALL
AccessibleSlideSorterObject::addAccessibleEventListener(
if (!rxListener.is())
return;
- const osl::MutexGuard aGuard(m_aMutex);
+ const std::unique_lock aGuard(m_aMutex);
if (IsDisposed())
{
@@ -256,7 +255,7 @@ void SAL_CALL
AccessibleSlideSorterObject::removeAccessibleEventListener(
if (!(rxListener.is() && mnClientId))
return;
- const osl::MutexGuard aGuard(m_aMutex);
+ const std::unique_lock aGuard(m_aMutex);
sal_Int32 nListenerCount =
comphelper::AccessibleEventNotifier::removeEventListener( mnClientId,
rxListener );
if ( !nListenerCount )
@@ -402,7 +401,7 @@ uno::Sequence< OUString> SAL_CALL
void AccessibleSlideSorterObject::ThrowIfDisposed()
{
- if (rBHelper.bDisposed || rBHelper.bInDispose)
+ if (m_bDisposed)
{
SAL_WARN("sd", "Calling disposed object. Throwing exception:");
throw lang::DisposedException ("object has been already disposed",
@@ -412,7 +411,7 @@ void AccessibleSlideSorterObject::ThrowIfDisposed()
bool AccessibleSlideSorterObject::IsDisposed() const
{
- return (rBHelper.bDisposed || rBHelper.bInDispose);
+ return m_bDisposed;
}
SdPage* AccessibleSlideSorterObject::GetPage() const
diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
index 5c9d0ad86aef..6da56a15236a 100644
--- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
+++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx
@@ -19,8 +19,7 @@
#pragma once
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
#include <com/sun/star/accessibility/XAccessible.hpp>
#include <com/sun/star/accessibility/XAccessibleContext.hpp>
#include <com/sun/star/accessibility/XAccessibleComponent.hpp>
@@ -32,7 +31,7 @@ namespace sd::slidesorter { class SlideSorter; }
namespace accessibility {
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
css::accessibility::XAccessible,
css::accessibility::XAccessibleEventBroadcaster,
css::accessibility::XAccessibleContext,
@@ -42,8 +41,7 @@ typedef ::cppu::WeakComponentImplHelper<
/** This class makes page objects of the slide sorter accessible.
*/
class AccessibleSlideSorterObject
- : public cppu::BaseMutex,
- public AccessibleSlideSorterObjectBase
+ : public AccessibleSlideSorterObjectBase
{
public:
/** Create a new object that represents a page object in the slide
@@ -74,7 +72,7 @@ public:
const css::uno::Any& rOldValue,
const css::uno::Any& rNewValue);
- virtual void SAL_CALL disposing() override;
+ virtual void disposing(std::unique_lock<std::mutex>&) override;
//===== XAccessible =======================================================
