core.git: Branch 'libreoffice-24-2' - 2 commits - bin/merge-app-bundles ucb/source

[Xisco Fauli (via logerrit)]

 bin/merge-app-bundles                     |    2 +-
 ucb/source/ucp/tdoc/tdoc_datasupplier.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 10f148206f0e352e73361d6a81670ac2eaabb73c
Author:     Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Jul 10 16:49:24 2024 +0200
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Jul 11 10:57:26 2024 +0200

    merge-app-bundles: fix _ctypes.cpython path
    
    Change-Id: I247c9674de88c9b97297d01b24232a562bcade01
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170318
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
    Tested-by: Jenkins
    (cherry picked from commit a7f64217aad6375ea07e260ad2a6bd1e7900af6c)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170301
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/bin/merge-app-bundles b/bin/merge-app-bundles
index b92c90b5a0c9..34f84274ec5d 100755
--- a/bin/merge-app-bundles
+++ b/bin/merge-app-bundles
@@ -110,7 +110,7 @@ OUT=$(cd "$3" && /bin/pwd)
         else
             # We ignore some files that can't be built for macOS on arm64 for 
now
             case "$fname" in
-                
./Contents/Frameworks/LibreOfficePython.framework/Versions/3.7/lib/python*/lib-dynload/_ctypes.cpython-*m.so)
+                
./Contents/Frameworks/LibreOfficePython.framework/Versions/3.*/lib/python*/lib-dynload/_ctypes.cpython-*m.so)
                     ;;
                 *)
                     echo "$fname does not exist in $TWO" >&2
commit 82ab1203e9fcf354f6e3b7d2906714da6a62d35c
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Jul 10 11:14:38 2024 +0100
Commit:     Michael Stahl <michael.st...@allotropia.de>
CommitDate: Thu Jul 11 10:57:15 2024 +0200

    cid#1608592 Double lock
    
    since:
    
    commit 9301f4d486b13dac2a66b797d5e24eb6dc9f7582
    Date:   Thu Feb 16 14:31:25 2023 +0200
    
        osl::Mutex->std::mutex in ResultSetDataSupplier
    
    Change-Id: I6be50541e00f8f8de3bdebe1690e14e805bee14e
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170281
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
    (cherry picked from commit 3374417097edcee8c8951fd1df6044e2d24b74a6)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/170293
    Reviewed-by: Michael Stahl <michael.st...@allotropia.de>

diff --git a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx 
b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
index 9930f80d6e3c..272349bd6e46 100644
--- a/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
+++ b/ucb/source/ucp/tdoc/tdoc_datasupplier.cxx
@@ -77,7 +77,7 @@ ResultSetDataSupplier::queryContentIdentifierString( 
sal_uInt32 nIndex )
 }
 
 OUString
-ResultSetDataSupplier::queryContentIdentifierStringImpl( 
std::unique_lock<std::mutex>& /*rGuard*/, sal_uInt32 nIndex )
+ResultSetDataSupplier::queryContentIdentifierStringImpl( 
std::unique_lock<std::mutex>& rGuard, sal_uInt32 nIndex )
 {
     if ( nIndex < m_aResults.size() )
     {
@@ -89,7 +89,7 @@ ResultSetDataSupplier::queryContentIdentifierStringImpl( 
std::unique_lock<std::m
         }
     }
 
-    if ( getResult( nIndex ) )
+    if ( getResultImpl(rGuard, nIndex) )
     {
         // Note: getResult fills m_pImpl->m_aResults[ nIndex ]->aURL.
         return m_aResults[ nIndex ].aURL;