diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-23 15:46:48 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2023-02-24 12:00:34 +0000 |
| commit | c3178e3ad6a6faf1ea66898672e173b0008bce5c (patch) | |
| tree | 565e5a0617a41b8cb121315b6a581ce35e13386c /filter/source/pdf/pdfexport.cxx | |
| parent | e66940a8d147c1dff14e34c8e9421dcf2429cb4f (diff) | |
BaseMutex->std::mutex in PDFErrorRequest
Change-Id: Iae9c6fa3da9547d233470168aff3cda6270739cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147589
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'filter/source/pdf/pdfexport.cxx')
| -rw-r--r-- | filter/source/pdf/pdfexport.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx index 9d97f2134f41..9d0971074dcd 100644 --- a/filter/source/pdf/pdfexport.cxx +++ b/filter/source/pdf/pdfexport.cxx @@ -37,8 +37,7 @@ #include <basegfx/polygon/b2dpolygontools.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <unotools/configmgr.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/basemutex.hxx> +#include <comphelper/compbase.hxx> #include <officecfg/Office/Common.hxx> #include "pdfexport.hxx" @@ -1090,10 +1089,9 @@ bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue >& namespace { -typedef cppu::WeakComponentImplHelper< task::XInteractionRequest > PDFErrorRequestBase; +typedef comphelper::WeakComponentImplHelper< task::XInteractionRequest > PDFErrorRequestBase; -class PDFErrorRequest : private cppu::BaseMutex, - public PDFErrorRequestBase +class PDFErrorRequest : public PDFErrorRequestBase { task::PDFExportException maExc; public: @@ -1106,7 +1104,6 @@ public: PDFErrorRequest::PDFErrorRequest( task::PDFExportException aExc ) : - PDFErrorRequestBase( m_aMutex ), maExc(std::move( aExc )) { } @@ -1114,7 +1111,7 @@ PDFErrorRequest::PDFErrorRequest( task::PDFExportException aExc ) : uno::Any SAL_CALL PDFErrorRequest::getRequest() { - osl::MutexGuard const guard( m_aMutex ); + std::unique_lock guard( m_aMutex ); uno::Any aRet; aRet <<= maExc; |