diff options
Diffstat (limited to 'chart2/source/model')
21 files changed, 42 insertions, 42 deletions
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 { |