chart2/source/inc/Axis.hxx | 2 -
chart2/source/inc/BaseCoordinateSystem.hxx | 2 -
chart2/source/inc/ChartType.hxx | 2 -
chart2/source/inc/DataSeries.hxx | 2 -
chart2/source/inc/DataTable.hxx | 4 --
chart2/source/inc/Diagram.hxx | 2 -
chart2/source/inc/Legend.hxx | 2 -
chart2/source/inc/OPropertySet.hxx | 9 ++----
chart2/source/inc/RegressionCurveModel.hxx | 2 -
chart2/source/inc/Title.hxx | 2 -
chart2/source/model/inc/StockBar.hxx | 2 -
chart2/source/model/main/Axis.cxx | 3 --
chart2/source/model/main/BaseCoordinateSystem.cxx | 3 --
chart2/source/model/main/DataPoint.cxx | 3 --
chart2/source/model/main/DataPoint.hxx | 2 -
chart2/source/model/main/DataSeries.cxx | 3 --
chart2/source/model/main/DataTable.cxx | 5 +--
chart2/source/model/main/Diagram.cxx | 3 --
chart2/source/model/main/FormattedString.cxx | 3 --
chart2/source/model/main/FormattedString.hxx | 2 -
chart2/source/model/main/GridProperties.cxx | 3 --
chart2/source/model/main/GridProperties.hxx | 2 -
chart2/source/model/main/Legend.cxx | 3 --
chart2/source/model/main/PageBackground.cxx | 3 --
chart2/source/model/main/PageBackground.hxx | 2 -
chart2/source/model/main/StockBar.cxx | 3 --
chart2/source/model/main/Title.cxx | 3 --
chart2/source/model/main/Wall.cxx | 3 --
chart2/source/model/main/Wall.hxx | 2 -
chart2/source/model/template/AreaChartTypeTemplate.cxx | 1
chart2/source/model/template/AreaChartTypeTemplate.hxx | 2 -
chart2/source/model/template/BarChartTypeTemplate.cxx | 1
chart2/source/model/template/BarChartTypeTemplate.hxx | 2 -
chart2/source/model/template/BubbleChartTypeTemplate.cxx | 3 --
chart2/source/model/template/BubbleChartTypeTemplate.hxx | 2 -
chart2/source/model/template/ChartType.cxx | 3 --
chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 1
chart2/source/model/template/ColumnLineChartTypeTemplate.hxx | 2 -
chart2/source/model/template/LineChartTypeTemplate.cxx | 1
chart2/source/model/template/LineChartTypeTemplate.hxx | 2 -
chart2/source/model/template/PieChartTypeTemplate.cxx | 3 --
chart2/source/model/template/PieChartTypeTemplate.hxx | 2 -
chart2/source/model/template/ScatterChartTypeTemplate.cxx | 1
chart2/source/model/template/ScatterChartTypeTemplate.hxx | 2 -
chart2/source/model/template/StockChartTypeTemplate.cxx | 1
chart2/source/model/template/StockChartTypeTemplate.hxx | 2 -
chart2/source/tools/OPropertySet.cxx | 16 ++++++-----
chart2/source/tools/RegressionCurveModel.cxx | 3 --
chart2/source/tools/RegressionEquation.cxx | 3 --
chart2/source/tools/RegressionEquation.hxx | 2 -
50 files changed, 33 insertions(+), 104 deletions(-)
New commits:
commit a8b21abb09ab514206dc564f7b63016e5b6fac0b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Dec 5 15:41:18 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Dec 6 09:11:18 2022 +0000
Move cppu::BaseMutex up to the base class OPropertySet
Change-Id: I0e51987714e32ece19609c7a6d500995e6fc3601
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143674
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/chart2/source/inc/Axis.hxx b/chart2/source/inc/Axis.hxx
index 7b5ce75fa6fa..eecd9b4a1fca 100644
--- a/chart2/source/inc/Axis.hxx
+++ b/chart2/source/inc/Axis.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
@@ -46,7 +45,6 @@ typedef ::cppu::WeakImplHelper<
}
class OOO_DLLPUBLIC_CHARTTOOLS Axis final :
- public cppu::BaseMutex,
public impl::Axis_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/BaseCoordinateSystem.hxx
b/chart2/source/inc/BaseCoordinateSystem.hxx
index 2a308d5c25ed..71f226abcd51 100644
--- a/chart2/source/inc/BaseCoordinateSystem.hxx
+++ b/chart2/source/inc/BaseCoordinateSystem.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -49,7 +48,6 @@ typedef ::cppu::WeakImplHelper
class SAL_DLLPUBLIC_RTTI BaseCoordinateSystem :
public impl::BaseCoordinateSystem_Base,
- public cppu::BaseMutex,
public ::property::OPropertySet
{
public:
diff --git a/chart2/source/inc/ChartType.hxx b/chart2/source/inc/ChartType.hxx
index 9821fdb6ff0a..5849f611a3c8 100644
--- a/chart2/source/inc/ChartType.hxx
+++ b/chart2/source/inc/ChartType.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -52,7 +51,6 @@ typedef ::cppu::WeakImplHelper<
}
class OOO_DLLPUBLIC_CHARTTOOLS ChartType :
- public cppu::BaseMutex,
public impl::ChartType_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/DataSeries.hxx b/chart2/source/inc/DataSeries.hxx
index f15053262081..6bf4e46007ef 100644
--- a/chart2/source/inc/DataSeries.hxx
+++ b/chart2/source/inc/DataSeries.hxx
@@ -27,7 +27,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
// helper classes
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include "ModifyListenerHelper.hxx"
@@ -61,7 +60,6 @@ typedef ::cppu::WeakImplHelper<
}
class OOO_DLLPUBLIC_CHARTTOOLS DataSeries final :
- public cppu::BaseMutex,
public impl::DataSeries_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/DataTable.hxx b/chart2/source/inc/DataTable.hxx
index 4a41a40a1cbf..da15e264f4f6 100644
--- a/chart2/source/inc/DataTable.hxx
+++ b/chart2/source/inc/DataTable.hxx
@@ -10,7 +10,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
@@ -28,8 +27,7 @@ typedef cppu::WeakImplHelper<css::chart2::XDataTable,
css::lang::XServiceInfo,
DataTable_Base;
/** Data table implementation */
-class OOO_DLLPUBLIC_CHARTTOOLS DataTable final : public cppu::BaseMutex,
- public DataTable_Base,
+class OOO_DLLPUBLIC_CHARTTOOLS DataTable final : public DataTable_Base,
public
::property::OPropertySet
{
public:
diff --git a/chart2/source/inc/Diagram.hxx b/chart2/source/inc/Diagram.hxx
index 54293c751b68..f343bba7ca57 100644
--- a/chart2/source/inc/Diagram.hxx
+++ b/chart2/source/inc/Diagram.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/chart2/XDiagram.hpp>
@@ -59,7 +58,6 @@ typedef ::cppu::WeakImplHelper<
}
class OOO_DLLPUBLIC_CHARTTOOLS Diagram final :
- public cppu::BaseMutex,
public impl::Diagram_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/Legend.hxx b/chart2/source/inc/Legend.hxx
index 728d60d8aa52..c0aa9326dd22 100644
--- a/chart2/source/inc/Legend.hxx
+++ b/chart2/source/inc/Legend.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/chart2/XLegend.hpp>
@@ -43,7 +42,6 @@ typedef ::cppu::WeakImplHelper<
}
class OOO_DLLPUBLIC_CHARTTOOLS Legend final :
- public cppu::BaseMutex,
public impl::Legend_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/OPropertySet.hxx
b/chart2/source/inc/OPropertySet.hxx
index bc603dbd977c..f851c8c365f1 100644
--- a/chart2/source/inc/OPropertySet.hxx
+++ b/chart2/source/inc/OPropertySet.hxx
@@ -19,6 +19,7 @@
#pragma once
// helper classes
+#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/propshlp.hxx>
// interfaces and types
@@ -34,6 +35,7 @@ namespace property
{
class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
+ protected cppu::BaseMutex,
public ::cppu::OBroadcastHelper,
// includes beans::XPropertySet, XMultiPropertySet and XFastPropertySet
public ::cppu::OPropertySetHelper,
@@ -45,11 +47,11 @@ class OOO_DLLPUBLIC_CHARTTOOLS OPropertySet :
public css::style::XStyleSupplier
{
public:
- OPropertySet( ::osl::Mutex & rMutex );
+ OPropertySet();
virtual ~OPropertySet();
protected:
- explicit OPropertySet( const OPropertySet & rOther, ::osl::Mutex & rMutex
);
+ explicit OPropertySet( const OPropertySet & rOther );
void SetNewValuesExplicitlyEvenIfTheyEqualDefault();
@@ -221,9 +223,6 @@ private:
bool SetStyle( const css::uno::Reference< css::style::XStyle > & xStyle );
- /// reference to mutex of class deriving from here
- ::osl::Mutex & m_rMutex;
-
bool m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault;
typedef std::map< sal_Int32, css::uno::Any > tPropertyMap;
tPropertyMap m_aProperties;
diff --git a/chart2/source/inc/RegressionCurveModel.hxx
b/chart2/source/inc/RegressionCurveModel.hxx
index c7e48a82624b..89955f1314e4 100644
--- a/chart2/source/inc/RegressionCurveModel.hxx
+++ b/chart2/source/inc/RegressionCurveModel.hxx
@@ -20,7 +20,6 @@
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <sal/types.h>
@@ -48,7 +47,6 @@ typedef ::cppu::WeakImplHelper<
}
class SAL_DLLPUBLIC_RTTI RegressionCurveModel :
- public cppu::BaseMutex,
public impl::RegressionCurveModel_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/inc/Title.hxx b/chart2/source/inc/Title.hxx
index 091c558dba44..9fb7c2d100c6 100644
--- a/chart2/source/inc/Title.hxx
+++ b/chart2/source/inc/Title.hxx
@@ -19,7 +19,6 @@
#pragma once
#include "OPropertySet.hxx"
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/chart2/XTitle.hpp>
@@ -42,7 +41,6 @@ typedef ::cppu::WeakImplHelper<
}
class Title final :
- public cppu::BaseMutex,
public impl::Title_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/inc/StockBar.hxx
b/chart2/source/model/inc/StockBar.hxx
index dbc357ea46fc..38f5c2629b4a 100644
--- a/chart2/source/model/inc/StockBar.hxx
+++ b/chart2/source/model/inc/StockBar.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <ModifyListenerHelper.hxx>
@@ -39,7 +38,6 @@ typedef ::cppu::WeakImplHelper<
}
class StockBar final :
- public cppu::BaseMutex,
public impl::StockBar_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/main/Axis.cxx
b/chart2/source/model/main/Axis.cxx
index 92c41e49af36..0f8715011b92 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -322,7 +322,6 @@ namespace chart
{
Axis::Axis() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_aScaleData( AxisHelper::createDefaultScale() ),
m_xGrid( new GridProperties() )
@@ -342,7 +341,7 @@ Axis::Axis() :
Axis::Axis( const Axis & rOther ) :
impl::Axis_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_aScaleData( rOther.m_aScaleData )
{
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx
b/chart2/source/model/main/BaseCoordinateSystem.cxx
index 8a960e974e03..4299cc100f36 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -117,7 +117,6 @@ namespace chart
BaseCoordinateSystem::BaseCoordinateSystem(
sal_Int32 nDimensionCount /* = 2 */ ) :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_nDimensionCount( nDimensionCount )
{
@@ -152,7 +151,7 @@ BaseCoordinateSystem::BaseCoordinateSystem(
BaseCoordinateSystem::BaseCoordinateSystem(
const BaseCoordinateSystem & rSource ) :
impl::BaseCoordinateSystem_Base(rSource),
- ::property::OPropertySet( rSource, m_aMutex ),
+ ::property::OPropertySet( rSource ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_nDimensionCount( rSource.m_nDimensionCount )
{
diff --git a/chart2/source/model/main/DataPoint.cxx
b/chart2/source/model/main/DataPoint.cxx
index cb9e39c206a9..d97c67d13383 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -86,7 +86,6 @@ namespace chart
{
DataPoint::DataPoint( const uno::Reference< beans::XPropertySet > &
rParentProperties ) :
- ::property::OPropertySet( m_aMutex ),
m_xParentProperties( rParentProperties ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_bNoParentPropAllowed( false )
@@ -96,7 +95,7 @@ DataPoint::DataPoint( const uno::Reference<
beans::XPropertySet > & rParentPrope
DataPoint::DataPoint( const DataPoint & rOther ) :
impl::DataPoint_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_bNoParentPropAllowed( true )
{
diff --git a/chart2/source/model/main/DataPoint.hxx
b/chart2/source/model/main/DataPoint.hxx
index 52feb197d354..ba94449fff94 100644
--- a/chart2/source/model/main/DataPoint.hxx
+++ b/chart2/source/model/main/DataPoint.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <cppuhelper/weakref.hxx>
#include <comphelper/uno3.hxx>
@@ -44,7 +43,6 @@ typedef ::cppu::WeakImplHelper<
}
class DataPoint final :
- public cppu::BaseMutex,
public impl::DataPoint_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/main/DataSeries.cxx
b/chart2/source/model/main/DataSeries.cxx
index 430165f29cda..4ad4983ed18b 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -127,14 +127,13 @@ namespace chart
{
DataSeries::DataSeries() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
}
DataSeries::DataSeries( const DataSeries & rOther ) :
impl::DataSeries_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
if( ! rOther.m_aDataSequences.empty())
diff --git a/chart2/source/model/main/DataTable.cxx
b/chart2/source/model/main/DataTable.cxx
index d7d3bf2069c1..580ee4d1be90 100644
--- a/chart2/source/model/main/DataTable.cxx
+++ b/chart2/source/model/main/DataTable.cxx
@@ -142,14 +142,13 @@ struct StaticDataTableInfo : public
rtl::StaticAggregate<uno::Reference<beans::X
namespace chart
{
DataTable::DataTable()
- : ::property::OPropertySet(m_aMutex)
- , m_xModifyEventForwarder(new ModifyEventForwarder())
+ : m_xModifyEventForwarder(new ModifyEventForwarder())
{
}
DataTable::DataTable(const DataTable& rOther)
: DataTable_Base(rOther)
- , ::property::OPropertySet(rOther, m_aMutex)
+ , ::property::OPropertySet(rOther)
, m_xModifyEventForwarder(new ModifyEventForwarder())
{
}
diff --git a/chart2/source/model/main/Diagram.cxx
b/chart2/source/model/main/Diagram.cxx
index a8ddca69627b..17cf8ecd63ae 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -230,7 +230,6 @@ namespace chart
{
Diagram::Diagram( uno::Reference< uno::XComponentContext > xContext ) :
- ::property::OPropertySet( m_aMutex ),
m_xContext(std::move( xContext )),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
@@ -245,7 +244,7 @@ Diagram::Diagram( uno::Reference< uno::XComponentContext >
xContext ) :
Diagram::Diagram( const Diagram & rOther ) :
impl::Diagram_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xContext( rOther.m_xContext ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
diff --git a/chart2/source/model/main/FormattedString.cxx
b/chart2/source/model/main/FormattedString.cxx
index 69f871ddc3c5..cb16bad95b1f 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -95,7 +95,6 @@ namespace chart
{
FormattedString::FormattedString() :
- ::property::OPropertySet( m_aMutex ),
m_aType(chart2::DataPointCustomLabelFieldType::DataPointCustomLabelFieldType_TEXT),
m_bDataLabelsRange(false),
m_xModifyEventForwarder( new ModifyEventForwarder() )
@@ -103,7 +102,7 @@ FormattedString::FormattedString() :
FormattedString::FormattedString( const FormattedString & rOther ) :
impl::FormattedString_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_aString( rOther.m_aString ),
m_aType(rOther.m_aType),
m_aGuid(rOther.m_aGuid),
diff --git a/chart2/source/model/main/FormattedString.hxx
b/chart2/source/model/main/FormattedString.hxx
index 878c300156b4..229eb753ed76 100644
--- a/chart2/source/model/main/FormattedString.hxx
+++ b/chart2/source/model/main/FormattedString.hxx
@@ -19,7 +19,6 @@
#pragma once
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -42,7 +41,6 @@ typedef ::cppu::WeakImplHelper<
}
class FormattedString final :
- public cppu::BaseMutex,
public impl::FormattedString_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/main/GridProperties.cxx
b/chart2/source/model/main/GridProperties.cxx
index 7bfb4453edcd..7d476b5a5376 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -126,13 +126,12 @@ namespace chart
{
GridProperties::GridProperties() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
GridProperties::GridProperties( const GridProperties & rOther ) :
impl::GridProperties_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
}
diff --git a/chart2/source/model/main/GridProperties.hxx
b/chart2/source/model/main/GridProperties.hxx
index 43ab136c8332..930ea9c90674 100644
--- a/chart2/source/model/main/GridProperties.hxx
+++ b/chart2/source/model/main/GridProperties.hxx
@@ -18,7 +18,6 @@
*/
#pragma once
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <com/sun/star/lang/XServiceInfo.hpp>
@@ -41,7 +40,6 @@ typedef ::cppu::WeakImplHelper<
}
class GridProperties final :
- public cppu::BaseMutex,
public impl::GridProperties_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/main/Legend.cxx
b/chart2/source/model/main/Legend.cxx
index 8a0676e74bda..a7f0587a01aa 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -185,14 +185,13 @@ namespace chart
{
Legend::Legend() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
}
Legend::Legend( const Legend & rOther ) :
impl::Legend_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
}
diff --git a/chart2/source/model/main/PageBackground.cxx
b/chart2/source/model/main/PageBackground.cxx
index b617203186c9..561b297aba78 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -111,13 +111,12 @@ namespace chart
{
PageBackground::PageBackground() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
PageBackground::PageBackground( const PageBackground & rOther ) :
impl::PageBackground_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
diff --git a/chart2/source/model/main/PageBackground.hxx
b/chart2/source/model/main/PageBackground.hxx
index 15c32234c839..2aef8bd45ebe 100644
--- a/chart2/source/model/main/PageBackground.hxx
+++ b/chart2/source/model/main/PageBackground.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/util/XCloneable.hpp>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <ModifyListenerHelper.hxx>
@@ -40,7 +39,6 @@ typedef ::cppu::WeakImplHelper<
}
class PageBackground final :
- public cppu::BaseMutex,
public impl::PageBackground_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/main/StockBar.cxx
b/chart2/source/model/main/StockBar.cxx
index f319478e07bf..c26c64d59eed 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -108,7 +108,6 @@ namespace chart
{
StockBar::StockBar( bool bRisingCourse ) :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
if( ! bRisingCourse )
@@ -124,7 +123,7 @@ StockBar::StockBar( bool bRisingCourse ) :
StockBar::StockBar( const StockBar & rOther ) :
impl::StockBar_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
diff --git a/chart2/source/model/main/Title.cxx
b/chart2/source/model/main/Title.cxx
index 98004e30a2d4..e0aec51124f3 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -227,13 +227,12 @@ namespace chart
{
Title::Title() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
Title::Title( const Title & rOther ) :
impl::Title_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
CloneHelper::CloneRefSequence<chart2::XFormattedString>(
diff --git a/chart2/source/model/main/Wall.cxx
b/chart2/source/model/main/Wall.cxx
index f139a3e9d11f..f745f05abd61 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -106,13 +106,12 @@ namespace chart
{
Wall::Wall() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
Wall::Wall( const Wall & rOther ) :
impl::Wall_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{}
diff --git a/chart2/source/model/main/Wall.hxx
b/chart2/source/model/main/Wall.hxx
index 696772438d75..6cae798959c1 100644
--- a/chart2/source/model/main/Wall.hxx
+++ b/chart2/source/model/main/Wall.hxx
@@ -21,7 +21,6 @@
#include <com/sun/star/util/XCloneable.hpp>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <ModifyListenerHelper.hxx>
@@ -39,7 +38,6 @@ typedef ::cppu::WeakImplHelper<
}
class Wall final :
- public cppu::BaseMutex,
public impl::Wall_Base,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx
b/chart2/source/model/template/AreaChartTypeTemplate.cxx
index e3011816153c..6d2c35f45b51 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -121,7 +121,6 @@ AreaChartTypeTemplate::AreaChartTypeTemplate(
StackMode eStackMode,
sal_Int32 nDim /* = 2 */ ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_eStackMode( eStackMode )
{
setFastPropertyValue_NoBroadcast( PROP_AREA_TEMPLATE_DIMENSION, uno::Any(
nDim ));
diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx
b/chart2/source/model/template/AreaChartTypeTemplate.hxx
index 3116c0d59a99..76a5bfd4c890 100644
--- a/chart2/source/model/template/AreaChartTypeTemplate.hxx
+++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx
@@ -22,14 +22,12 @@
#include <StackMode.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
namespace chart
{
class AreaChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx
b/chart2/source/model/template/BarChartTypeTemplate.cxx
index 9cebf6fa6cfe..58a3196df3bd 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -135,7 +135,6 @@ BarChartTypeTemplate::BarChartTypeTemplate(
BarDirection eDirection,
sal_Int32 nDim /* = 2 */ ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_eStackMode( eStackMode ),
m_eBarDirection( eDirection ),
m_nDim( nDim )
diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx
b/chart2/source/model/template/BarChartTypeTemplate.hxx
index 62188279ea29..ab56869e71cd 100644
--- a/chart2/source/model/template/BarChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BarChartTypeTemplate.hxx
@@ -19,7 +19,6 @@
#pragma once
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <ChartTypeTemplate.hxx>
@@ -29,7 +28,6 @@ namespace chart
{
class BarChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 21956ca78bd7..4f347793f6f6 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -99,8 +99,7 @@ BubbleChartTypeTemplate::BubbleChartTypeTemplate(
Reference<
uno::XComponentContext > const & xContext,
const OUString & rServiceName ) :
- ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex )
+ ChartTypeTemplate( xContext, rServiceName )
{
}
diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
index f4e5c9b3c790..8a59e5e72817 100644
--- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx
+++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx
@@ -20,14 +20,12 @@
#include <ChartTypeTemplate.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
namespace chart
{
class BubbleChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/ChartType.cxx
b/chart2/source/model/template/ChartType.cxx
index 4436c7269a98..e2af341a99b1 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -40,14 +40,13 @@ namespace chart
{
ChartType::ChartType() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_bNotifyChanges( true )
{}
ChartType::ChartType( const ChartType & rOther ) :
impl::ChartType_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_bNotifyChanges( true )
{
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index 3a39424de5fe..69769bc08ff9 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -102,7 +102,6 @@ ColumnLineChartTypeTemplate::ColumnLineChartTypeTemplate(
StackMode eStackMode,
sal_Int32 nNumberOfLines ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_eStackMode( eStackMode )
{
setFastPropertyValue_NoBroadcast( PROP_COL_LINE_NUMBER_OF_LINES, uno::Any(
nNumberOfLines ));
diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
index f76f329a1a4f..68f144d6fedb 100644
--- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx
@@ -22,14 +22,12 @@
#include <StackMode.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
namespace chart
{
class ColumnLineChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx
b/chart2/source/model/template/LineChartTypeTemplate.cxx
index 128f8b73a4cb..8df02d55e896 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -121,7 +121,6 @@ LineChartTypeTemplate::LineChartTypeTemplate(
bool bHasLines /* = true */,
sal_Int32 nDim /* = 2 */ ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_eStackMode( eStackMode ),
m_bHasSymbols( bSymbols ),
m_bHasLines( bHasLines ),
diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx
b/chart2/source/model/template/LineChartTypeTemplate.hxx
index 88ad1a7da3ef..a634fb390aae 100644
--- a/chart2/source/model/template/LineChartTypeTemplate.hxx
+++ b/chart2/source/model/template/LineChartTypeTemplate.hxx
@@ -20,7 +20,6 @@
#include <ChartTypeTemplate.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <StackMode.hxx>
#include <comphelper/uno3.hxx>
@@ -28,7 +27,6 @@ namespace chart
{
class LineChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx
b/chart2/source/model/template/PieChartTypeTemplate.cxx
index 267dc6b8e6c9..38761d4d899c 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -125,8 +125,7 @@ PieChartTypeTemplate::PieChartTypeTemplate(
chart2::PieChartOffsetMode eMode,
bool bRings /* = false */,
sal_Int32 nDim /* = 2 */ ) :
- ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex )
+ ChartTypeTemplate( xContext, rServiceName )
{
setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_OFFSET_MODE,
uno::Any( eMode ));
setFastPropertyValue_NoBroadcast( PROP_PIE_TEMPLATE_DIMENSION,
uno::Any( nDim ));
diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx
b/chart2/source/model/template/PieChartTypeTemplate.hxx
index 06e80bbb3b37..a92cfbfd0f14 100644
--- a/chart2/source/model/template/PieChartTypeTemplate.hxx
+++ b/chart2/source/model/template/PieChartTypeTemplate.hxx
@@ -19,7 +19,6 @@
#pragma once
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
#include <ChartTypeTemplate.hxx>
@@ -29,7 +28,6 @@ namespace chart
{
class PieChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 6fae43023339..9aa741c1d4ec 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -121,7 +121,6 @@ ScatterChartTypeTemplate::ScatterChartTypeTemplate(
bool bHasLines /* = true */,
sal_Int32 nDim /* = 2 */ ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_bHasSymbols( bSymbols ),
m_bHasLines( bHasLines ),
m_nDim( nDim )
diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
index 88441b84482f..0d7aec7ad188 100644
--- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx
+++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx
@@ -20,14 +20,12 @@
#include <ChartTypeTemplate.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
namespace chart
{
class ScatterChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx
b/chart2/source/model/template/StockChartTypeTemplate.cxx
index 3b46cb395290..566d008adb6b 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -129,7 +129,6 @@ StockChartTypeTemplate::StockChartTypeTemplate(
StockVariant eVariant,
bool bJapaneseStyle ) :
ChartTypeTemplate( xContext, rServiceName ),
- ::property::OPropertySet( m_aMutex ),
m_eStockVariant( eVariant )
{
setFastPropertyValue_NoBroadcast(
diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx
b/chart2/source/model/template/StockChartTypeTemplate.hxx
index 78d6c02e11e4..aed35a000919 100644
--- a/chart2/source/model/template/StockChartTypeTemplate.hxx
+++ b/chart2/source/model/template/StockChartTypeTemplate.hxx
@@ -20,14 +20,12 @@
#include <ChartTypeTemplate.hxx>
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <comphelper/uno3.hxx>
namespace chart
{
class StockChartTypeTemplate :
- public cppu::BaseMutex,
public ChartTypeTemplate,
public ::property::OPropertySet
{
diff --git a/chart2/source/tools/OPropertySet.cxx
b/chart2/source/tools/OPropertySet.cxx
index bcf92741f4b5..817fb44a2c8d 100644
--- a/chart2/source/tools/OPropertySet.cxx
+++ b/chart2/source/tools/OPropertySet.cxx
@@ -40,23 +40,25 @@ using ::cppu::OPropertySetHelper;
namespace property
{
-OPropertySet::OPropertySet( ::osl::Mutex & par_rMutex ) :
- OBroadcastHelper( par_rMutex ),
+OPropertySet::OPropertySet( ) :
+ OBroadcastHelper( m_aMutex ),
// the following causes a warning; there seems to be no way to avoid it
OPropertySetHelper( static_cast< OBroadcastHelper & >( *this )),
- m_rMutex( par_rMutex ),
m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
{
}
-OPropertySet::OPropertySet( const OPropertySet & rOther, ::osl::Mutex &
par_rMutex ) :
- OBroadcastHelper( par_rMutex ),
+OPropertySet::OPropertySet( const OPropertySet & rOther ) :
+ OBroadcastHelper( m_aMutex ),
// the following causes a warning; there seems to be no way to avoid it
OPropertySetHelper( static_cast< OBroadcastHelper & >( *this )),
- m_rMutex( par_rMutex ),
+ css::lang::XTypeProvider(),
+ css::beans::XPropertyState(),
+ css::beans::XMultiPropertyStates(),
+ css::style::XStyleSupplier(),
m_bSetNewValuesExplicitlyEvenIfTheyEqualDefault(false)
{
- MutexGuard aGuard( m_rMutex );
+ MutexGuard aGuard( m_aMutex );
m_aProperties = rOther.m_aProperties;
diff --git a/chart2/source/tools/RegressionCurveModel.cxx
b/chart2/source/tools/RegressionCurveModel.cxx
index 890913e34378..d4e8d3839b95 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -138,7 +138,6 @@ namespace chart
{
RegressionCurveModel::RegressionCurveModel( tCurveType eCurveType ) :
- ::property::OPropertySet( m_aMutex ),
m_eRegressionCurveType( eCurveType ),
m_xModifyEventForwarder( new ModifyEventForwarder() ),
m_xEquationProperties( new RegressionEquation )
@@ -152,7 +151,7 @@ RegressionCurveModel::RegressionCurveModel( tCurveType
eCurveType ) :
RegressionCurveModel::RegressionCurveModel( const RegressionCurveModel &
rOther ) :
impl::RegressionCurveModel_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_eRegressionCurveType( rOther.m_eRegressionCurveType ),
m_xModifyEventForwarder( new ModifyEventForwarder() )
{
diff --git a/chart2/source/tools/RegressionEquation.cxx
b/chart2/source/tools/RegressionEquation.cxx
index d421b09d5145..4805355aeb60 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -164,13 +164,12 @@ namespace chart
{
RegressionEquation::RegressionEquation() :
- ::property::OPropertySet( m_aMutex ),
m_xModifyEventForwarder( new ModifyEventForwarder())
{}
RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) :
impl::RegressionEquation_Base(rOther),
- ::property::OPropertySet( rOther, m_aMutex ),
+ ::property::OPropertySet( rOther ),
m_xModifyEventForwarder( new ModifyEventForwarder())
{}
diff --git a/chart2/source/tools/RegressionEquation.hxx
b/chart2/source/tools/RegressionEquation.hxx
index 9c26a6ad9d0f..8a500cd1d73c 100644
--- a/chart2/source/tools/RegressionEquation.hxx
+++ b/chart2/source/tools/RegressionEquation.hxx
@@ -24,7 +24,6 @@
#include <OPropertySet.hxx>
-#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/implbase.hxx>
#include <comphelper/uno3.hxx>
#include <ModifyListenerHelper.hxx>
@@ -44,7 +43,6 @@ typedef ::cppu::WeakImplHelper<
}
class RegressionEquation final :
- public cppu::BaseMutex,
public impl::RegressionEquation_Base,
public ::property::OPropertySet
{
