use more cppu::BaseMutex

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

20 files changed, 63 insertions, 65 deletions

diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx
index f155e0992e68..415339586613 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -62,7 +62,7 @@ public:
 Configuration::Configuration (
     const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster,
     bool bBroadcastRequestEvents)
-    : ConfigurationInterfaceBase(MutexOwner::maMutex),
+    : ConfigurationInterfaceBase(m_aMutex),
       mpResourceContainer(new ResourceContainer()),
       mxBroadcaster(rxBroadcaster),
       mbBroadcastRequestEvents(bBroadcastRequestEvents)
@@ -73,7 +73,7 @@ Configuration::Configuration (
     const Reference<XConfigurationControllerBroadcaster>& rxBroadcaster,
     bool bBroadcastRequestEvents,
     const ResourceContainer& rResourceContainer)
-    : ConfigurationInterfaceBase(MutexOwner::maMutex),
+    : ConfigurationInterfaceBase(m_aMutex),
       mpResourceContainer(new ResourceContainer(rResourceContainer)),
       mxBroadcaster(rxBroadcaster),
       mbBroadcastRequestEvents(bBroadcastRequestEvents)
@@ -86,7 +86,7 @@ Configuration::~Configuration()
 
 void SAL_CALL Configuration::disposing()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     mpResourceContainer->clear();
     mxBroadcaster = nullptr;
 }
@@ -130,7 +130,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources (
     const OUString& rsResourceURLPrefix,
     AnchorBindingMode eMode)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     const bool bFilterResources (!rsResourceURLPrefix.isEmpty());
@@ -168,7 +168,7 @@ Sequence<Reference<XResourceId> > SAL_CALL Configuration::getResources (
 
 sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxResourceId)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     return rxResourceId.is()
