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

BaseMutex->std::mutex in PDFIRawAdaptor

Browse Source 
Change-Id: I3aae98e20ce20845835e1e5b7366a3f286e57ae5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148280
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2023-03-05 16:32:10 +02:00
parent db02d2e1a7
commit c5ebd807ca
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sdext/source/pdfimport/pdfiadaptor.cxx
View File

@@ -44,7 +44,6 @@ namespace pdfi
{ {
PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentContext >& xContext ) : PDFIHybridAdaptor::PDFIHybridAdaptor( const uno::Reference< uno::XComponentContext >& xContext ) :
PDFIHybridAdaptorBase( m_aMutex ),
m_xContext( xContext ) m_xContext( xContext )
{ {
} }
@@ -203,7 +202,6 @@ css::uno::Sequence<OUString> PDFIHybridAdaptor::getSupportedServiceNames()
} }
PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const uno::Reference< uno::XComponentContext >& xContext ) : PDFIRawAdaptor::PDFIRawAdaptor( OUString const & implementationName, const uno::Reference< uno::XComponentContext >& xContext ) :
PDFIAdaptorBase( m_aMutex ),
m_implementationName(implementationName), m_implementationName(implementationName),
m_xContext( xContext ) m_xContext( xContext )
{ {

13
sdext/source/pdfimport/pdfiadaptor.hxx
View File

@@ -34,19 +34,17 @@
#include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XImporter.hpp>
#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel.hpp>
#include <cppuhelper/compbase.hxx> #include <comphelper/compbase.hxx>
#include <cppuhelper/basemutex.hxx>
namespace pdfi namespace pdfi
{ {
typedef ::cppu::WeakComponentImplHelper< typedef ::comphelper::WeakComponentImplHelper<
css::document::XFilter, css::document::XFilter,
css::document::XImporter, css::document::XImporter,
css::lang::XServiceInfo> PDFIHybridAdaptorBase; css::lang::XServiceInfo> PDFIHybridAdaptorBase;
class PDFIHybridAdaptor : private cppu::BaseMutex, class PDFIHybridAdaptor : public PDFIHybridAdaptorBase
public PDFIHybridAdaptorBase
{ {
private: private:
css::uno::Reference< css::uno::Reference<
@@ -72,15 +70,14 @@ namespace pdfi
css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override; css::uno::Sequence<OUString> SAL_CALL getSupportedServiceNames() override;
}; };
typedef ::cppu::WeakComponentImplHelper< typedef ::comphelper::WeakComponentImplHelper<
css::xml::XImportFilter, css::xml::XImportFilter,
css::document::XImporter, css::document::XImporter,
css::lang::XServiceInfo> PDFIAdaptorBase; css::lang::XServiceInfo> PDFIAdaptorBase;
/** Adapts raw pdf import to XImportFilter interface /** Adapts raw pdf import to XImportFilter interface
*/ */
class PDFIRawAdaptor : private cppu::BaseMutex, class PDFIRawAdaptor : public PDFIAdaptorBase
public PDFIAdaptorBase
{ {
private: private:
OUString const m_implementationName; OUString const m_implementationName;