sc/source/filter/inc/formulabuffer.hxx | 4 ++--
sc/source/filter/oox/formulabuffer.cxx | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 720ddd9c132928192df907886cf8dec64a311833
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Jul 29 15:49:45 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Jul 29 19:25:23 2021 +0200
osl::Mutex->std::mutex in FormulaBuffer
Change-Id: Idef0cddac54da4794553394f48d3006b8145b291
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119672
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/source/filter/inc/formulabuffer.hxx
b/sc/source/filter/inc/formulabuffer.hxx
index 38eac0056fee..052741bfcf34 100644
--- a/sc/source/filter/inc/formulabuffer.hxx
+++ b/sc/source/filter/inc/formulabuffer.hxx
@@ -9,8 +9,8 @@
#pragma once
-#include <osl/mutex.hxx>
#include "workbookhelper.hxx"
+#include <mutex>
#include <vector>
namespace oox::xls {
@@ -81,7 +81,7 @@ public:
private:
- osl::Mutex maMtxData;
+ std::mutex maMtxData;
// Vectors indexed by SCTAB - cf. SetSheetCount
std::vector< std::vector<TokenAddressItem> > maCellFormulas;
std::vector< std::vector<TokenRangeAddressItem> > maCellArrayFormulas;
diff --git a/sc/source/filter/oox/formulabuffer.cxx
b/sc/source/filter/oox/formulabuffer.cxx
index 50c3722723f1..40470d0bc966 100644
--- a/sc/source/filter/oox/formulabuffer.cxx
+++ b/sc/source/filter/oox/formulabuffer.cxx
@@ -398,7 +398,7 @@ void FormulaBuffer::finalizeImport()
FormulaBuffer::SheetItem FormulaBuffer::getSheetItem( SCTAB nTab )
{
- osl::MutexGuard aGuard(&maMtxData);
+ std::lock_guard aGuard(maMtxData);
SheetItem aItem;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
