[Libreoffice-commits] core.git: ucb/source

[Noel Grandin (via logerrit)]

 ucb/source/sorter/sortdynres.cxx |    6 +++---
 ucb/source/sorter/sortdynres.hxx |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit eefa8e8110c432be36e1cd5d166b5f5676a7e5ca
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 16 19:50:32 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Fri Feb 17 08:19:52 2023 +0000

    osl::Mutex->std::mutex in SortedDynamicResultSetListener
    
    Change-Id: I70b20a616cb84c5c066431be50359def5d041b3b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147188
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/ucb/source/sorter/sortdynres.cxx b/ucb/source/sorter/sortdynres.cxx
index fe142c2b53f4..a3bf493a2ba0 100644
--- a/ucb/source/sorter/sortdynres.cxx
+++ b/ucb/source/sorter/sortdynres.cxx
@@ -474,7 +474,7 @@ 
SortedDynamicResultSetListener::~SortedDynamicResultSetListener()
 void SAL_CALL
 SortedDynamicResultSetListener::disposing( const EventObject& /*Source*/ )
 {
-    osl::Guard< osl::Mutex > aGuard( maMutex );
+    std::unique_lock aGuard( maMutex );
 
     if ( mpOwner )
         mpOwner->impl_disposing();
@@ -486,7 +486,7 @@ SortedDynamicResultSetListener::disposing( const 
EventObject& /*Source*/ )
 void SAL_CALL
 SortedDynamicResultSetListener::notify( const ListEvent& Changes )
 {
-    osl::Guard< osl::Mutex > aGuard( maMutex );
+    std::unique_lock aGuard( maMutex );
 
     if ( mpOwner )
         mpOwner->impl_notify( Changes );
@@ -497,7 +497,7 @@ SortedDynamicResultSetListener::notify( const ListEvent& 
Changes )
 void
 SortedDynamicResultSetListener::impl_OwnerDies()
 {
-    osl::Guard< osl::Mutex > aGuard( maMutex );
+    std::unique_lock aGuard( maMutex );
     mpOwner = nullptr;
 }
 
diff --git a/ucb/source/sorter/sortdynres.hxx b/ucb/source/sorter/sortdynres.hxx
index 320e4d9ddb8e..2bb8f24aa8c2 100644
--- a/ucb/source/sorter/sortdynres.hxx
+++ b/ucb/source/sorter/sortdynres.hxx
@@ -113,7 +113,7 @@ class SortedDynamicResultSetListener: public 
cppu::WeakImplHelper <
     css::ucb::XDynamicResultSetListener >
 {
     SortedDynamicResultSet  *mpOwner;
-    osl::Mutex              maMutex;
+    std::mutex               maMutex;
 
 public:
      SortedDynamicResultSetListener( SortedDynamicResultSet *mOwner );