svtools/source/control/valueset.cxx | 8 ++++++++
1 file changed, 8 insertions(+)
New commits:
commit 2b838b3b6aa5a014591e86b1736f82908076ff65
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue May 25 13:24:29 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue May 25 16:19:07 2021 +0200
tdf#142479 on 'return' select the entry the cursor is in before calling
Select
Change-Id: Ic11f8a12c93d1999dd6fbe555b9823660eb703d0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116101
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index 821462879b82..c60e557fa140 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -419,6 +419,14 @@ bool ValueSet::KeyInput( const KeyEvent& rKeyEvent )
case KEY_RETURN:
if (GetStyle() & WB_NO_DIRECTSELECT)
{
+ // tdf#142479 on return select the entry the cursor is in
+ // before calling Select
+ if (nCurPos != VALUESET_ITEM_NONEITEM)
+ {
+ const sal_uInt16 nItemId = GetItemId(nCurPos);
+ if (nItemId != mnSelItemId)
+ SelectItem(nItemId);
+ }
Select();
break;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
