diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-31 18:37:26 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-07-31 21:14:53 +0200 |
| commit | 1eb4056b3c95dd62f242532b1b5e53b2a8139e36 (patch) | |
| tree | 9e63e218e86097003bdb07d615a1b79f607692da | |
| parent | f146cb69eb2a2cc0bffb0e76dbccbcdf942d5f7e (diff) | |
osl::Mutex->std::mutex in ScPoolHelper
Change-Id: I85b8bdf80e97e7588db811c1bdf71cc2346d3245
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119746
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sc/source/core/data/poolhelp.cxx | 2 | ||||
| -rw-r--r-- | sc/source/core/inc/poolhelp.hxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/core/data/poolhelp.cxx b/sc/source/core/data/poolhelp.cxx index bd27a96c46cb..71cfa4eaf4ff 100644 --- a/sc/source/core/data/poolhelp.cxx +++ b/sc/source/core/data/poolhelp.cxx @@ -91,7 +91,7 @@ std::unique_ptr<SvNumberFormatter> ScPoolHelper::CreateNumberFormatter() const { std::unique_ptr<SvNumberFormatter> p; { - osl::MutexGuard aGuard(&maMtxCreateNumFormatter); + std::lock_guard aGuard(maMtxCreateNumFormatter); p.reset(new SvNumberFormatter(comphelper::getProcessComponentContext(), LANGUAGE_SYSTEM)); } p->SetColorLink( LINK(&m_rSourceDoc, ScDocument, GetUserDefinedColor) ); diff --git a/sc/source/core/inc/poolhelp.hxx b/sc/source/core/inc/poolhelp.hxx index ad725fcf82d8..ed1275da5ac9 100644 --- a/sc/source/core/inc/poolhelp.hxx +++ b/sc/source/core/inc/poolhelp.hxx @@ -22,8 +22,8 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <docoptio.hxx> -#include <osl/mutex.hxx> #include <svl/itempool.hxx> +#include <mutex> class ScDocument; class ScDocumentPool; @@ -34,7 +34,7 @@ class SfxItemPool; class ScPoolHelper final : public salhelper::SimpleReferenceObject { private: - mutable osl::Mutex maMtxCreateNumFormatter; + mutable std::mutex maMtxCreateNumFormatter; ScDocOptions aOpt; rtl::Reference<ScDocumentPool> pDocPool; rtl::Reference< ScStyleSheetPool > mxStylePool; |