chart2/inc/ChartView.hxx | 3 ++- chart2/source/view/main/ChartView.cxx | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-)
New commits: commit 3ca80266b730d7557dc41568b62cc29f932706b4 Author: Noel Grandin <noel.gran...@collabora.co.uk> AuthorDate: Wed Feb 15 14:14:38 2023 +0200 Commit: Noel Grandin <noel.gran...@collabora.co.uk> CommitDate: Thu Feb 16 06:27:59 2023 +0000 osl::Mutex->std::mutex in ChartView Change-Id: Iebb2d1352b76108e803605dc856407ce2484e5a3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147098 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk> diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index d0f64d047b05..b521f2e8715b 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -40,6 +40,7 @@ #include <vector> #include <memory> +#include <mutex> #include <vcl/timer.hxx> @@ -247,7 +248,7 @@ private: //member css::awt::Rectangle m_aResultingDiagramRectangleExcludingAxes; TimeBasedInfo maTimeBased; - osl::Mutex maTimeMutex; + std::mutex maTimeMutex; }; } diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index da37dd659f9e..2f87382bde56 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1357,7 +1357,7 @@ void ChartView::createShapes() { SolarMutexGuard aSolarGuard; - osl::MutexGuard aTimedGuard(maTimeMutex); + std::unique_lock aTimedGuard(maTimeMutex); if(mrChartModel.isTimeBased()) { maTimeBased.bTimeBased = true; @@ -1844,7 +1844,7 @@ void ChartView::dumpAsXml(xmlTextWriterPtr pWriter) const void ChartView::setViewDirty() { - osl::MutexGuard aGuard(maTimeMutex); + std::unique_lock aGuard(maTimeMutex); m_bViewDirty = true; }