[Libreoffice-commits] core.git: Branch 'libreoffice-7-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/view/gridwin.cxx |   10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 773cc6b9ad92f28405ca204f1fa475e33f15132b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Fri Jan 14 12:50:15 2022 +0000
Commit:     Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Sun Jan 16 22:00:21 2022 +0100

    tdf#136481 show the focus rect for the case nothing is yet selected
    
    but the cursor is at pos 0
    
    Change-Id: I7c94480bffdced23fe89d4e3ba0e729742247130
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128414
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit 4bdf28b404f90236d93ce207671f755a71f28496)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128429
    Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>

diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 14e3b53aa9c9..42b02d4b9743 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -1465,12 +1465,16 @@ void ScGridWindow::LaunchDataSelectMenu( SCCOL nCol, 
SCROW nRow )
     {
         rFilterBox.grab_focus();
 
+        if (rFilterBox.n_children())
+        {
+            if (nSelPos != -1)
+                rFilterBox.set_cursor(nSelPos);
+            else
+                rFilterBox.set_cursor(0);
+        }
         // Select only after GrabFocus, so that the focus rectangle gets 
correct
         if (nSelPos != -1)
-        {
-            rFilterBox.set_cursor(nSelPos);
             rFilterBox.select(nSelPos);
-        }
         else
             rFilterBox.unselect_all();