[Libreoffice-commits] core.git: 2 commits - chart2/source
Stephan Bergmann (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 9 19:03:15 UTC 2019
chart2/source/inc/MutexContainer.hxx | 7 ++++---
chart2/source/model/main/Axis.cxx | 1 -
chart2/source/model/main/BaseCoordinateSystem.cxx | 1 -
chart2/source/model/main/DataPoint.cxx | 1 -
chart2/source/model/main/DataSeries.cxx | 1 -
chart2/source/model/main/Diagram.cxx | 1 -
chart2/source/model/main/FormattedString.cxx | 1 -
chart2/source/model/main/GridProperties.cxx | 1 -
chart2/source/model/main/Legend.cxx | 1 -
chart2/source/model/main/PageBackground.cxx | 1 -
chart2/source/model/main/StockBar.cxx | 1 -
chart2/source/model/main/Title.cxx | 1 -
chart2/source/model/main/Wall.cxx | 1 -
chart2/source/model/template/ChartType.cxx | 1 -
chart2/source/tools/ErrorBar.cxx | 1 -
chart2/source/tools/MutexContainer.cxx | 3 ---
chart2/source/tools/RegressionCurveModel.cxx | 1 -
chart2/source/tools/RegressionEquation.cxx | 1 -
chart2/source/tools/WrappedPropertySet.cxx | 1 -
19 files changed, 4 insertions(+), 23 deletions(-)
New commits:
commit 6380964c76df2352d2942e6a22d8c1b14e7c1b2e
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu May 9 15:17:58 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu May 9 21:01:58 2019 +0200
MutexContainer is only used mixin-style in derived classes
...no need for virtual dtor
Change-Id: I843e4bbb8bab3ed1eec55be2b937617175911162
Reviewed-on: https://gerrit.libreoffice.org/72049
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/chart2/source/inc/MutexContainer.hxx b/chart2/source/inc/MutexContainer.hxx
index 59c0d43edf8f..c90dc8ec920c 100644
--- a/chart2/source/inc/MutexContainer.hxx
+++ b/chart2/source/inc/MutexContainer.hxx
@@ -27,10 +27,11 @@ namespace chart
class OOO_DLLPUBLIC_CHARTTOOLS MutexContainer
{
-public:
- virtual ~MutexContainer();
-
protected:
+ MutexContainer() = default;
+
+ ~MutexContainer() = default;
+
mutable ::osl::Mutex m_aMutex;
::osl::Mutex & GetMutex() const;
diff --git a/chart2/source/tools/MutexContainer.cxx b/chart2/source/tools/MutexContainer.cxx
index c65cac0180be..7b30db53f0d9 100644
--- a/chart2/source/tools/MutexContainer.cxx
+++ b/chart2/source/tools/MutexContainer.cxx
@@ -22,9 +22,6 @@
namespace chart
{
-MutexContainer::~MutexContainer()
-{}
-
::osl::Mutex & MutexContainer::GetMutex() const
{
return m_aMutex;
commit db9fecd377bbba373ca0818f90182f262f1360da
Author: Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Thu May 9 14:45:03 2019 +0200
Commit: Stephan Bergmann <sbergman at redhat.com>
CommitDate: Thu May 9 21:01:50 2019 +0200
Drop redundant explicit initialization of MutexContainer base class
Change-Id: I028a34626f4e542d01f6ae7cd90fed5a24ad970d
Reviewed-on: https://gerrit.libreoffice.org/72044
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx
index 7f0e0c07233e..c97ff290c245 100644
--- a/chart2/source/model/main/Axis.cxx
+++ b/chart2/source/model/main/Axis.cxx
@@ -333,7 +333,6 @@ Axis::Axis() :
}
Axis::Axis( const Axis & rOther ) :
- MutexContainer(),
impl::Axis_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx
index cd5b1e4fab36..5b5236da80de 100644
--- a/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -151,7 +151,6 @@ BaseCoordinateSystem::BaseCoordinateSystem(
BaseCoordinateSystem::BaseCoordinateSystem(
const BaseCoordinateSystem & rSource ) :
impl::BaseCoordinateSystem_Base(rSource),
- MutexContainer(),
::property::OPropertySet( rSource, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
m_nDimensionCount( rSource.m_nDimensionCount )
diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx
index 6bbdd6f525ac..e7cd416217a8 100644
--- a/chart2/source/model/main/DataPoint.cxx
+++ b/chart2/source/model/main/DataPoint.cxx
@@ -95,7 +95,6 @@ DataPoint::DataPoint( const uno::Reference< beans::XPropertySet > & rParentPrope
}
DataPoint::DataPoint( const DataPoint & rOther ) :
- MutexContainer(),
impl::DataPoint_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx
index 85452f2f6911..8402f320ce40 100644
--- a/chart2/source/model/main/DataSeries.cxx
+++ b/chart2/source/model/main/DataSeries.cxx
@@ -133,7 +133,6 @@ DataSeries::DataSeries() :
}
DataSeries::DataSeries( const DataSeries & rOther ) :
- MutexContainer(),
impl::DataSeries_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx
index 5cc2282bcb65..b8ff4d65bd52 100644
--- a/chart2/source/model/main/Diagram.cxx
+++ b/chart2/source/model/main/Diagram.cxx
@@ -294,7 +294,6 @@ Diagram::Diagram( uno::Reference< uno::XComponentContext > const & xContext ) :
}
Diagram::Diagram( const Diagram & rOther ) :
- MutexContainer(),
impl::Diagram_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xContext( rOther.m_xContext ),
diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx
index b93dbb31104a..3c5f5a0cb0a0 100644
--- a/chart2/source/model/main/FormattedString.cxx
+++ b/chart2/source/model/main/FormattedString.cxx
@@ -104,7 +104,6 @@ FormattedString::FormattedString() :
{}
FormattedString::FormattedString( const FormattedString & rOther ) :
- MutexContainer(),
impl::FormattedString_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_aString( rOther.m_aString ),
diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx
index abe70b6f9288..a05169c24933 100644
--- a/chart2/source/model/main/GridProperties.cxx
+++ b/chart2/source/model/main/GridProperties.cxx
@@ -132,7 +132,6 @@ GridProperties::GridProperties() :
{}
GridProperties::GridProperties( const GridProperties & rOther ) :
- MutexContainer(),
impl::GridProperties_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx
index 07a56608e562..6648826caf50 100644
--- a/chart2/source/model/main/Legend.cxx
+++ b/chart2/source/model/main/Legend.cxx
@@ -183,7 +183,6 @@ Legend::Legend() :
}
Legend::Legend( const Legend & rOther ) :
- MutexContainer(),
impl::Legend_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx
index 27ff536fc1ff..6a0c30d7e566 100644
--- a/chart2/source/model/main/PageBackground.cxx
+++ b/chart2/source/model/main/PageBackground.cxx
@@ -117,7 +117,6 @@ PageBackground::PageBackground() :
{}
PageBackground::PageBackground( const PageBackground & rOther ) :
- MutexContainer(),
impl::PageBackground_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx
index bd512244cfd5..e9ac5e4a529f 100644
--- a/chart2/source/model/main/StockBar.cxx
+++ b/chart2/source/model/main/StockBar.cxx
@@ -124,7 +124,6 @@ StockBar::StockBar( bool bRisingCourse ) :
}
StockBar::StockBar( const StockBar & rOther ) :
- MutexContainer(),
impl::StockBar_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx
index d082d5190eb8..8a02fab86dff 100644
--- a/chart2/source/model/main/Title.cxx
+++ b/chart2/source/model/main/Title.cxx
@@ -234,7 +234,6 @@ Title::Title() :
{}
Title::Title( const Title & rOther ) :
- MutexContainer(),
impl::Title_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx
index 7814d7095366..5ba8aaf18401 100644
--- a/chart2/source/model/main/Wall.cxx
+++ b/chart2/source/model/main/Wall.cxx
@@ -112,7 +112,6 @@ Wall::Wall() :
{}
Wall::Wall( const Wall & rOther ) :
- MutexContainer(),
impl::Wall_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder())
diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx
index 27302b114c92..c863a55ef929 100644
--- a/chart2/source/model/template/ChartType.cxx
+++ b/chart2/source/model/template/ChartType.cxx
@@ -44,7 +44,6 @@ ChartType::ChartType() :
{}
ChartType::ChartType( const ChartType & rOther ) :
- MutexContainer(),
impl::ChartType_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( ModifyListenerHelper::createModifyEventForwarder()),
diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx
index 04512746c8d6..268c4988c904 100644
--- a/chart2/source/tools/ErrorBar.cxx
+++ b/chart2/source/tools/ErrorBar.cxx
@@ -96,7 +96,6 @@ ErrorBar::ErrorBar() :
{}
ErrorBar::ErrorBar( const ErrorBar & rOther ) :
- MutexContainer(),
impl::ErrorBar_Base(rOther),
maDashName(rOther.maDashName),
maLineDash(rOther.maLineDash),
diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx
index 6082e4de6813..618c924dd41b 100644
--- a/chart2/source/tools/RegressionCurveModel.cxx
+++ b/chart2/source/tools/RegressionCurveModel.cxx
@@ -183,7 +183,6 @@ RegressionCurveModel::RegressionCurveModel( tCurveType eCurveType ) :
}
RegressionCurveModel::RegressionCurveModel( const RegressionCurveModel & rOther ) :
- MutexContainer(),
impl::RegressionCurveModel_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_eRegressionCurveType( rOther.m_eRegressionCurveType ),
diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx
index 1051526ce384..d4140691053c 100644
--- a/chart2/source/tools/RegressionEquation.cxx
+++ b/chart2/source/tools/RegressionEquation.cxx
@@ -197,7 +197,6 @@ RegressionEquation::RegressionEquation() :
{}
RegressionEquation::RegressionEquation( const RegressionEquation & rOther ) :
- MutexContainer(),
impl::RegressionEquation_Base(rOther),
::property::OPropertySet( rOther, m_aMutex ),
m_xModifyEventForwarder( new ModifyListenerHelper::ModifyEventForwarder())
diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx
index 2e1ba7dd7d4a..75bb8b68594f 100644
--- a/chart2/source/tools/WrappedPropertySet.cxx
+++ b/chart2/source/tools/WrappedPropertySet.cxx
@@ -32,7 +32,6 @@ using ::com::sun::star::uno::Sequence;
using ::com::sun::star::uno::Any;
WrappedPropertySet::WrappedPropertySet()
- : MutexContainer()
{
}
WrappedPropertySet::~WrappedPropertySet()
More information about the Libreoffice-commits
mailing list