diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-05 16:00:03 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-06 06:42:25 +0000 |
| commit | 43860c10b7d776a7767ef81b1cc833c35feea3c2 (patch) | |
| tree | f106918273df9c6c373c5fb1ad9fb03e82af0ee5 /sdext/source | |
| parent | 928db79c823a55c1d2b2b7d7a64d5fbc8055a2af (diff) | |
BaseMutex->std::mutex in PDFDetector
Change-Id: I353a376b6e6e3e9e1c1a8e1fcbf6aefa273e26d8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148279
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sdext/source')
| -rw-r--r-- | sdext/source/pdfimport/filterdet.cxx | 3 | ||||
| -rw-r--r-- | sdext/source/pdfimport/filterdet.hxx | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/sdext/source/pdfimport/filterdet.cxx b/sdext/source/pdfimport/filterdet.cxx index 69aa90a26b9b..f6356d8676e8 100644 --- a/sdext/source/pdfimport/filterdet.cxx +++ b/sdext/source/pdfimport/filterdet.cxx @@ -184,7 +184,6 @@ unsigned int FileEmitContext::readOrigBytes( unsigned int nOrigOffset, unsigned PDFDetector::PDFDetector( uno::Reference< uno::XComponentContext > xContext) : - PDFDetectorBase( m_aMutex ), m_xContext(std::move( xContext )) {} @@ -287,7 +286,7 @@ bool copyToTemp(uno::Reference<io::XInputStream> const& xInput, oslFileHandle& r // XExtendedFilterDetection OUString SAL_CALL PDFDetector::detect( uno::Sequence< beans::PropertyValue >& rFilterData ) { - osl::MutexGuard const guard( m_aMutex ); + std::unique_lock guard( m_aMutex ); bool bSuccess = false; // get the InputStream carrying the PDF content diff --git a/sdext/source/pdfimport/filterdet.hxx b/sdext/source/pdfimport/filterdet.hxx index c5f8b0d58772..48bc8ca4e12a 100644 --- a/sdext/source/pdfimport/filterdet.hxx +++ b/sdext/source/pdfimport/filterdet.hxx @@ -24,18 +24,17 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/io/XStream.hpp> -#include <cppuhelper/compbase.hxx> +#include <comphelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> namespace pdfi { -typedef ::cppu::WeakComponentImplHelper< +typedef ::comphelper::WeakComponentImplHelper< css::document::XExtendedFilterDetection, css::lang::XServiceInfo> PDFDetectorBase; -class PDFDetector : private cppu::BaseMutex, - public PDFDetectorBase +class PDFDetector : public PDFDetectorBase { private: css::uno::Reference< |