sc/inc/document.hxx | 3 ++-
sc/source/core/data/documen2.cxx | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 300308480c0d4d660a2899a26c08275b87c2c303
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Mon Dec 20 19:00:51 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Jan 4 07:06:26 2022 +0100
osl::Mutex->std::mutex in ScDocument
Change-Id: I163b7e6b7403f9f489b4965861241280cfc37e02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127917
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index 2d3d66b8a8bb..07f488df346d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -47,6 +47,7 @@
#include <cassert>
#include <memory>
#include <map>
+#include <mutex>
#include <optional>
#include <set>
#include <unordered_map>
@@ -469,7 +470,7 @@ private:
mutable ScInterpreterContext maInterpreterContext;
- osl::Mutex mScLookupMutex; // protection for thread-unsafe parts of
handling ScLookup
+ std::mutex mScLookupMutex; // protection for thread-unsafe parts of
handling ScLookup
static const sal_uInt16 nSrcVer; // file version
(load/save)
sal_uInt16 nFormulaTrackCount;
diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 478a42c62f52..48bd7737dcfe 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -1167,7 +1167,7 @@ ScLookupCache & ScDocument::GetLookupCache( const ScRange
& rRange, ScInterprete
pCache = findIt->second.get();
// The StartListeningArea() call is not thread-safe, as all threads
// would access the same SvtBroadcaster.
- osl::MutexGuard guard( mScLookupMutex );
+ std::unique_lock guard( mScLookupMutex );
StartListeningArea(rRange, false, pCache);
}
else
