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

[Noel Grandin (via logerrit)]

 sd/source/ui/presenter/PresenterHelper.cxx |    3 +--
 sd/source/ui/presenter/PresenterHelper.hxx |   10 ++++------
 2 files changed, 5 insertions(+), 8 deletions(-)

New commits:
commit 144e2e6fc56d1d7d24dc19bc31670e28a1675a32
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Tue Dec 28 13:56:57 2021 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 28 19:49:20 2021 +0100

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

diff --git a/sd/source/ui/presenter/PresenterHelper.cxx 
b/sd/source/ui/presenter/PresenterHelper.cxx
index 5841e7b59f57..a93113a7561e 100644
--- a/sd/source/ui/presenter/PresenterHelper.cxx
+++ b/sd/source/ui/presenter/PresenterHelper.cxx
@@ -42,8 +42,7 @@ namespace sd::presenter {
 
 PresenterHelper::PresenterHelper (
     const Reference<XComponentContext>& rxContext)
-    : PresenterHelperInterfaceBase(m_aMutex),
-      mxComponentContext(rxContext)
+    : mxComponentContext(rxContext)
 {
 }
 
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx 
b/sd/source/ui/presenter/PresenterHelper.hxx
index fa1610b611a5..cee7e39fb349 100644
--- a/sd/source/ui/presenter/PresenterHelper.hxx
+++ b/sd/source/ui/presenter/PresenterHelper.hxx
@@ -21,14 +21,13 @@
 
 #include <com/sun/star/drawing/XPresenterHelper.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
-#include <cppuhelper/basemutex.hxx>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 
 namespace com::sun::star::uno { class XComponentContext; }
 
 namespace sd::presenter {
 
-typedef ::cppu::WeakComponentImplHelper<
+typedef comphelper::WeakComponentImplHelper<
     css::lang::XInitialization,
     css::drawing::XPresenterHelper
 > PresenterHelperInterfaceBase;
@@ -36,9 +35,8 @@ typedef ::cppu::WeakComponentImplHelper<
 /** Implementation of the XPresenterHelper interface: functionality that can
     not be implemented in an extension.
 */
-class PresenterHelper
-    : private ::cppu::BaseMutex,
-      public PresenterHelperInterfaceBase
+class PresenterHelper final
+    : public PresenterHelperInterfaceBase
 {
 public:
     explicit PresenterHelper (const 
css::uno::Reference<css::uno::XComponentContext>& rxContext);