diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-05 16:32:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-03-06 06:43:12 +0000 |
| commit | c5ebd807cafbb978b74f99eb937f8956ad880c6a (patch) | |
| tree | 942951354ea4098e5719e61fbb53d410070a8f57 | |
| parent | db02d2e1a74973cfb467c2f5bb12845bfdf37302 (diff) | |
BaseMutex->std::mutex in PDFIRawAdaptor
Change-Id: I3aae98e20ce20845835e1e5b7366a3f286e57ae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148280
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sdext/source/pdfimport/pdfiadaptor.cxx | 2 | ||||
| -rw-r--r-- | sdext/source/pdfimport/pdfiadaptor.hxx | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/sdext/source/pdfimport/pdfiadaptor.cxx b/sdext/source/pdfimport/pdfiadaptor.cxx index 83019b2e5299..9cca84cdf92f 100644 --- a/sdext/source/pdfimport/pdfiadaptor.cxx +++ b/sdext/source/pdfimport/pdfiadaptor.cxx @@ -44,7 +44,6 @@ namespace pdfi { PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentContext >& xContext ) : - PDFIHybridAdaptorBase( m_aMutex ), m_xContext( xContext ) { } @@ -203,7 +202,6 @@ css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames() } PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const uno::Reference< uno::XComponentContext >& xContext ) : - PDFIAdaptorBase( m_aMutex ), m_implementationName(implementationName), m_xContext( xContext ) { diff --git a/sdext/source/pdfimport/pdfiadaptor.hxx b/sdext/source/pdfimport/pdfiadaptor.hxx index 0a184f3cf8e0..8cf225b74332 100644 --- a/sdext/source/pdfimport/pdfiadaptor.hxx +++ b/sdext/source/pdfimport/pdfiadaptor.hxx @@ -34,19 +34,17 @@ #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> namespace pdfi { - typedef ::cppu::WeakComponentImplHelper< + typedef ::comphelper::WeakComponentImplHelper< css::document::XFilter, css::document::XImporter, css::lang::XServiceInfo> PDFIHybridAdaptorBase; - class PDFIHybridAdaptor : private cppu::BaseMutex, - public PDFIHybridAdaptorBase + class PDFIHybridAdaptor : public PDFIHybridAdaptorBase { private: css::uno::Reference< @@ -72,15 +70,14 @@ namespace pdfi css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; }; - typedef ::cppu::WeakComponentImplHelper< + typedef ::comphelper::WeakComponentImplHelper< css::xml::XImportFilter, css::document::XImporter, css::lang::XServiceInfo> PDFIAdaptorBase; /** Adapts raw pdf import to XImportFilter interface */ - class PDFIRawAdaptor : private cppu::BaseMutex, - public PDFIAdaptorBase + class PDFIRawAdaptor : public PDFIAdaptorBase { private: OUString const m_implementationName; |