core.git: Branch 'libreoffice-24-8' - accessibility/inc accessibility/source

[Caolán McNamara (via logerrit)]

 accessibility/inc/standard/vclxaccessiblelistitem.hxx    |    2 ++
 accessibility/source/standard/vclxaccessiblelistitem.cxx |    9 +++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit b1bce50b5bfececd6d08c4114cce70468ee55142
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Mon Aug 26 20:25:36 2024 +0100
Commit:     Caolán McNamara <caolan.mcnam...@collabora.com>
CommitDate: Tue Aug 27 11:18:16 2024 +0200

    cid#1608497 Double lock
    
    Change-Id: Idacac84614411efe7516de9aa7740d7d47863ad7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/172409
    Tested-by: Jenkins
    Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>

diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx 
b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
index 83142b50ed6f..64fd27d4d97c 100644
--- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx
+++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx
@@ -75,6 +75,8 @@ private:
     virtual css::lang::Locale               implGetLocale() override;
     virtual void                            implGetSelection( sal_Int32& 
nStartIndex, sal_Int32& nEndIndex ) override;
 
+    OUString getTextRangeImpl(std::unique_lock<std::mutex>& rGuard, sal_Int32 
nStartIndex, sal_Int32 nEndIndex);
+
 public:
     /** OAccessibleBase needs a valid view
         @param  _nIndexInParent
diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx 
b/accessibility/source/standard/vclxaccessiblelistitem.cxx
index 62cd311abbe0..85dcec8d9a0b 100644
--- a/accessibility/source/standard/vclxaccessiblelistitem.cxx
+++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx
@@ -479,12 +479,17 @@ OUString SAL_CALL VCLXAccessibleListItem::getText()
     return m_sEntryText;
 }
 
+OUString 
VCLXAccessibleListItem::getTextRangeImpl(std::unique_lock<std::mutex>& 
/*rGuard*/, sal_Int32 nStartIndex, sal_Int32 nEndIndex)
+{
+    return OCommonAccessibleText::implGetTextRange(m_sEntryText, nStartIndex, 
nEndIndex);
+}
+
 OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, 
sal_Int32 nEndIndex )
 {
     SolarMutexGuard aSolarGuard;
     std::unique_lock aGuard( m_aMutex );
 
-    return OCommonAccessibleText::implGetTextRange( m_sEntryText, nStartIndex, 
nEndIndex );
+    return getTextRangeImpl(aGuard, nStartIndex, nEndIndex);
 }
 
 css::accessibility::TextSegment SAL_CALL 
VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType )
@@ -526,7 +531,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( 
sal_Int32 nStartIndex, sal_I
         Reference< datatransfer::clipboard::XClipboard > xClipboard = 
pListBoxHelper->GetClipboard();
         if ( xClipboard.is() )
         {
-            OUString sText( getTextRange( nStartIndex, nEndIndex ) );
+            OUString sText(getTextRangeImpl(aGuard, nStartIndex, nEndIndex));
             rtl::Reference<vcl::unohelper::TextDataObject> pDataObj = new 
vcl::unohelper::TextDataObject( sText );
 
             SolarMutexReleaser aReleaser;