[Libreoffice-commits] core.git: 2 commits - dbaccess/source sdext/source

[Noel Grandin (via logerrit)]

 dbaccess/source/core/inc/PropertyForward.hxx  |    6 +++---
 dbaccess/source/core/misc/PropertyForward.cxx |    6 +++---
 sdext/source/pdfimport/filterdet.cxx          |    3 +--
 sdext/source/pdfimport/filterdet.hxx          |    7 +++----
 4 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit b0244ef9e44c5c1dc9faf9705f2ae1dba499d62c
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Mar 5 15:27:13 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Mar 6 06:42:38 2023 +0000

    BaseMutex->std::mutex in OPropertyForward
    
    Change-Id: I9918bd4fbedb2f6517278c010b6ee66ba7f9c851
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148277
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/dbaccess/source/core/inc/PropertyForward.hxx 
b/dbaccess/source/core/inc/PropertyForward.hxx
index daf31758d000..ec51c672544a 100644
--- a/dbaccess/source/core/inc/PropertyForward.hxx
+++ b/dbaccess/source/core/inc/PropertyForward.hxx
@@ -23,8 +23,8 @@
 #include <com/sun/star/beans/XPropertySetInfo.hpp>
 #include <com/sun/star/container/XNameAccess.hpp>
 #include <cppuhelper/implbase.hxx>
-#include <cppuhelper/basemutex.hxx>
 
+#include <mutex>
 #include <vector>
 
 namespace dbaccess
@@ -33,9 +33,9 @@ namespace dbaccess
     // OPropertyForward
     typedef ::cppu::WeakImplHelper<   css::beans::XPropertyChangeListener
                                   >   OPropertyForward_Base;
-    class OPropertyForward  :public ::cppu::BaseMutex
-                            ,public OPropertyForward_Base
+    class OPropertyForward : public OPropertyForward_Base
     {
+        std::mutex m_aMutex;
         css::uno::Reference< css::beans::XPropertySet >       m_xSource;
         css::uno::Reference< css::beans::XPropertySet >       m_xDest;
         css::uno::Reference< css::beans::XPropertySetInfo >   m_xDestInfo;
diff --git a/dbaccess/source/core/misc/PropertyForward.cxx 
b/dbaccess/source/core/misc/PropertyForward.cxx
index 07e1068f695f..b02ce82cea53 100644
--- a/dbaccess/source/core/misc/PropertyForward.cxx
+++ b/dbaccess/source/core/misc/PropertyForward.cxx
@@ -69,7 +69,7 @@ namespace dbaccess
 
     void SAL_CALL OPropertyForward::propertyChange( const PropertyChangeEvent& 
evt )
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
 
         if ( !m_xDestContainer.is() )
             throw DisposedException( OUString(), *this );
@@ -111,7 +111,7 @@ namespace dbaccess
 
     void SAL_CALL OPropertyForward::disposing( const css::lang::EventObject& 
/*_rSource*/ )
     {
-        ::osl::MutexGuard aGuard(m_aMutex);
+        std::unique_lock aGuard(m_aMutex);
 
         if ( !m_xSource.is() )
             throw DisposedException( OUString(), *this );
@@ -125,7 +125,7 @@ namespace dbaccess
 
     void OPropertyForward::setDefinition( const css::uno::Reference< 
css::beans::XPropertySet>& _xDest )
     {
-        ::osl::MutexGuard aGuard( m_aMutex );
+        std::unique_lock aGuard( m_aMutex );
         if ( m_bInInsert )
             return;
 
commit 43860c10b7d776a7767ef81b1cc833c35feea3c2
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Sun Mar 5 16:00:03 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Mar 6 06:42:25 2023 +0000

    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.gran...@collabora.co.uk>

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<