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 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 #include -#include -#include +#include 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 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;