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

[Noel Grandin (via logerrit)]

 sd/source/ui/framework/factories/PresentationFactory.cxx |   22 ++++-----------
 1 file changed, 6 insertions(+), 16 deletions(-)

New commits:
commit 75d7a9ef706df23d5422e53217c13d1db8929021
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 21:00:39 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Wed Dec 29 19:50:46 2021 +0100

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

diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx 
b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 57304923f142..8cf6038099b9 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -22,9 +22,8 @@
 #include <DrawController.hxx>
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/drawing/framework/XView.hpp>
-#include <cppuhelper/basemutex.hxx>
 #include <comphelper/servicehelper.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 #include <tools/diagnose_ex.h>
 #include <slideshow.hxx>
 
@@ -40,36 +39,32 @@ namespace sd::framework {
 
 namespace {
 
-typedef ::cppu::WeakComponentImplHelper <lang::XInitialization> 
PresentationFactoryProviderInterfaceBase;
+typedef comphelper::WeakComponentImplHelper<lang::XInitialization> 
PresentationFactoryProviderInterfaceBase;
 
 class PresentationFactoryProvider
-    : protected cppu::BaseMutex,
-      public PresentationFactoryProviderInterfaceBase
+    : public PresentationFactoryProviderInterfaceBase
 {
 public:
     PresentationFactoryProvider ();
 
-    virtual void SAL_CALL disposing() override;
-
     // XInitialization
 
     virtual void SAL_CALL initialize(
         const css::uno::Sequence<css::uno::Any>& aArguments) override;
 };
 
-typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase;
+typedef comphelper::WeakComponentImplHelper<XView> 
PresentationViewInterfaceBase;
 
 /** The PresentationView is not an actual view, it is a marker whose
     existence in a configuration indicates that a slideshow is running
     (in another application window).
 */
 class PresentationView
-    : protected cppu::BaseMutex,
-      public PresentationViewInterfaceBase
+    : public PresentationViewInterfaceBase
 {
 public:
     explicit PresentationView (const Reference<XResourceId>& rxViewId)
-        : PresentationViewInterfaceBase(m_aMutex),mxResourceId(rxViewId) {};
+        : mxResourceId(rxViewId) {};
 
     // XView
 
@@ -153,11 +148,6 @@ namespace {
 //===== PresentationFactoryProvider ===========================================
 
 PresentationFactoryProvider::PresentationFactoryProvider ()
-    : PresentationFactoryProviderInterfaceBase(m_aMutex)
-{
-}
-
-void PresentationFactoryProvider::disposing()
 {
 }