@@ -179,7 +179,7 @@ sal_Bool SAL_CALL Configuration::hasResource (const Reference<XResourceId>& rxRe
 
 Reference<util::XCloneable> SAL_CALL Configuration::createClone()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     return new Configuration(
@@ -192,7 +192,7 @@ Reference<util::XCloneable> SAL_CALL Configuration::createClone()
 
 OUString SAL_CALL Configuration::getName()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     OUStringBuffer aString;
 
     if (rBHelper.bDisposed || rBHelper.bInDispose)
diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index 0a40bc8bc3f8..3fc95adb9b96 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -102,7 +102,7 @@ ConfigurationController::Lock::~Lock()
 //===== ConfigurationController ===============================================
 
 ConfigurationController::ConfigurationController() noexcept
-    : ConfigurationControllerInterfaceBase(MutexOwner::maMutex)
+    : ConfigurationControllerInterfaceBase(m_aMutex)
     , mbIsDisposed(false)
 {
 }
@@ -169,7 +169,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener (
     const OUString& rsEventType,
     const Any& rUserData)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
 
     ThrowIfDisposed();
     OSL_ASSERT(mpImplementation != nullptr);
@@ -179,7 +179,7 @@ void SAL_CALL ConfigurationController::addConfigurationChangeListener (
 void SAL_CALL ConfigurationController::removeConfigurationChangeListener (
     const Reference<XConfigurationChangeListener>& rxListener)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
 
     ThrowIfDisposed();
     mpImplementation->mpBroadcaster->RemoveListener(rxListener);
@@ -199,7 +199,7 @@ void SAL_CALL ConfigurationController::lock()
     OSL_ASSERT(mpImplementation != nullptr);
     OSL_ASSERT(mpImplementation->mpConfigurationUpdater != nullptr);
 
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     ++mpImplementation->mnLockCount;
@@ -210,7 +210,7 @@ void SAL_CALL ConfigurationController::lock()
 
 void SAL_CALL ConfigurationController::unlock()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
 
     // Allow unlocking while the ConfigurationController is being disposed
     // (but not when that is done and the controller is disposed.)
@@ -227,7 +227,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
     const Reference<XResourceId>& rxResourceId,
     ResourceActivationMode eMode)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     // Check whether we are being disposed.  This is handled differently
@@ -282,7 +282,7 @@ void SAL_CALL ConfigurationController::requestResourceActivation (
 void SAL_CALL ConfigurationController::requestResourceDeactivation (
     const Reference<XResourceId>& rxResourceId)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     SAL_INFO("sd.fwk", __func__ << ": ConfigurationController::requestResourceDeactivation() " <<
@@ -317,7 +317,7 @@ void SAL_CALL ConfigurationController::requestResourceDeactivation (
 Reference<XResource> SAL_CALL ConfigurationController::getResource (
     const Reference<XResourceId>& rxResourceId)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     ConfigurationControllerResourceManager::ResourceDescriptor aDescriptor (
@@ -327,7 +327,7 @@ Reference<XResource> SAL_CALL ConfigurationController::getResource (
 
 void SAL_CALL ConfigurationController::update()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     if (mpImplementation->mpQueueProcessor->IsEmpty())
@@ -345,7 +345,7 @@ void SAL_CALL ConfigurationController::update()
 
 sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     return ! mpImplementation->mpQueueProcessor->IsEmpty();
@@ -354,7 +354,7 @@ sal_Bool SAL_CALL ConfigurationController::hasPendingRequests()
 void SAL_CALL ConfigurationController::postChangeRequest (
     const Reference<XConfigurationChangeRequest>& rxRequest)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     mpImplementation->mpQueueProcessor->AddRequest(rxRequest);
@@ -362,7 +362,7 @@ void SAL_CALL ConfigurationController::postChangeRequest (
 
 Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfiguration()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     if (mpImplementation->mxRequestedConfiguration.is())
@@ -374,7 +374,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getRequestedConfigur
 
 Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfiguration()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     Reference<XConfiguration> xCurrentConfiguration(
@@ -391,7 +391,7 @@ Reference<XConfiguration> SAL_CALL ConfigurationController::getCurrentConfigurat
 void SAL_CALL ConfigurationController::restoreConfiguration (
     const Reference<XConfiguration>& rxNewConfiguration)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     // We will probably be making a couple of activation and deactivation
@@ -445,7 +445,7 @@ void SAL_CALL ConfigurationController::addResourceFactory(
     const OUString& sResourceURL,
     const Reference<XResourceFactory>& rxResourceFactory)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
     mpImplementation->mpResourceFactoryContainer->AddFactory(sResourceURL, rxResourceFactory);
 }
@@ -453,7 +453,7 @@ void SAL_CALL ConfigurationController::addResourceFactory(
 void SAL_CALL ConfigurationController::removeResourceFactoryForURL(
     const OUString& sResourceURL)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
     mpImplementation->mpResourceFactoryContainer->RemoveFactoryForURL(sResourceURL);
 }
@@ -461,7 +461,7 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForURL(
 void SAL_CALL ConfigurationController::removeResourceFactoryForReference(
     const Reference<XResourceFactory>& rxResourceFactory)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
     mpImplementation->mpResourceFactoryContainer->RemoveFactoryForReference(rxResourceFactory);
 }
@@ -469,7 +469,7 @@ void SAL_CALL ConfigurationController::removeResourceFactoryForReference(
 Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory (
     const OUString& sResourceURL)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     return mpImplementation->mpResourceFactoryContainer->GetFactory(sResourceURL);
@@ -479,7 +479,7 @@ Reference<XResourceFactory> SAL_CALL ConfigurationController::getResourceFactory
 
 void SAL_CALL ConfigurationController::initialize (const Sequence<Any>& aArguments)
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
 
     if (aArguments.getLength() == 1)
     {
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
index 61413ef55dfb..45110742b543 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx
@@ -34,7 +34,7 @@ namespace sd::framework {
 GenericConfigurationChangeRequest::GenericConfigurationChangeRequest (
     const Reference<XResourceId>& rxResourceId,
     const Mode eMode)
-    : GenericConfigurationChangeRequestInterfaceBase(MutexOwner::maMutex),
+    : GenericConfigurationChangeRequestInterfaceBase(m_aMutex),
       mxResourceId(rxResourceId),
       meMode(eMode)
 {
diff --git a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
index 7b7fb2bc6bdf..347354bf32e4 100644
--- a/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
+++ b/sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 #include <com/sun/star/container/XNamed.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace com::sun::star::drawing::framework { class XConfiguration; }
@@ -41,7 +41,7 @@ typedef ::cppu::WeakComponentImplHelper <
     requested: the resources linked to it have to be deactivated as well.
 */
 class GenericConfigurationChangeRequest
-    : private MutexOwner,
+    : private cppu::BaseMutex,
       public GenericConfigurationChangeRequestInterfaceBase
 {
 public:
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx
index 53c9ddd45049..b22e662a0e7c 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.cxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx
@@ -26,7 +26,7 @@ using namespace ::com::sun::star::drawing::framework;
 namespace sd::framework
 {
 UpdateRequest::UpdateRequest() noexcept
-    : UpdateRequestInterfaceBase(MutexOwner::maMutex)
+    : UpdateRequestInterfaceBase(m_aMutex)
 {
 }
 
diff --git a/sd/source/ui/framework/configuration/UpdateRequest.hxx b/sd/source/ui/framework/configuration/UpdateRequest.hxx
index 3a53b82ae8d9..67b2486d65c1 100644
--- a/sd/source/ui/framework/configuration/UpdateRequest.hxx
+++ b/sd/source/ui/framework/configuration/UpdateRequest.hxx
@@ -19,9 +19,9 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp>
 #include <com/sun/star/container/XNamed.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace com::sun::star::drawing::framework { class XConfiguration; }
@@ -42,7 +42,7 @@ typedef ::cppu::WeakComponentImplHelper <
     configuration when it is removed as last request from the queue.
 */
 class UpdateRequest
-    : private MutexOwner,
+    : private cppu::BaseMutex,
       public UpdateRequestInterfaceBase
 {
 public:
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx
index 18f9ff123dc4..4293486fbb4d 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx
@@ -83,7 +83,7 @@ public:
 //===== ViewFactory ===========================================================
 
 BasicViewFactory::BasicViewFactory ()
-    : BasicViewFactoryInterfaceBase(MutexOwner::maMutex),
+    : BasicViewFactoryInterfaceBase(m_aMutex),
       mpViewShellContainer(new ViewShellContainer()),
       mpBase(nullptr),
       mpFrameView(nullptr),
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 327abf1b2617..ea932a156be5 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -19,11 +19,10 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
-
 #include <com/sun/star/drawing/framework/XResourceFactory.hpp>
 #include <com/sun/star/lang/XInitialization.hpp>
 
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 #include <vcl/vclptr.hxx>
@@ -60,7 +59,7 @@ typedef ::cppu::WeakComponentImplHelper <
     For some views in some panes this class also acts as a cache.
 */
 class BasicViewFactory
-    : private sd::MutexOwner,
+    : private cppu::BaseMutex,
       public BasicViewFactoryInterfaceBase
 {
 public:
diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx
index a50c88080dae..136f6fcb78b2 100644
--- a/sd/source/ui/framework/factories/ChildWindowPane.cxx
+++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx
@@ -105,7 +105,7 @@ void ChildWindowPane::Hide()
 
 void SAL_CALL ChildWindowPane::disposing()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
 
     mrViewShellBase.GetViewShellManager()->DeactivateShell(mpShell.get());
     mpShell.reset();
diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx
index ffbb5e001d4e..a188f0e11799 100644
--- a/sd/source/ui/framework/factories/Pane.cxx
+++ b/sd/source/ui/framework/factories/Pane.cxx
@@ -36,7 +36,7 @@ Pane::Pane (
     const Reference<XResourceId>& rxPaneId,
     vcl::Window* pWindow)
     noexcept
-    : PaneInterfaceBase(MutexOwner::maMutex),
+    : PaneInterfaceBase(m_aMutex),
       mxPaneId(rxPaneId),
       mpWindow(pWindow),
       mxWindow(VCLUnoHelper::GetInterface(pWindow))
@@ -72,7 +72,7 @@ Reference<awt::XWindow> SAL_CALL Pane::getWindow()
 
 Reference<rendering::XCanvas> SAL_CALL Pane::getCanvas()
 {
-    ::osl::MutexGuard aGuard (maMutex);
+    ::osl::MutexGuard aGuard (m_aMutex);
     ThrowIfDisposed();
 
     if ( ! mxCanvas.is())
diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx
index 745b9733e4c1..4fb0ac40e2ad 100644
--- a/sd/source/ui/framework/factories/PresentationFactory.cxx
+++ b/sd/source/ui/framework/factories/PresentationFactory.cxx
@@ -22,6 +22,7 @@
 #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 <tools/diagnose_ex.h>
@@ -42,7 +43,7 @@ namespace {
 typedef ::cppu::WeakComponentImplHelper <lang::XInitialization> PresentationFactoryProviderInterfaceBase;
 
 class PresentationFactoryProvider
-    : protected MutexOwner,
+    : protected cppu::BaseMutex,
       public PresentationFactoryProviderInterfaceBase
 {
 public:
@@ -63,12 +64,12 @@ typedef ::cppu::WeakComponentImplHelper <XView> PresentationViewInterfaceBase;
     (in another application window).
 */
 class PresentationView
-    : protected MutexOwner,
+    : protected cppu::BaseMutex,
       public PresentationViewInterfaceBase
 {
 public:
     explicit PresentationView (const Reference<XResourceId>& rxViewId)
-        : PresentationViewInterfaceBase(maMutex),mxResourceId(rxViewId) {};
+        : PresentationViewInterfaceBase(m_aMutex),mxResourceId(rxViewId) {};
 
     // XView
 
@@ -90,7 +91,7 @@ constexpr OUStringLiteral gsPresentationViewURL = u"private:resource/view/Presen
 
 PresentationFactory::PresentationFactory (
     const Reference<frame::XController>& rxController)
-    : PresentationFactoryInterfaceBase(MutexOwner::maMutex),
+    : PresentationFactoryInterfaceBase(m_aMutex),
       mxController(rxController)
 {
 }
@@ -157,7 +158,7 @@ namespace {
 //===== PresentationFactoryProvider ===========================================
 
 PresentationFactoryProvider::PresentationFactoryProvider ()
-    : PresentationFactoryProviderInterfaceBase(maMutex)
+    : PresentationFactoryProviderInterfaceBase(m_aMutex)
 {
 }
 
diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
index dcca52ae3a78..6b308ae78375 100644
--- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx
+++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx
@@ -48,7 +48,7 @@ ViewShellWrapper::ViewShellWrapper (
     const std::shared_ptr<ViewShell>& pViewShell,
     const Reference<XResourceId>& rxViewId,
     const Reference<awt::XWindow>& rxWindow)
-    : ViewShellWrapperInterfaceBase(MutexOwner::maMutex),
+    : ViewShellWrapperInterfaceBase(m_aMutex),
       mpViewShell(pViewShell),
       mpSlideSorterViewShell(
           std::dynamic_pointer_cast< ::sd::slidesorter::SlideSorterViewShell >( pViewShell )),
@@ -63,7 +63,7 @@ ViewShellWrapper::~ViewShellWrapper()
 
 void SAL_CALL ViewShellWrapper::disposing()
 {
-    ::osl::MutexGuard aGuard( maMutex );
+    ::osl::MutexGuard aGuard( m_aMutex );
 
     SAL_INFO("sd.ui", "disposing ViewShellWrapper " << this);
     Reference<awt::XWindow> xWindow (mxWindow);
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
index dbecd4742125..ec1fc506126b 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx
@@ -40,7 +40,7 @@ namespace sd::framework {
 //===== CenterViewFocusModule ====================================================
 
 CenterViewFocusModule::CenterViewFocusModule (Reference<frame::XController> const & rxController)
-    : CenterViewFocusModuleInterfaceBase(MutexOwner::maMutex),
+    : CenterViewFocusModuleInterfaceBase(m_aMutex),
       mbValid(false),
       mpBase(nullptr),
       mbNewViewCreated(false)
diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.hxx b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
index 968e8ced12ad..9cd12a077061 100644
--- a/sd/source/ui/framework/module/CenterViewFocusModule.hxx
+++ b/sd/source/ui/framework/module/CenterViewFocusModule.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
-
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace com::sun::star::drawing::framework
@@ -48,7 +47,7 @@ typedef ::cppu::WeakComponentImplHelper<css::drawing::framework::XConfigurationC
     we are moving away from the shell stack this module may become obsolete
     or has to be modified.
 */
-class CenterViewFocusModule : private sd::MutexOwner, public CenterViewFocusModuleInterfaceBase
+class CenterViewFocusModule : private cppu::BaseMutex, public CenterViewFocusModuleInterfaceBase
 {
 public:
     explicit CenterViewFocusModule(
diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx
index 07c02ee57d4b..7da417795aeb 100644
--- a/sd/source/ui/framework/module/ModuleController.cxx
+++ b/sd/source/ui/framework/module/ModuleController.cxx
@@ -65,7 +65,7 @@ Reference<XModuleController> ModuleController::CreateInstance (
 }
 
 ModuleController::ModuleController (const Reference<XComponentContext>& rxContext)
-    : ModuleControllerInterfaceBase(MutexOwner::maMutex),
+    : ModuleControllerInterfaceBase(m_aMutex),
       mpResourceToFactoryMap(new ResourceToFactoryMap()),
       mpLoadedFactories(new LoadedFactoryContainer())
 {
diff --git a/sd/source/ui/framework/module/SlideSorterModule.cxx b/sd/source/ui/framework/module/SlideSorterModule.cxx
index fd632a83b232..3f0d86b97adb 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.cxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.cxx
@@ -48,7 +48,7 @@ namespace sd::framework {
 SlideSorterModule::SlideSorterModule (
     const Reference<frame::XController>& rxController,
     const OUString& rsLeftPaneURL)
-    : SlideSorterModuleBase(MutexOwner::maMutex),
+    : SlideSorterModuleBase(m_aMutex),
       mxResourceId(FrameworkHelper::CreateResourceId(FrameworkHelper::msSlideSorterURL, rsLeftPaneURL)),
       mxMainViewAnchorId(FrameworkHelper::CreateResourceId(FrameworkHelper::msCenterPaneURL)),
       mxViewTabBarId(FrameworkHelper::CreateResourceId(
diff --git a/sd/source/ui/framework/module/SlideSorterModule.hxx b/sd/source/ui/framework/module/SlideSorterModule.hxx
index 45dfa13f0252..adae19e1755f 100644
--- a/sd/source/ui/framework/module/SlideSorterModule.hxx
+++ b/sd/source/ui/framework/module/SlideSorterModule.hxx
@@ -19,8 +19,8 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
 #include <set>
@@ -46,7 +46,7 @@ typedef ::cppu::WeakComponentImplHelper <
     detects this and remembers it for the future.
 */
 class SlideSorterModule
-    : private sd::MutexOwner,
+    : private cppu::BaseMutex,
       public SlideSorterModuleBase
 {
 public:
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx
index 592af1165c7c..b62eba9996f9 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.cxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx
@@ -48,7 +48,7 @@ namespace sd::framework {
 ViewTabBarModule::ViewTabBarModule (
     const Reference<frame::XController>& rxController,
     const Reference<XResourceId>& rxViewTabBarId)
-    : ViewTabBarModuleInterfaceBase(MutexOwner::maMutex),
+    : ViewTabBarModuleInterfaceBase(m_aMutex),
       mxViewTabBarId(rxViewTabBarId)
 {
     Reference<XControllerManager> xControllerManager (rxController, UNO_QUERY);
diff --git a/sd/source/ui/framework/module/ViewTabBarModule.hxx b/sd/source/ui/framework/module/ViewTabBarModule.hxx
index e7327d6c9722..2975294cea44 100644
--- a/sd/source/ui/framework/module/ViewTabBarModule.hxx
+++ b/sd/source/ui/framework/module/ViewTabBarModule.hxx
@@ -19,9 +19,8 @@
 
 #pragma once
 
-#include <MutexOwner.hxx>
-
 #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 
 namespace com::sun::star::drawing::framework { class XConfigurationController; }
@@ -38,7 +37,7 @@ typedef ::cppu::WeakComponentImplHelper <
     the center pane.
 */
 class ViewTabBarModule
-    : private sd::MutexOwner,
+    : private cppu::BaseMutex,
       public ViewTabBarModuleInterfaceBase
 {
 public:
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index c1ec2f0d38fd..61ba1b26ba02 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -31,13 +31,13 @@
 #include <com/sun/star/drawing/framework/XControllerManager.hpp>
 #include <com/sun/star/frame/XController.hpp>
 #include <comphelper/servicehelper.hxx>
+#include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <svl/lstner.hxx>
 #include <rtl/ustrbuf.hxx>
 
 #include <sfx2/request.hxx>
 
-#include <MutexOwner.hxx>
 #include <vcl/svapp.hxx>
 #include <osl/doublecheckedlocking.h>
 #include <osl/getglobalmutex.hxx>
@@ -64,7 +64,7 @@ typedef ::cppu::WeakComponentImplHelper <
     actual callback object is called and the CallbackCaller destroys itself.
 */
 class CallbackCaller
-    : public ::sd::MutexOwner,
+    : public cppu::BaseMutex,
       public CallbackCallerInterfaceBase
 {
 public:
@@ -117,7 +117,7 @@ typedef ::cppu::WeakComponentImplHelper <
     one of them and Release() when both of them are destroyed.
 */
 class LifetimeController
-    : public ::sd::MutexOwner,
+    : public cppu::BaseMutex,
       public LifetimeControllerInterfaceBase,
       public SfxListener
 {
@@ -256,7 +256,7 @@ namespace {
 }
 
 class FrameworkHelper::DisposeListener
-    : public ::sd::MutexOwner,
+    : public cppu::BaseMutex,
       public FrameworkHelperDisposeListenerInterfaceBase
 {
 public:
@@ -766,7 +766,7 @@ Reference<XResourceId> FrameworkHelper::CreateResourceId (
 
 FrameworkHelper::DisposeListener::DisposeListener (
     const ::std::shared_ptr<FrameworkHelper>& rpHelper)
-    : FrameworkHelperDisposeListenerInterfaceBase(maMutex),
+    : FrameworkHelperDisposeListenerInterfaceBase(m_aMutex),
       mpHelper(rpHelper)
 {
     Reference<XComponent> xComponent (mpHelper->mxConfigurationController, UNO_QUERY);
@@ -808,7 +808,7 @@ CallbackCaller::CallbackCaller (
     const OUString& rsEventType,
     const ::sd::framework::FrameworkHelper::ConfigurationChangeEventFilter& rFilter,
     const ::sd::framework::FrameworkHelper::Callback& rCallback)
-    : CallbackCallerInterfaceBase(MutexOwner::maMutex),
+    : CallbackCallerInterfaceBase(m_aMutex),
       msEventType(rsEventType),
       maFilter(rFilter),
       maCallback(rCallback)
@@ -889,7 +889,7 @@ void SAL_CALL CallbackCaller::notifyConfigurationChange (
 //----- LifetimeController -------------------------------------------------
 
 LifetimeController::LifetimeController (::sd::ViewShellBase& rBase)
-    : LifetimeControllerInterfaceBase(maMutex),
+    : LifetimeControllerInterfaceBase(m_aMutex),
       mrBase(rBase),
       mbListeningToViewShellBase(false),
       mbListeningToController(false)