chart2/inc/pch/precompiled_chartcontroller.hxx | 1 chart2/inc/pch/precompiled_chartcore.hxx | 1 chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx | 4 - chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx | 4 - chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx | 4 - chart2/source/controller/inc/AccessibleBase.hxx | 5 - chart2/source/controller/inc/AccessibleTextHelper.hxx | 4 - chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx | 4 - chart2/source/controller/main/CommandDispatch.hxx | 4 - chart2/source/inc/ErrorBar.hxx | 4 - chart2/source/inc/LabeledDataSequence.hxx | 4 - chart2/source/inc/ModifyListenerHelper.hxx | 5 - chart2/source/inc/MutexContainer.hxx | 37 ---------- chart2/source/inc/PopupRequest.hxx | 4 - chart2/source/inc/RangeHighlighter.hxx | 4 - chart2/source/inc/WrappedPropertySet.hxx | 4 - chart2/source/model/inc/BaseCoordinateSystem.hxx | 4 - chart2/source/model/inc/DataSeries.hxx | 4 - chart2/source/model/inc/Diagram.hxx | 4 - chart2/source/model/inc/StockBar.hxx | 4 - chart2/source/model/main/Axis.hxx | 4 - chart2/source/model/main/DataPoint.hxx | 4 - chart2/source/model/main/FormattedString.hxx | 4 - chart2/source/model/main/GridProperties.hxx | 4 - chart2/source/model/main/Legend.hxx | 4 - chart2/source/model/main/PageBackground.hxx | 4 - chart2/source/model/main/Title.hxx | 4 - chart2/source/model/main/Wall.hxx | 4 - chart2/source/model/template/AreaChartTypeTemplate.hxx | 4 - chart2/source/model/template/BarChartTypeTemplate.hxx | 4 - chart2/source/model/template/BubbleChartTypeTemplate.hxx | 4 - chart2/source/model/template/ChartType.hxx | 4 - chart2/source/model/template/ColumnLineChartTypeTemplate.hxx | 4 - chart2/source/model/template/LineChartTypeTemplate.hxx | 4 - chart2/source/model/template/PieChartTypeTemplate.hxx | 4 - chart2/source/model/template/ScatterChartTypeTemplate.hxx | 4 - chart2/source/model/template/StockChartTypeTemplate.hxx | 4 - chart2/source/tools/ModifyListenerCallBack.cxx | 4 - chart2/source/tools/RegressionCurveModel.hxx | 4 - chart2/source/tools/RegressionEquation.hxx | 4 - include/vcl/i18nhelp.hxx | 4 - vcl/source/app/i18nhelp.cxx | 17 +--- 42 files changed, 82 insertions(+), 128 deletions(-)
New commits: commit 3fd6e05a77e0e9ca1db6c7f9e5a1b17d32250b36 Author: Noel Grandin <[email protected]> AuthorDate: Fri Dec 17 18:46:30 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Dec 19 17:46:39 2021 +0100 osl::Mutex->std::mutex in I18nHelper Change-Id: I8743755992eeb78ec213cb51913da1b66b712142 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127069 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/vcl/i18nhelp.hxx b/include/vcl/i18nhelp.hxx index 5be46d598a7e..f48d562c40a9 100644 --- a/include/vcl/i18nhelp.hxx +++ b/include/vcl/i18nhelp.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/uno/Reference.h> #include <i18nlangtag/languagetag.hxx> -#include <osl/mutex.hxx> +#include <mutex> #include <rtl/ustring.hxx> #include <tools/long.hxx> #include <vcl/dllapi.h> @@ -41,7 +41,7 @@ namespace vcl class VCL_DLLPUBLIC I18nHelper { - ::osl::Mutex maMutex; + mutable std::mutex maMutex; LanguageTag maLanguageTag; css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/vcl/source/app/i18nhelp.cxx b/vcl/source/app/i18nhelp.cxx index 8bf77ac25116..1cff03689ec5 100644 --- a/vcl/source/app/i18nhelp.cxx +++ b/vcl/source/app/i18nhelp.cxx @@ -106,7 +106,7 @@ OUString vcl::I18nHelper::filterFormattingChars( const OUString& rStr ) sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& rStr2 ) const { - ::osl::Guard< ::osl::Mutex > aGuard( const_cast<vcl::I18nHelper*>(this)->maMutex ); + std::unique_lock aGuard( maMutex ); if ( mbTransliterateIgnoreCase ) { @@ -123,7 +123,7 @@ sal_Int32 vcl::I18nHelper::CompareString( const OUString& rStr1, const OUString& bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 ) const { - ::osl::Guard< ::osl::Mutex > aGuard( const_cast<vcl::I18nHelper*>(this)->maMutex ); + std::unique_lock aGuard( maMutex ); if ( !mbTransliterateIgnoreCase ) { @@ -140,16 +140,11 @@ bool vcl::I18nHelper::MatchString( const OUString& rStr1, const OUString& rStr2 bool vcl::I18nHelper::MatchMnemonic( const OUString& rString, sal_Unicode cMnemonicChar ) const { - ::osl::Guard< ::osl::Mutex > aGuard( const_cast<vcl::I18nHelper*>(this)->maMutex ); - - bool bEqual = false; sal_Int32 n = rString.indexOf( '~' ); - if ( n != -1 ) - { - OUString aMatchStr = rString.copy( n+1 ); // not only one char, because of transliteration... - bEqual = MatchString( OUString(cMnemonicChar), aMatchStr ); - } - return bEqual; + if ( n == -1 ) + return false; + OUString aMatchStr = rString.copy( n+1 ); // not only one char, because of transliteration... + return MatchString( OUString(cMnemonicChar), aMatchStr ); } OUString vcl::I18nHelper::GetNum( tools::Long nNumber, sal_uInt16 nDecimals, bool bUseThousandSep, bool bTrailingZeros ) const commit 35d9ce88107f860e1a358c5273087985689a22c0 Author: Noel Grandin <[email protected]> AuthorDate: Sat Dec 18 12:45:10 2021 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sun Dec 19 17:46:16 2021 +0100 use more cppu::BaseMutex Change-Id: Ib9da716de0addc70ca58d9085ff351c2ff8c706f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127083 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chartcontroller.hxx index aeac1b600cba..912cff0fdef3 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chartcontroller.hxx @@ -485,7 +485,6 @@ #include <ItemPropertyMap.hxx> #include <LegendHelper.hxx> #include <LinePropertiesHelper.hxx> -#include <MutexContainer.hxx> #include <ObjectHierarchy.hxx> #include <ObjectIdentifier.hxx> #include <ObjectNameProvider.hxx> diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx index f7a6e5ffc744..15b5bd32bcf8 100644 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ b/chart2/inc/pch/precompiled_chartcore.hxx @@ -300,7 +300,6 @@ #include <MediaDescriptorHelper.hxx> #include <MinimumAndMaximumSupplier.hxx> #include <ModifyListenerHelper.hxx> -#include <MutexContainer.hxx> #include <NumberFormatterWrapper.hxx> #include <OPropertySet.hxx> #include <ObjectIdentifier.hxx> diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index fd9dc2f7c50c..dcf7c50ade36 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/chart2/XAnyDescriptionAccess.hpp> @@ -35,7 +35,7 @@ namespace chart::wrapper class Chart2ModelContact; struct lcl_Operator; -class ChartDataWrapper final : public MutexContainer, public +class ChartDataWrapper final : public cppu::BaseMutex, public ::cppu::WeakImplHelper< css::chart2::XAnyDescriptionAccess, css::chart::XDateCategories, diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index eeaaf71dad88..33cabe1743e2 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -18,10 +18,10 @@ */ #pragma once -#include <MutexContainer.hxx> #include <WrappedIgnoreProperty.hxx> #include <comphelper/interfacecontainer3.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -37,7 +37,7 @@ namespace chart::wrapper class Chart2ModelContact; -class MinMaxLineWrapper : public MutexContainer +class MinMaxLineWrapper : public cppu::BaseMutex , public ::cppu::WeakImplHelper < css::lang::XComponent , css::lang::XServiceInfo diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index b62c70bbc150..63e1c44db4d8 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -18,9 +18,9 @@ */ #pragma once -#include <MutexContainer.hxx> #include <comphelper/interfacecontainer3.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> @@ -36,7 +36,7 @@ namespace chart::wrapper class Chart2ModelContact; -class UpDownBarWrapper : public MutexContainer +class UpDownBarWrapper : public cppu::BaseMutex , public ::cppu::WeakImplHelper < css::lang::XComponent , css::lang::XServiceInfo diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 88f4ef79ffb2..92850dccfe44 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp> #include <comphelper/accessibleeventnotifier.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> #include <tools/color.hxx> @@ -35,8 +36,6 @@ #include <vector> #include <memory> -#include <MutexContainer.hxx> - namespace com::sun::star::awt { class XWindow; } namespace com::sun::star::chart2 { class XChartDocument; } namespace com::sun::star::view { class XSelectionSupplier; } @@ -89,7 +88,7 @@ typedef ::cppu::WeakComponentImplHelper< /** Base class for all Chart Accessibility objects */ class AccessibleBase : - public MutexContainer, + public cppu::BaseMutex, public impl::AccessibleBase_Base { public: diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 0a174caaf70d..ad6d865932fb 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -19,7 +19,7 @@ #pragma once #include <memory> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/accessibility/XAccessibleContext.hpp> @@ -44,7 +44,7 @@ typedef ::cppu::WeakComponentImplHelper< } class AccessibleTextHelper : - public MutexContainer, + public cppu::BaseMutex, public impl::AccessibleTextHelper_Base { public: diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index b58b918c249d..d62a9ed06225 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -19,7 +19,7 @@ #pragma once -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/component.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -40,7 +40,7 @@ class VclWindowEvent; namespace chart { -class CreationWizardUnoDlg : public MutexContainer +class CreationWizardUnoDlg : public cppu::BaseMutex , public ::cppu::OComponentHelper , public css::ui::dialogs::XAsynchronousExecutableDialog , public css::lang::XServiceInfo diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index 81b70d0726f7..16e0b5ab72bc 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <comphelper/interfacecontainer3.hxx> #include <com/sun/star/frame/XDispatch.hpp> @@ -44,7 +44,7 @@ typedef ::cppu::WeakComponentImplHelper< /** This is the base class for an XDispatch. */ class CommandDispatch : - public MutexContainer, + public cppu::BaseMutex, public impl::CommandDispatch_Base { public: diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index aa8eecfb4fa1..7e2638eba133 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include "MutexContainer.hxx" +#include <cppuhelper/basemutex.hxx> #include "charttoolsdllapi.hxx" #include <cppuhelper/implbase.hxx> @@ -58,7 +58,7 @@ typedef ::cppu::WeakImplHelper< } class ErrorBar final : - public MutexContainer, + public cppu::BaseMutex, public impl::ErrorBar_Base { private: diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index 37b4339ea0db..37b067d1a607 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include "MutexContainer.hxx" +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/chart2/data/XLabeledDataSequence2.hpp> @@ -40,7 +40,7 @@ typedef cppu::WeakImplHelper< } class LabeledDataSequence : - public MutexContainer, + public cppu::BaseMutex, public impl::LabeledDataSequence_Base { public: diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index c8b061308606..468779bcbaaa 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -20,10 +20,9 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include "MutexContainer.hxx" - #include <vector> #include <algorithm> #include <utility> @@ -45,7 +44,7 @@ css::uno::Reference< css::util::XModifyListener > createModifyEventForwarder(); this case.</p> */ class ModifyEventForwarder : - public MutexContainer, + public cppu::BaseMutex, public ::cppu::WeakComponentImplHelper< css::util::XModifyBroadcaster, css::util::XModifyListener > diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx deleted file mode 100644 index 4f7d189b8726..000000000000 --- a/chart2/source/inc/MutexContainer.hxx +++ /dev/null @@ -1,37 +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 chart -{ -class MutexContainer -{ -protected: - MutexContainer() = default; - - ~MutexContainer() = default; - - mutable ::osl::Mutex m_aMutex; -}; - -} // namespace chart - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/inc/PopupRequest.hxx b/chart2/source/inc/PopupRequest.hxx index 729cc3a941fc..ac7e783c434c 100644 --- a/chart2/source/inc/PopupRequest.hxx +++ b/chart2/source/inc/PopupRequest.hxx @@ -9,9 +9,9 @@ #pragma once -#include "MutexContainer.hxx" #include "charttoolsdllapi.hxx" +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/awt/XRequestCallback.hpp> @@ -22,7 +22,7 @@ namespace impl typedef cppu::WeakComponentImplHelper<css::awt::XRequestCallback> PopupRequest_Base; } -class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public MutexContainer, public impl::PopupRequest_Base +class OOO_DLLPUBLIC_CHARTTOOLS PopupRequest : public cppu::BaseMutex, public impl::PopupRequest_Base { public: explicit PopupRequest(); diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index 77cb1903cf80..43f22d985763 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -18,7 +18,7 @@ */ #pragma once -#include "MutexContainer.hxx" +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/chart2/data/XRangeHighlighter.hpp> #include <com/sun/star/view/XSelectionChangeListener.hpp> @@ -46,7 +46,7 @@ typedef ::cppu::WeakComponentImplHelper< } class RangeHighlighter : - public MutexContainer, + public cppu::BaseMutex, public impl::RangeHighlighter_Base { public: diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index 639e29a7e50d..30ac421b3f5c 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -19,12 +19,12 @@ #pragma once #include "WrappedProperty.hxx" -#include "MutexContainer.hxx" #include "charttoolsdllapi.hxx" #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertyStates.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <memory> @@ -37,7 +37,7 @@ namespace chart { class OOO_DLLPUBLIC_CHARTTOOLS WrappedPropertySet : - public MutexContainer + public cppu::BaseMutex , public ::cppu::WeakImplHelper < css::beans::XPropertySet , css::beans::XMultiPropertySet diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index 29bf6276249d..155da8f8a698 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -48,7 +48,7 @@ typedef ::cppu::WeakImplHelper class BaseCoordinateSystem : public impl::BaseCoordinateSystem_Base, - public MutexContainer, + public cppu::BaseMutex, public ::property::OPropertySet { public: diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 805bd0a326ed..7dc35ec474ec 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> // helper classes +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -36,7 +37,6 @@ #include <vector> #include <map> -#include <MutexContainer.hxx> #include <OPropertySet.hxx> namespace com::sun::star::beans { class XPropertySet; } @@ -59,7 +59,7 @@ typedef ::cppu::WeakImplHelper< } class DataSeries final : - public MutexContainer, + public cppu::BaseMutex, public impl::DataSeries_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index cf828b903662..1ddeafcc3454 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XDiagram.hpp> @@ -55,7 +55,7 @@ typedef ::cppu::WeakImplHelper< } class Diagram final : - public MutexContainer, + public cppu::BaseMutex, public impl::Diagram_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index b642479e1d9d..8f5665ff128f 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -21,9 +21,9 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper< } class StockBar final : - public MutexContainer, + public cppu::BaseMutex, public impl::StockBar_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 0f3be76cbf19..e42a704a0c5f 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -46,7 +46,7 @@ typedef ::cppu::WeakImplHelper< } class Axis final : - public MutexContainer, + public cppu::BaseMutex, public impl::Axis_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 2139ec84d3bd..c8f923b2f171 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> #include <comphelper/uno3.hxx> @@ -28,7 +29,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <OPropertySet.hxx> -#include <MutexContainer.hxx> namespace chart { @@ -45,7 +45,7 @@ typedef ::cppu::WeakImplHelper< } class DataPoint final : - public MutexContainer, + public cppu::BaseMutex, public impl::DataPoint_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index a9c8cd33d790..cb860d6d6ad3 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper< } class FormattedString final : - public MutexContainer, + public cppu::BaseMutex, public impl::FormattedString_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index 16342c260a55..3a5d2b8c689a 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -26,7 +27,6 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <OPropertySet.hxx> -#include <MutexContainer.hxx> namespace chart { @@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper< } class GridProperties final : - public MutexContainer, + public cppu::BaseMutex, public impl::GridProperties_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 1adb49cd3b1f..97cd72099b39 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XLegend.hpp> @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper< } class Legend final : - public MutexContainer, + public cppu::BaseMutex, public impl::Legend_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 80bfd3fd9f70..9d813be60882 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -22,8 +22,8 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -42,7 +42,7 @@ typedef ::cppu::WeakImplHelper< } class PageBackground final : - public MutexContainer, + public cppu::BaseMutex, public impl::PageBackground_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index 104cb92c37e2..f3f76192a523 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/chart2/XTitle.hpp> @@ -43,7 +43,7 @@ typedef ::cppu::WeakImplHelper< } class Title final : - public MutexContainer, + public cppu::BaseMutex, public impl::Title_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index e186ba06e59c..276b1184f4c7 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -21,9 +21,9 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -40,7 +40,7 @@ typedef ::cppu::WeakImplHelper< } class Wall final : - public MutexContainer, + public cppu::BaseMutex, public impl::Wall_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 51479a15d73b..137b9e212fdb 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -22,14 +22,14 @@ #include <StackMode.hxx> #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> namespace chart { class AreaChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 9c23b692af07..d27ac7836c2b 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> #include "ChartTypeTemplate.hxx" @@ -29,7 +29,7 @@ namespace chart { class BarChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index d2681414e745..91561c981155 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -20,14 +20,14 @@ #include "ChartTypeTemplate.hxx" #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> namespace chart { class BubbleChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index 89817d13cd91..74e8bcb14300 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -18,8 +18,8 @@ */ #pragma once -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -47,7 +47,7 @@ typedef ::cppu::WeakImplHelper< } class ChartType : - public MutexContainer, + public cppu::BaseMutex, public impl::ChartType_Base, public ::property::OPropertySet { diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 0e23061cf869..2a38ca6dfb49 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -22,14 +22,14 @@ #include <StackMode.hxx> #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> namespace chart { class ColumnLineChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 129b587ed900..f952b940ee1e 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -20,7 +20,7 @@ #include "ChartTypeTemplate.hxx" #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <StackMode.hxx> #include <comphelper/uno3.hxx> @@ -28,7 +28,7 @@ namespace chart { class LineChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index bdde9e9a6f52..a23acbf33a83 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -19,7 +19,7 @@ #pragma once #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> #include "ChartTypeTemplate.hxx" @@ -29,7 +29,7 @@ namespace chart { class PieChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index cf8e51ee30b3..502b5322ab71 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -20,14 +20,14 @@ #include "ChartTypeTemplate.hxx" #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> namespace chart { class ScatterChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index a31473c856e2..c064b8105111 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -20,14 +20,14 @@ #include "ChartTypeTemplate.hxx" #include <OPropertySet.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> #include <comphelper/uno3.hxx> namespace chart { class StockChartTypeTemplate : - public MutexContainer, + public cppu::BaseMutex, public ChartTypeTemplate, public ::property::OPropertySet { diff --git a/chart2/source/tools/ModifyListenerCallBack.cxx b/chart2/source/tools/ModifyListenerCallBack.cxx index 55d681061f8d..660ee0b66403 100644 --- a/chart2/source/tools/ModifyListenerCallBack.cxx +++ b/chart2/source/tools/ModifyListenerCallBack.cxx @@ -19,7 +19,7 @@ #include <ModifyListenerCallBack.hxx> #include <cppuhelper/compbase.hxx> -#include <MutexContainer.hxx> +#include <cppuhelper/basemutex.hxx> using namespace ::com::sun::star; using ::com::sun::star::uno::Reference; @@ -30,7 +30,7 @@ typedef ::cppu::WeakComponentImplHelper< css::util::XModifyListener > ModifyListenerCallBack_Base; class ModifyListenerCallBack_impl - : public ::chart::MutexContainer + : public cppu::BaseMutex , public ModifyListenerCallBack_Base { public: diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index f87ceb620e59..cd42851662f2 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -18,9 +18,9 @@ */ #pragma once -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -48,7 +48,7 @@ typedef ::cppu::WeakImplHelper< } class RegressionCurveModel : - public MutexContainer, + public cppu::BaseMutex, public impl::RegressionCurveModel_Base, public ::property::OPropertySet { diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index e5bbbf108601..69d550f3c561 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -24,9 +24,9 @@ #include <com/sun/star/util/XModifyListener.hpp> #include <com/sun/star/chart2/XTitle.hpp> -#include <MutexContainer.hxx> #include <OPropertySet.hxx> +#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/uno3.hxx> @@ -45,7 +45,7 @@ typedef ::cppu::WeakImplHelper< } class RegressionEquation final : - public MutexContainer, + public cppu::BaseMutex, public impl::RegressionEquation_Base, public ::property::OPropertySet {
