diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 14:58:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-27 12:40:48 +0000 |
| commit | 93f9ce7b644c0887423891e0d645b88eb39bc457 (patch) | |
| tree | c205f4f9e9f591308b2cc1bf46663f368aa27c92 | |
| parent | 5ee84725f59e880d38ab7adb43b2a8126f2dfd65 (diff) | |
osl::Mutex->std::mutex in rptxml::ImportDocumentHandler
Change-Id: I2e7c2c5642de4e234a551a1b02c8fd69fdcb65c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147860
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx | 2 | ||||
| -rw-r--r-- | reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx index 02607a302af3..f1aa8ceb9f87 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.cxx @@ -330,7 +330,7 @@ void SAL_CALL ImportDocumentHandler::setDocumentLocator(const uno::Reference< xm } void SAL_CALL ImportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments ) { - ::osl::MutexGuard aGuard(m_aMutex); + std::unique_lock aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); m_xDocumentHandler = aArgs.getUnpackedValueOrDefault("DocumentHandler",m_xDocumentHandler); m_xModel = aArgs.getUnpackedValueOrDefault("Model",m_xModel); diff --git a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx index 73eeab8df376..d0b6d4db36ef 100644 --- a/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx +++ b/reportdesign/source/filter/xml/xmlImportDocumentHandler.hxx @@ -32,6 +32,7 @@ #include <comphelper/uno3.hxx> #include <xmloff/xmlimp.hxx> #include <memory> +#include <mutex> class SvXMLTokenMap; namespace rptxml @@ -73,7 +74,7 @@ private: virtual ~ImportDocumentHandler() override; - ::osl::Mutex m_aMutex; + std::mutex m_aMutex; bool m_bImportedChart; ::std::vector< OUString> m_aMasterFields; ::std::vector< OUString> m_aDetailFields; |