sd/source/ui/slidesorter/shell/SlideSorterService.cxx | 5 ++--- sd/source/ui/slidesorter/shell/SlideSorterService.hxx | 10 ++++------ 2 files changed, 6 insertions(+), 9 deletions(-)
New commits: commit e6c7996a53691ebf2ab32f1660aeba74bc30b9c3 Author: Noel Grandin <noelgran...@gmail.com> AuthorDate: Mon Dec 27 19:16:05 2021 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Tue Dec 28 07:30:52 2021 +0100 use comphelper::WeakComponentImplHelper in SlideSorterService Change-Id: Ic1fbe40e5dd3795d2fb8680772e0a0073b408710 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127602 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index 778346aa5e60..a086f3b9e209 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -42,7 +42,6 @@ namespace sd::slidesorter { //===== SlideSorterService ========================================================== SlideSorterService::SlideSorterService() - : SlideSorterServiceInterfaceBase(m_aMutex) { } @@ -50,7 +49,7 @@ SlideSorterService::~SlideSorterService() { } -void SAL_CALL SlideSorterService::disposing() +void SlideSorterService::disposing(std::unique_lock<std::mutex>&) { mpSlideSorter.reset(); @@ -392,7 +391,7 @@ void SlideSorterService::Resize() void SlideSorterService::ThrowIfDisposed() { - if (SlideSorterServiceInterfaceBase::rBHelper.bDisposed || SlideSorterServiceInterfaceBase::rBHelper.bInDispose) + if (SlideSorterServiceInterfaceBase::m_bDisposed) { throw lang::DisposedException ("SlideSorterService object has already been disposed", static_cast<drawing::XDrawView*>(this)); diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx index a0692122e585..579a5bae5c33 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.hxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.hxx @@ -22,15 +22,14 @@ #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/drawing/XSlideSorterBase.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <memory> namespace com::sun::star::awt { class XWindow; } namespace sd::slidesorter { -typedef ::cppu::WeakComponentImplHelper < +typedef comphelper::WeakComponentImplHelper < css::drawing::XSlideSorterBase, css::lang::XInitialization, css::awt::XWindowListener @@ -41,15 +40,14 @@ class SlideSorter; /** Implementation of the com.sun.star.drawing.SlideSorter service. */ class SlideSorterService - : protected ::cppu::BaseMutex, - public SlideSorterServiceInterfaceBase + : public SlideSorterServiceInterfaceBase { public: explicit SlideSorterService(); virtual ~SlideSorterService() override; SlideSorterService(const SlideSorterService&) = delete; SlideSorterService& operator=(const SlideSorterService&) = delete; - virtual void SAL_CALL disposing() override; + virtual void disposing(std::unique_lock<std::mutex>&) override; // XInitialization