mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

osl::Mutex->std::mutex in SaxExpatParser

Browse Source 
Change-Id: I9d99497dfbc67cd4dd690da9db58aab0db114d36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134021
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2022-05-08 13:06:00 +02:00
committed by Noel Grandin
parent 34948e6777
commit cdf8e971d5
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sax/source/expatwrap/sax_expat.cxx
View File

@@ -20,6 +20,7 @@
#include <string.h> #include <string.h>
#include <cassert> #include <cassert>
#include <memory> #include <memory>
#include <mutex>
#include <utility> #include <utility>
#include <string_view> #include <string_view>
#include <vector> #include <vector>
@@ -146,7 +147,7 @@ constexpr OUStringLiteral gsCDATA = u"CDATA";
class SaxExpatParser_Impl class SaxExpatParser_Impl
{ {
public: // module scope public: // module scope
Mutex aMutex; std::mutex aMutex;
bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator bool m_bEnableDoS; // fdo#60471 thank you Adobe Illustrator
css::uno::Reference< XDocumentHandler > rDocumentHandler; css::uno::Reference< XDocumentHandler > rDocumentHandler;
@@ -378,7 +379,7 @@ SaxExpatParser::initialize(css::uno::Sequence< css::uno::Any > const& rArguments
OUString str; OUString str;
if ((rArguments[0] >>= str) && "DoSmeplease" == str) if ((rArguments[0] >>= str) && "DoSmeplease" == str)
{ {
MutexGuard guard( m_pImpl->aMutex ); std::unique_lock guard( m_pImpl->aMutex );
m_pImpl->m_bEnableDoS = true; m_pImpl->m_bEnableDoS = true;
} }
} }
@@ -412,7 +413,7 @@ public:
void SaxExpatParser::parseStream( const InputSource& structSource) void SaxExpatParser::parseStream( const InputSource& structSource)
{ {
// Only one text at one time // Only one text at one time
MutexGuard guard( m_pImpl->aMutex ); std::unique_lock guard( m_pImpl->aMutex );
struct Entity entity; struct Entity entity;