connectivity/source/drivers/mysqlc/mysqlc_connection.hxx | 3 connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx | 2 connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx | 2 connectivity/source/drivers/mysqlc/mysqlc_statement.hxx | 2 connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx | 6 - sc/inc/fielduno.hxx | 4 - sc/inc/mutexhlp.hxx | 36 --------- sc/source/ui/unoobj/fielduno.cxx | 2 sd/inc/pch/precompiled_sd.hxx | 1 sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx | 6 - sd/source/ui/accessibility/AccessibleSlideSorterView.cxx | 14 +-- sd/source/ui/framework/configuration/Configuration.cxx | 14 +-- sd/source/ui/framework/configuration/ConfigurationController.cxx | 38 +++++----- sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.cxx | 2 sd/source/ui/framework/configuration/GenericConfigurationChangeRequest.hxx | 4 - sd/source/ui/framework/configuration/UpdateRequest.cxx | 2 sd/source/ui/framework/configuration/UpdateRequest.hxx | 4 - sd/source/ui/framework/factories/BasicViewFactory.cxx | 2 sd/source/ui/framework/factories/BasicViewFactory.hxx | 5 - sd/source/ui/framework/factories/ChildWindowPane.cxx | 2 sd/source/ui/framework/factories/Pane.cxx | 4 - sd/source/ui/framework/factories/PresentationFactory.cxx | 11 +- sd/source/ui/framework/factories/ViewShellWrapper.cxx | 4 - sd/source/ui/framework/module/CenterViewFocusModule.cxx | 2 sd/source/ui/framework/module/CenterViewFocusModule.hxx | 5 - sd/source/ui/framework/module/ModuleController.cxx | 2 sd/source/ui/framework/module/SlideSorterModule.cxx | 2 sd/source/ui/framework/module/SlideSorterModule.hxx | 4 - sd/source/ui/framework/module/ViewTabBarModule.cxx | 2 sd/source/ui/framework/module/ViewTabBarModule.hxx | 5 - sd/source/ui/framework/tools/FrameworkHelper.cxx | 14 +-- sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 4 - sd/source/ui/inc/AccessibleSlideSorterView.hxx | 4 - sd/source/ui/inc/MutexOwner.hxx | 38 ---------- sd/source/ui/inc/ViewTabBar.hxx | 4 - sd/source/ui/inc/framework/Configuration.hxx | 4 - sd/source/ui/inc/framework/ConfigurationController.hxx | 5 - sd/source/ui/inc/framework/ModuleController.hxx | 5 - sd/source/ui/inc/framework/Pane.hxx | 5 - sd/source/ui/inc/framework/PresentationFactory.hxx | 5 - sd/source/ui/inc/framework/ViewShellWrapper.hxx | 4 - sd/source/ui/inc/tools/SlotStateListener.hxx | 4 - sd/source/ui/slidesorter/controller/SlsListener.cxx | 2 sd/source/ui/slidesorter/controller/SlsListener.hxx | 4 - sd/source/ui/tools/EventMultiplexer.cxx | 7 - sd/source/ui/tools/SlotStateListener.cxx | 2 sd/source/ui/view/ViewTabBar.cxx | 2 sw/source/uibase/inc/mailmergehelper.hxx | 13 +-- 48 files changed, 113 insertions(+), 205 deletions(-)
New commits: commit f09eaefafbc8fe279ef07a6889f80c06c34b17dd Author: Noel Grandin <[email protected]> AuthorDate: Sat Dec 18 09:12:42 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Dec 19 11:21:13 2021 +0100 use more cppu::BaseMutex Change-Id: Ida8eb69bb90a2ce53a9a783595b1dc0b0c9f334c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127076 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx index c75be4724654..d527f467e334 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.hxx @@ -35,6 +35,7 @@ #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XStringSubstitution.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase3.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/string.hxx> @@ -82,7 +83,7 @@ typedef OMetaConnection_BASE OConnection_BASE; typedef std::vector<css::uno::WeakReferenceHelper> OWeakRefArray; -class OConnection final : public OBase_Mutex, public OConnection_BASE +class OConnection final : public cppu::BaseMutex, public OConnection_BASE { private: MYSQL m_mysql; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx index 018595b770ba..0be8e2ab347a 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_prepared_resultset.hxx @@ -52,7 +52,7 @@ typedef ::cppu::WeakComponentImplHelper12< css::sdbc::XColumnLocate, css::lang::XServiceInfo> OPreparedResultSet_BASE; -class OPreparedResultSet final : public OBase_Mutex, +class OPreparedResultSet final : public cppu::BaseMutex, public OPreparedResultSet_BASE, public ::cppu::OPropertySetHelper, public OPropertyArrayUsageHelper<OPreparedResultSet> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx index 461e81286cb6..8114cddc9681 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultset.hxx @@ -54,7 +54,7 @@ typedef ::cppu::WeakComponentImplHelper12< css::sdbc::XColumnLocate, css::lang::XServiceInfo> OResultSet_BASE; -class OResultSet final : public OBase_Mutex, +class OResultSet final : public cppu::BaseMutex, public OResultSet_BASE, public ::cppu::OPropertySetHelper, public OPropertyArrayUsageHelper<OResultSet> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx index 14750309ad87..464051b7239f 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.hxx @@ -49,7 +49,7 @@ typedef ::cppu::WeakComponentImplHelper3<css::sdbc::XWarningsSupplier, css::util //************ Class: OCommonStatement // is a base class for the normal statement and for the prepared statement -class OCommonStatement : public OBase_Mutex, +class OCommonStatement : public cppu::BaseMutex, public OCommonStatement_IBase, public ::cppu::OPropertySetHelper, public OPropertyArrayUsageHelper<OCommonStatement> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx index d0847aedc5d6..edba70a935ab 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx @@ -106,12 +106,6 @@ template <class TYPE>::cppu::IPropertyArrayHelper* OPropertyArrayUsageHelper<TYP return s_pProps; } -class OBase_Mutex -{ -public: - ::osl::Mutex m_aMutex; -}; - namespace internal { template <class T> void implCopySequence(const T* _pSource, T*& _pDest, sal_Int32 _nSourceLen) diff --git a/sc/inc/fielduno.hxx b/sc/inc/fielduno.hxx index 2702455ccb62..88f42f991869 100644 --- a/sc/inc/fielduno.hxx +++ b/sc/inc/fielduno.hxx @@ -20,7 +20,6 @@ #pragma once #include "address.hxx" -#include "mutexhlp.hxx" #include <svl/lstner.hxx> #include <editeng/editdata.hxx> @@ -33,6 +32,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XRefreshable.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer3.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/component.hxx> @@ -164,7 +164,7 @@ typedef cppu::WeakComponentImplHelper< css::beans::XPropertySet, css::lang::XUnoTunnel, css::lang::XServiceInfo> ScEditFieldObj_Base; -class ScEditFieldObj final : public ScMutexHelper, public ScEditFieldObj_Base +class ScEditFieldObj final : public cppu::BaseMutex, public ScEditFieldObj_Base { ScEditFieldObj() = delete; ScEditFieldObj(const ScEditFieldObj&) = delete; diff --git a/sc/inc/mutexhlp.hxx b/sc/inc/mutexhlp.hxx deleted file mode 100644 index 340a469050d8..000000000000 --- a/sc/inc/mutexhlp.hxx +++ /dev/null @@ -1,36 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <osl/mutex.hxx> - -// used in XComponent implementations to construct a Mutex before the -// OComponentHelper base class - -class ScMutexHelper -{ -private: - ::osl::Mutex maMutex; - -public: - ::osl::Mutex& getMutex() { return maMutex; } -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sc/source/ui/unoobj/fielduno.cxx b/sc/source/ui/unoobj/fielduno.cxx index 3e62c4b0bec8..76a63a72a08c 100644 --- a/sc/source/ui/unoobj/fielduno.cxx +++ b/sc/source/ui/unoobj/fielduno.cxx @@ -1041,7 +1041,7 @@ void ScEditFieldObj::setPropertyValueSheet(const OUString& rName, const uno::Any ScEditFieldObj::ScEditFieldObj( const uno::Reference<text::XTextRange>& rContent, std::unique_ptr<ScEditSource> pEditSrc, sal_Int32 eType, const ESelection& rSel) : - ScEditFieldObj_Base(getMutex()), + ScEditFieldObj_Base(m_aMutex), pPropSet(nullptr), mpEditSource(std::move(pEditSrc)), aSelection(rSel), diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 9605feceaf21..f2ee62c48223 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -510,7 +510,6 @@ #include <GraphicViewShell.hxx> #include <LayerTabBar.hxx> #include <MasterPageObserver.hxx> -#include <MutexOwner.hxx> #include <OutlineView.hxx> #include <OutlineViewShell.hxx> #include <Outliner.hxx> diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx index fde0cd953677..1ce4d5aab0a7 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterObject.cxx @@ -54,7 +54,7 @@ AccessibleSlideSorterObject::AccessibleSlideSorterObject( const Reference<XAccessible>& rxParent, ::sd::slidesorter::SlideSorter& rSlideSorter, sal_uInt16 nPageNumber) - : AccessibleSlideSorterObjectBase(::sd::MutexOwner::maMutex), + : AccessibleSlideSorterObjectBase(m_aMutex), mxParent(rxParent), mnPageNumber(nPageNumber), mrSlideSorter(rSlideSorter), @@ -236,7 +236,7 @@ void SAL_CALL AccessibleSlideSorterObject::addAccessibleEventListener( if (!rxListener.is()) return; - const osl::MutexGuard aGuard(maMutex); + const osl::MutexGuard aGuard(m_aMutex); if (IsDisposed()) { @@ -258,7 +258,7 @@ void SAL_CALL AccessibleSlideSorterObject::removeAccessibleEventListener( if (!(rxListener.is() && mnClientId)) return; - const osl::MutexGuard aGuard(maMutex); + const osl::MutexGuard aGuard(m_aMutex); sal_Int32 nListenerCount = comphelper::AccessibleEventNotifier::removeEventListener( mnClientId, rxListener ); if ( !nListenerCount ) diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 51754b8f5158..87eea89d2199 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -114,7 +114,7 @@ private: AccessibleSlideSorterView::AccessibleSlideSorterView( ::sd::slidesorter::SlideSorter& rSlideSorter, vcl::Window* pContentWindow) - : AccessibleSlideSorterViewBase(MutexOwner::maMutex), + : AccessibleSlideSorterViewBase(m_aMutex), mrSlideSorter(rSlideSorter), mnClientId(0), mpContentWindow(pContentWindow) @@ -163,7 +163,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplem sal_Int32 nIndex) { AccessibleSlideSorterObject* pResult = nullptr; - ::osl::MutexGuard aGuard (maMutex); + ::osl::MutexGuard aGuard (m_aMutex); if (nIndex>=0 && nIndex<mpImpl->GetVisibleChildCount()) pResult = mpImpl->GetVisibleChild(nIndex); @@ -173,7 +173,7 @@ AccessibleSlideSorterObject* AccessibleSlideSorterView::GetAccessibleChildImplem void AccessibleSlideSorterView::Destroyed() { - ::osl::MutexGuard aGuard (maMutex); + ::osl::MutexGuard aGuard (m_aMutex); // Send a disposing to all listeners. if (mnClientId != 0) @@ -197,7 +197,7 @@ Reference<XAccessibleContext > SAL_CALL sal_Int32 SAL_CALL AccessibleSlideSorterView::getAccessibleChildCount() { ThrowIfDisposed(); - ::osl::MutexGuard aGuard (maMutex); + ::osl::MutexGuard aGuard (m_aMutex); return mpImpl->GetVisibleChildCount(); } @@ -205,7 +205,7 @@ Reference<XAccessible > SAL_CALL AccessibleSlideSorterView::getAccessibleChild (sal_Int32 nIndex) { ThrowIfDisposed(); - ::osl::MutexGuard aGuard (maMutex); + ::osl::MutexGuard aGuard (m_aMutex); if (nIndex<0 || nIndex>=mpImpl->GetVisibleChildCount()) throw lang::IndexOutOfBoundsException(); @@ -325,7 +325,7 @@ void SAL_CALL AccessibleSlideSorterView::addAccessibleEventListener( if (!rxListener.is()) return; - const osl::MutexGuard aGuard(maMutex); + const osl::MutexGuard aGuard(m_aMutex); if (rBHelper.bDisposed || rBHelper.bInDispose) { @@ -347,7 +347,7 @@ void SAL_CALL AccessibleSlideSorterView::removeAccessibleEventListener( if (!rxListener.is()) return; - const osl::MutexGuard aGuard(maMutex); + const osl::MutexGuard aGuard(m_aMutex); if (mnClientId == 0) return; 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) diff --git a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx index e21ef2143120..5c9d0ad86aef 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterObject.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterObject.hxx @@ -19,7 +19,7 @@ #pragma once -#include "MutexOwner.hxx" +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> @@ -42,7 +42,7 @@ typedef ::cppu::WeakComponentImplHelper< /** This class makes page objects of the slide sorter accessible. */ class AccessibleSlideSorterObject - : public ::sd::MutexOwner, + : public cppu::BaseMutex, public AccessibleSlideSorterObjectBase { public: diff --git a/sd/source/ui/inc/AccessibleSlideSorterView.hxx b/sd/source/ui/inc/AccessibleSlideSorterView.hxx index 2e8a4fc41ca4..85003b72d138 100644 --- a/sd/source/ui/inc/AccessibleSlideSorterView.hxx +++ b/sd/source/ui/inc/AccessibleSlideSorterView.hxx @@ -19,7 +19,7 @@ #pragma once -#include "MutexOwner.hxx" +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> @@ -52,7 +52,7 @@ typedef ::cppu::WeakComponentImplHelper< accessible. */ class AccessibleSlideSorterView - : public ::sd::MutexOwner, + : public cppu::BaseMutex, public AccessibleSlideSorterViewBase { public: diff --git a/sd/source/ui/inc/MutexOwner.hxx b/sd/source/ui/inc/MutexOwner.hxx deleted file mode 100644 index ce68902deeef..000000000000 --- a/sd/source/ui/inc/MutexOwner.hxx +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#pragma once - -#include <osl/mutex.hxx> - -namespace sd -{ -/** This class provides a mutex to derived classes. It exists to - satisfy some helper classes from cppuhelper who expect a mutex as - argument to their constructor. -*/ -class MutexOwner -{ -protected: - mutable ::osl::Mutex maMutex; -}; - -} // end of namespace ::sd - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 9fa0854d80b7..fed069cbb45f 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/drawing/framework/XToolBar.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <vcl/InterimItemWindow.hxx> -#include "MutexOwner.hxx" #include <vector> @@ -70,7 +70,7 @@ typedef ::cppu::WeakComponentImplHelper < /** Tab control for switching between views in the center pane. */ class ViewTabBar final - : private sd::MutexOwner, + : private cppu::BaseMutex, public ViewTabBarInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/Configuration.hxx b/sd/source/ui/inc/framework/Configuration.hxx index 4f2582cd6eb0..11c4093efd76 100644 --- a/sd/source/ui/inc/framework/Configuration.hxx +++ b/sd/source/ui/inc/framework/Configuration.hxx @@ -19,10 +19,10 @@ #pragma once -#include <MutexOwner.hxx> #include <com/sun/star/drawing/framework/XConfiguration.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNamed.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <memory> @@ -58,7 +58,7 @@ typedef ::cppu::WeakComponentImplHelper < XConfigurationChangeOperation interface. */ class Configuration - : private sd::MutexOwner, + : private cppu::BaseMutex, public ConfigurationInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/ConfigurationController.hxx b/sd/source/ui/inc/framework/ConfigurationController.hxx index da7c45d53c95..2fe2f48d063c 100644 --- a/sd/source/ui/inc/framework/ConfigurationController.hxx +++ b/sd/source/ui/inc/framework/ConfigurationController.hxx @@ -19,11 +19,10 @@ #pragma once -#include <MutexOwner.hxx> - #include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <memory> @@ -48,7 +47,7 @@ typedef ::cppu::WeakComponentImplHelper < for an extended documentation. */ class ConfigurationController - : private sd::MutexOwner, + : private cppu::BaseMutex, public ConfigurationControllerInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/ModuleController.hxx b/sd/source/ui/inc/framework/ModuleController.hxx index 260176f9e513..000dddd37b88 100644 --- a/sd/source/ui/inc/framework/ModuleController.hxx +++ b/sd/source/ui/inc/framework/ModuleController.hxx @@ -19,10 +19,9 @@ #pragma once -#include <MutexOwner.hxx> - #include <com/sun/star/drawing/framework/XModuleController.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <memory> @@ -56,7 +55,7 @@ typedef ::cppu::WeakComponentImplHelper < whatever they like. */ class ModuleController - : private sd::MutexOwner, + : private cppu::BaseMutex, public ModuleControllerInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/Pane.hxx b/sd/source/ui/inc/framework/Pane.hxx index 5b1c592a6c33..9e8ee25a1f73 100644 --- a/sd/source/ui/inc/framework/Pane.hxx +++ b/sd/source/ui/inc/framework/Pane.hxx @@ -19,11 +19,10 @@ #pragma once -#include <MutexOwner.hxx> - #include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/XPane2.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <vcl/vclptr.hxx> #include <vcl/window.hxx> @@ -49,7 +48,7 @@ typedef ::cppu::WeakComponentImplHelper < on direct access on the Window class. */ class Pane - : protected MutexOwner, + : protected cppu::BaseMutex, public PaneInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/PresentationFactory.hxx b/sd/source/ui/inc/framework/PresentationFactory.hxx index 64e8eb0ea4d9..058086081c2b 100644 --- a/sd/source/ui/inc/framework/PresentationFactory.hxx +++ b/sd/source/ui/inc/framework/PresentationFactory.hxx @@ -19,10 +19,9 @@ #pragma once -#include <MutexOwner.hxx> - #include <com/sun/star/drawing/framework/XResourceFactory.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> namespace com::sun::star::frame { class XController; } @@ -39,7 +38,7 @@ typedef ::cppu::WeakComponentImplHelper < application window). */ class PresentationFactory - : private sd::MutexOwner, + : private cppu::BaseMutex, public PresentationFactoryInterfaceBase { public: diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index f7392c16d694..4e44f970d32c 100644 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -19,12 +19,12 @@ #pragma once -#include <MutexOwner.hxx> #include <com/sun/star/drawing/framework/XView.hpp> #include <com/sun/star/drawing/framework/XRelocatableResource.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <memory> @@ -46,7 +46,7 @@ typedef ::cppu::WeakComponentImplHelper < css::lang::XUnoTunnel Most importantly it provides a tunnel to the ViewShell implementation. Then it forwards size changes of the pane window to the view shell. */ -class ViewShellWrapper :private sd::MutexOwner +class ViewShellWrapper :private cppu::BaseMutex ,public ViewShellWrapperInterfaceBase { public: diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx index 85c123929fce..706c61d4998c 100644 --- a/sd/source/ui/inc/tools/SlotStateListener.hxx +++ b/sd/source/ui/inc/tools/SlotStateListener.hxx @@ -19,8 +19,8 @@ #pragma once -#include <MutexOwner.hxx> #include <com/sun/star/frame/XStatusListener.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <tools/link.hxx> @@ -40,7 +40,7 @@ typedef cppu::WeakComponentImplHelper< be used to relay state changes of other slots as well. */ class SlotStateListener final - : protected MutexOwner, + : protected cppu::BaseMutex, public SlotStateListenerInterfaceBase { public: diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index d61e6b27caf6..64399c91214d 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -54,7 +54,7 @@ namespace sd::slidesorter::controller { Listener::Listener ( SlideSorter& rSlideSorter) - : ListenerInterfaceBase(maMutex), + : ListenerInterfaceBase(m_aMutex), mrSlideSorter(rSlideSorter), mrController(mrSlideSorter.GetController()), mpBase(mrSlideSorter.GetViewShellBase()), diff --git a/sd/source/ui/slidesorter/controller/SlsListener.hxx b/sd/source/ui/slidesorter/controller/SlsListener.hxx index b14aecb014a9..793d554607cc 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.hxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.hxx @@ -19,12 +19,12 @@ #pragma once -#include <MutexOwner.hxx> #include <controller/SlideSorterController.hxx> #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/accessibility/XAccessibleEventListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <svl/lstner.hxx> @@ -58,7 +58,7 @@ typedef cppu::WeakComponentImplHelper< to the old controller and register as listener at the new one. */ class Listener - : protected MutexOwner, + : protected cppu::BaseMutex, public ListenerInterfaceBase, public SfxListener { diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index 9bb5b410fdba..cfe54b7f4a56 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -19,7 +19,6 @@ #include <EventMultiplexer.hxx> -#include <MutexOwner.hxx> #include <ViewShellBase.hxx> #include <drawdoc.hxx> #include <DrawController.hxx> @@ -33,6 +32,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/drawing/framework/XView.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <sfx2/viewfrm.hxx> @@ -61,7 +61,7 @@ typedef cppu::WeakComponentImplHelper< > EventMultiplexerImplementationInterfaceBase; class EventMultiplexer::Implementation - : protected MutexOwner, + : protected cppu::BaseMutex, public EventMultiplexerImplementationInterfaceBase, public SfxListener { @@ -186,8 +186,7 @@ void EventMultiplexer::MultiplexEvent( //===== EventMultiplexer::Implementation ====================================== EventMultiplexer::Implementation::Implementation (ViewShellBase& rBase) - : MutexOwner(), - EventMultiplexerImplementationInterfaceBase(maMutex), + : EventMultiplexerImplementationInterfaceBase(m_aMutex), mrBase (rBase), mbListeningToController (false), mbListeningToFrame (false), diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index aba0d066c966..529f2a8f6212 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -33,7 +33,7 @@ SlotStateListener::SlotStateListener ( Link<const OUString&,void> const & rCallback, const uno::Reference<frame::XDispatchProvider>& rxDispatchProvider, const OUString& rSlotName) - : SlotStateListenerInterfaceBase(maMutex), + : SlotStateListenerInterfaceBase(m_aMutex), mxDispatchProviderWeak(nullptr) { SetCallback(rCallback); diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index fd8c83f8841c..4e205b04276e 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -59,7 +59,7 @@ bool IsEqual (const TabBarButton& rButton1, const TabBarButton& rButton2) ViewTabBar::ViewTabBar ( const Reference<XResourceId>& rxViewTabBarId, const Reference<frame::XController>& rxController) - : ViewTabBarInterfaceBase(maMutex), + : ViewTabBarInterfaceBase(m_aMutex), mpTabControl(VclPtr<TabBarControl>::Create(GetAnchorWindow(rxViewTabBarId,rxController), this)), mxController(rxController), mxViewTabBarId(rxViewTabBarId), diff --git a/sw/source/uibase/inc/mailmergehelper.hxx b/sw/source/uibase/inc/mailmergehelper.hxx index 7e8b0d48c45e..3813991969cf 100644 --- a/sw/source/uibase/inc/mailmergehelper.hxx +++ b/sw/source/uibase/inc/mailmergehelper.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/mail/XMailMessage.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/compbase.hxx> #include <vcl/customweld.hxx> @@ -168,14 +169,8 @@ public: virtual css::uno::Any SAL_CALL getValueByName(const OUString& Name) override; }; -class SwMutexBase -{ -public: - osl::Mutex m_aMutex; -}; - class SW_DLLPUBLIC SwConnectionListener final : - public SwMutexBase, + public cppu::BaseMutex, public cppu::WeakComponentImplHelper<css::mail::XConnectionListener> { using cppu::WeakComponentImplHelperBase::disposing; @@ -194,7 +189,7 @@ public: }; class SW_DLLPUBLIC SwMailTransferable final : - public SwMutexBase, + public cppu::BaseMutex, public cppu::WeakComponentImplHelper<css::datatransfer::XTransferable, css::beans::XPropertySet> { OUString m_aMimeType; @@ -229,7 +224,7 @@ class SW_DLLPUBLIC SwMailTransferable final : }; class SW_DLLPUBLIC SwMailMessage final : - public SwMutexBase, + public cppu::BaseMutex, public cppu::WeakComponentImplHelper<css::mail::XMailMessage> { OUString m_sSenderName;
