[Libreoffice-commits] core.git: xmloff/source
Noel Grandin (via logerrit)
logerrit at kemper.freedesktop.org
Sun Aug 1 11:58:30 UTC 2021
xmloff/source/core/xmlexp.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit a32af6867b7fdc6dccf78ffbb63573fd4224883b
Author: Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Sat Jul 31 19:05:10 2021 +0200
Commit: Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun Aug 1 13:54:57 2021 +0200
osl::Mutex->std::mutex in SvXMLExport::SetError
Change-Id: Ibc72ed31df8291587d39dd46f604572b7ca1a147
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119753
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/xmloff/source/core/xmlexp.cxx b/xmloff/source/core/xmlexp.cxx
index 3159aa44e683..f45afea8aaa5 100644
--- a/xmloff/source/core/xmlexp.cxx
+++ b/xmloff/source/core/xmlexp.cxx
@@ -21,11 +21,11 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <mutex>
#include <stack>
#include <optional>
#include <xmloff/unointerfacetouniqueidentifiermapper.hxx>
-#include <osl/mutex.hxx>
#include <tools/urlobj.hxx>
#include <vcl/graph.hxx>
#include <comphelper/genericpropertyset.hxx>
@@ -2269,8 +2269,8 @@ void SvXMLExport::SetError(
const Reference<XLocator>& rLocator )
{
// allow multi-threaded access to the cancel() method
- static osl::Mutex aMutex;
- osl::MutexGuard aGuard(aMutex);
+ static std::mutex aMutex;
+ std::lock_guard aGuard(aMutex);
// maintain error flags
if ( ( nId & XMLERROR_FLAG_ERROR ) != 0 )
More information about the Libreoffice-commits
mailing list