diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-29 15:49:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-29 19:25:23 +0200 |
| commit | 720ddd9c132928192df907886cf8dec64a311833 (patch) | |
| tree | 7cf33bbf7819eaad4ef18e46213053c54f297c87 | |
| parent | c186d09f88d6a4992382a1d15b60db6dbed3a91b (diff) | |
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.grandin@collabora.co.uk>
| -rw-r--r-- | sc/source/filter/inc/formulabuffer.hxx | 4 | ||||
| -rw-r--r-- | sc/source/filter/oox/formulabuffer.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
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; |