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

[Jim Raykowski (via logerrit)]

 vcl/source/treelist/treelistbox.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 3ea506eb7a0b11323569956255475dfbb113a6a5
Author:     Jim Raykowski <raykowj at gmail.com>
AuthorDate: Sun Mar 15 00:18:42 2020 -0800
Commit:     Jim Raykowski <raykowj at gmail.com>
CommitDate: Thu Apr 2 05:41:14 2020 +0200

    tdf#131346 Fix SvTreeListBox::NextSearchEntry
    
    ...so QuickSearch doesn't continous loop
    
    Change-Id: I9cb93517ba8c9ec961e56e8c162304c83c99d08b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90513
    Tested-by: Jenkins
    Reviewed-by: Jim Raykowski <raykowj at gmail.com>

diff --git a/vcl/source/treelist/treelistbox.cxx b/vcl/source/treelist/treelistbox.cxx
index b4f73dbd9b8f..3f62764d3c6a 100644
--- a/vcl/source/treelist/treelistbox.cxx
+++ b/vcl/source/treelist/treelistbox.cxx
@@ -967,7 +967,11 @@ const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, OU
         &&  !IsExpanded( pEntry )
         )
     {
-        pEntry = pEntry->NextSibling();
+        SvTreeListEntry* pNextSiblingEntry = pEntry->NextSibling();
+        if ( !pNextSiblingEntry )
+            pEntry = Next( pEntry );
+        else
+            pEntry = pNextSiblingEntry;
     }
     else
     {