diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-29 15:45:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-29 18:28:09 +0200 |
| commit | 0be7fdfa86208d74ccbd1289ebc9f2cd03c8ae84 (patch) | |
| tree | 8bf3940c3483e272952caddc8d4d1536712111d9 | |
| parent | 27457150b1c85cbf7c084b0930a71b0106b8278b (diff) | |
osl::Mutex->std::mutex in ColumnBlockPositionSet
Change-Id: Ib9232f3b8f78a0a72a2eb1e743451a9f66e80979
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119671
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sc/inc/mtvelements.hxx | 4 | ||||
| -rw-r--r-- | sc/source/core/data/mtvelements.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sc/inc/mtvelements.hxx b/sc/inc/mtvelements.hxx index c4a2eb83413d..a6c4d5ffa7c7 100644 --- a/sc/inc/mtvelements.hxx +++ b/sc/inc/mtvelements.hxx @@ -16,7 +16,6 @@ #include "calcmacros.hxx" #include "postit.hxx" #include "celltextattr.hxx" -#include <osl/mutex.hxx> #if DEBUG_COLUMN_STORAGE #ifdef NDEBUG @@ -32,6 +31,7 @@ #include <unordered_map> #include <memory> +#include <mutex> class ScDocument; class ScColumn; @@ -142,7 +142,7 @@ class ColumnBlockPositionSet ScDocument& mrDoc; TablesType maTables; - osl::Mutex maMtxTables; + std::mutex maMtxTables; public: ColumnBlockPositionSet(ScDocument& rDoc); diff --git a/sc/source/core/data/mtvelements.cxx b/sc/source/core/data/mtvelements.cxx index 792b4e9d60e6..865d37bf2933 100644 --- a/sc/source/core/data/mtvelements.cxx +++ b/sc/source/core/data/mtvelements.cxx @@ -55,7 +55,7 @@ ColumnBlockPositionSet::ColumnBlockPositionSet(ScDocument& rDoc) : mrDoc(rDoc) { ColumnBlockPosition* ColumnBlockPositionSet::getBlockPosition(SCTAB nTab, SCCOL nCol) { - osl::MutexGuard aGuard(&maMtxTables); + std::lock_guard aGuard(maMtxTables); TablesType::iterator itTab = maTables.find(nTab); if (itTab == maTables.end()) @@ -93,7 +93,7 @@ ColumnBlockPosition* ColumnBlockPositionSet::getBlockPosition(SCTAB nTab, SCCOL void ColumnBlockPositionSet::clear() { - osl::MutexGuard aGuard(&maMtxTables); + std::lock_guard aGuard(maMtxTables); maTables.clear(); } |