BaseMutex->std::mutex in DrawSubControllerInterfaceBase

Change-Id: Iba2bee0feeea7cd176c178ae20e6dfce1fe4af19
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148055
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 9 insertions, 31 deletions

diff --git a/sd/source/ui/inc/DrawSubController.hxx b/sd/source/ui/inc/DrawSubController.hxx
index d748d6378434..5748617868a5 100644
--- a/sd/source/ui/inc/DrawSubController.hxx
+++ b/sd/source/ui/inc/DrawSubController.hxx
@@ -21,20 +21,15 @@
 
 #include <com/sun/star/drawing/XDrawSubController.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <cppuhelper/compbase.hxx>
+#include <comphelper/compbase.hxx>
 
 namespace sd {
 
-    class DrawSubControllerInterfaceBase : public ::cppu::WeakComponentImplHelper<
+    class DrawSubControllerInterfaceBase : public ::comphelper::WeakComponentImplHelper<
                     css::drawing::XDrawSubController,
                     css::lang::XServiceInfo >
     {
     public:
-        DrawSubControllerInterfaceBase( ::osl::Mutex& aMutex )
-            :  ::cppu::WeakComponentImplHelper<
-                    css::drawing::XDrawSubController,
-                    css::lang::XServiceInfo >( aMutex ) {}
-
         // XServiceInfo
         virtual OUString SAL_CALL getImplementationName(  ) override = 0;
         virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override = 0;
diff --git a/sd/source/ui/inc/SdUnoDrawView.hxx b/sd/source/ui/inc/SdUnoDrawView.hxx
index 6b62e4cb2772..ad14dabe52ab 100644
--- a/sd/source/ui/inc/SdUnoDrawView.hxx
+++ b/sd/source/ui/inc/SdUnoDrawView.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include "DrawSubController.hxx"
-#include <cppuhelper/basemutex.hxx>
 
 class SdXImpressDocument;
 namespace com::sun::star::drawing { class XLayer; }
@@ -32,9 +31,7 @@ class View;
 
 /** This class implements the DrawViewShell specific part of the controller.
 */
-class SdUnoDrawView final
-    : private cppu::BaseMutex,
-      public DrawSubControllerInterfaceBase
+class SdUnoDrawView final : public DrawSubControllerInterfaceBase
 {
 public:
     SdUnoDrawView (
diff --git a/sd/source/ui/inc/SdUnoOutlineView.hxx b/sd/source/ui/inc/SdUnoOutlineView.hxx
index 2789cabee6ec..cfad20ac5829 100644
--- a/sd/source/ui/inc/SdUnoOutlineView.hxx
+++ b/sd/source/ui/inc/SdUnoOutlineView.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include "DrawSubController.hxx"
-#include <cppuhelper/basemutex.hxx>
 
 namespace sd {
 
@@ -29,16 +28,12 @@ class OutlineViewShell;
 /** This class implements the OutlineViewShell specific part of the controller.
 */
 class SdUnoOutlineView final
-    : private cppu::BaseMutex,
-      public DrawSubControllerInterfaceBase
+    : public DrawSubControllerInterfaceBase
 {
 public:
-    SdUnoOutlineView (
-        OutlineViewShell& rViewShell) noexcept;
+    SdUnoOutlineView (OutlineViewShell& rViewShell) noexcept;
     virtual ~SdUnoOutlineView() noexcept override;
 
-    virtual void SAL_CALL disposing() override;
-
     // XSelectionSupplier
 
     virtual sal_Bool SAL_CALL select (
diff --git a/sd/source/ui/inc/SdUnoSlideView.hxx b/sd/source/ui/inc/SdUnoSlideView.hxx
index 7ca40a1abed8..f9f4655adca1 100644
--- a/sd/source/ui/inc/SdUnoSlideView.hxx
+++ b/sd/source/ui/inc/SdUnoSlideView.hxx
@@ -20,7 +20,6 @@
 #pragma once
 
 #include "DrawSubController.hxx"
-#include <cppuhelper/basemutex.hxx>
 
 namespace sd::slidesorter { class SlideSorter; }
 namespace com::sun::star::drawing { class XDrawPage; }
@@ -31,8 +30,7 @@ namespace sd {
     controller.
  */
 class SdUnoSlideView final
-    : private cppu::BaseMutex,
-      public DrawSubControllerInterfaceBase
+    : public DrawSubControllerInterfaceBase
 {
 public:
     SdUnoSlideView (
diff --git a/sd/source/ui/unoidl/SdUnoDrawView.cxx b/sd/source/ui/unoidl/SdUnoDrawView.cxx
index 115a58f84b31..790fb24a9cc3 100644
--- a/sd/source/ui/unoidl/SdUnoDrawView.cxx
+++ b/sd/source/ui/unoidl/SdUnoDrawView.cxx
@@ -51,8 +51,7 @@ namespace sd {
 SdUnoDrawView::SdUnoDrawView(
     DrawViewShell& rViewShell,
     View& rView) noexcept
-    :   DrawSubControllerInterfaceBase(m_aMutex),
-        mrDrawViewShell(rViewShell),
+    :   mrDrawViewShell(rViewShell),
         mrView(rView)
 {
 }
diff --git a/sd/source/ui/unoidl/SdUnoOutlineView.cxx b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
index 6b98f21401ed..e2f95934d0e6 100644
--- a/sd/source/ui/unoidl/SdUnoOutlineView.cxx
+++ b/sd/source/ui/unoidl/SdUnoOutlineView.cxx
@@ -34,8 +34,7 @@ namespace sd {
 
 SdUnoOutlineView::SdUnoOutlineView(
     OutlineViewShell& rViewShell) noexcept
-    :   DrawSubControllerInterfaceBase(m_aMutex),
-        mrOutlineViewShell(rViewShell)
+    :   mrOutlineViewShell(rViewShell)
 {
 }
 
@@ -43,10 +42,6 @@ SdUnoOutlineView::~SdUnoOutlineView() noexcept
 {
 }
 
-void SAL_CALL SdUnoOutlineView::disposing()
-{
-}
-
 //----- XSelectionSupplier ----------------------------------------------------
 
 sal_Bool SAL_CALL SdUnoOutlineView::select( const Any&  )
diff --git a/sd/source/ui/unoidl/SdUnoSlideView.cxx b/sd/source/ui/unoidl/SdUnoSlideView.cxx
index c30962ed766b..d37c5fb0a229 100644
--- a/sd/source/ui/unoidl/SdUnoSlideView.cxx
+++ b/sd/source/ui/unoidl/SdUnoSlideView.cxx
@@ -38,8 +38,7 @@ namespace sd {
 
 SdUnoSlideView::SdUnoSlideView (
     slidesorter::SlideSorter& rSlideSorter) noexcept
-    : DrawSubControllerInterfaceBase(m_aMutex),
-      mrSlideSorter(rSlideSorter)
+    : mrSlideSorter(rSlideSorter)
 {
 }