summaryrefslogtreecommitdiff
path: root/sax/source
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2022-05-08 13:06:00 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-05-08 20:50:34 +0200
commitcdf8e971d5d46df4bcab35a99c4254df9459213f (patch)
tree2cfd304da5e59ab7931c7fcff30e8978f54dc9ea /sax/source
parent34948e67772b4b27f47c4871b7428a0e3306d770 (diff)
osl::Mutex->std::mutex in SaxExpatParser
Change-Id: I9d99497dfbc67cd4dd690da9db58aab0db114d36 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134021 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sax/source')
-rw-r--r--sax/source/expatwrap/sax_expat.cxx7
1 files changed, 4 insertions, 3 deletions
diff --git a/sax/source/expatwrap/sax_expat.cxx b/sax/source/expatwrap/sax_expat.cxx
index a50fb9e024a7..78b7e2252da0 100644
--- a/sax/source/expatwrap/sax_expat.cxx
+++ b/sax/source/expatwrap/sax_expat.cxx
@@ -20,6 +20,7 @@
#include <string.h>
#include <cassert>
#include <memory>
+#include <mutex>
#include <utility>
#include <string_view>
#include <vector>
@@ -146,7 +147,7 @@ constexpr OUStringLiteral gsCDATA = u"CDATA";
class SaxExpatParser_Impl
{
public: // module scope
- Mutex aMutex;
+ std::mutex aMutex;
bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator
css::uno::Reference< XDocumentHandler > rDocumentHandler;
@@ -378,7 +379,7 @@ SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments
OUString str;
if ((rArguments[0] >>= str) && "DoSmeplease" == str)
{
- MutexGuard guard( m_pImpl->aMutex );
+ std::unique_lock guard( m_pImpl->aMutex );
m_pImpl->m_bEnableDoS = true;
}
}
@@ -412,7 +413,7 @@ public:
void SaxExpatParser::parseStream( const InputSource& structSource)
{
// Only one text at one time
- MutexGuard guard( m_pImpl->aMutex );
+ std::unique_lock guard( m_pImpl->aMutex );
struct Entity entity;