[Libreoffice-commits] core.git: sd/source

[Noel Grandin (via logerrit)]

 sd/source/ui/presenter/SlideRenderer.cxx |    7 +------
 sd/source/ui/presenter/SlideRenderer.hxx |   11 ++++-------
 2 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 39e4c9c228ec7998334cffc8c451b2d6c6063b0a
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 13:53:15 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 28 18:54:54 2021 +0100

    use comphelper::WeakComponentImplHelper in SlideRenderer
    
    Change-Id: I0372899c0f1f7c9c0090e7a2392c152f6606e688
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127634
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sd/source/ui/presenter/SlideRenderer.cxx 
b/sd/source/ui/presenter/SlideRenderer.cxx
index 393bf483bc5e..1b57b195ac70 100644
--- a/sd/source/ui/presenter/SlideRenderer.cxx
+++ b/sd/source/ui/presenter/SlideRenderer.cxx
@@ -32,7 +32,6 @@ namespace sd::presenter {
 //===== SlideRenderer 
==========================================================
 
 SlideRenderer::SlideRenderer ()
-    : SlideRendererInterfaceBase(m_aMutex)
 {
 }
 
@@ -40,10 +39,6 @@ SlideRenderer::~SlideRenderer()
 {
 }
 
-void SAL_CALL SlideRenderer::disposing()
-{
-}
-
 //----- XInitialization -------------------------------------------------------
 
 void SAL_CALL SlideRenderer::initialize (const Sequence<Any>& rArguments)
@@ -185,7 +180,7 @@ BitmapEx SlideRenderer::CreatePreview (
 
 void SlideRenderer::ThrowIfDisposed()
 {
-    if (SlideRendererInterfaceBase::rBHelper.bDisposed || 
SlideRendererInterfaceBase::rBHelper.bInDispose)
+    if (m_bDisposed)
     {
         throw lang::DisposedException ("SlideRenderer object has already been 
disposed",
             static_cast<uno::XWeak*>(this));
diff --git a/sd/source/ui/presenter/SlideRenderer.hxx 
b/sd/source/ui/presenter/SlideRenderer.hxx
index bc385c168ca9..d39434421233 100644
--- a/sd/source/ui/presenter/SlideRenderer.hxx
+++ b/sd/source/ui/presenter/SlideRenderer.hxx
@@ -24,14 +24,13 @@
 #include <com/sun/star/lang/XInitialization.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 
 namespace com::sun::star::drawing { class XDrawPage; }
 
 namespace sd::presenter {
 
-typedef ::cppu::WeakComponentImplHelper <
+typedef comphelper::WeakComponentImplHelper <
     css::drawing::XSlideRenderer,
     css::lang::XInitialization,
     css::lang::XServiceInfo
@@ -39,16 +38,14 @@ typedef ::cppu::WeakComponentImplHelper <
 
 /** Render single slides into bitmaps.
 */
-class SlideRenderer
-    : protected ::cppu::BaseMutex,
-      public SlideRendererInterfaceBase
+class SlideRenderer final
+    : public SlideRendererInterfaceBase
 {
 public:
     SlideRenderer ();
     virtual ~SlideRenderer() override;
     SlideRenderer(const SlideRenderer&) = delete;
     SlideRenderer& operator=(const SlideRenderer&) = delete;
-    virtual void SAL_CALL disposing() override;
 
     // XInitialization