diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-05-25 13:24:29 +0100 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2021-05-25 18:17:15 +0200 |
| commit | eb5b345172516b31ec43e226c242e536e93a3413 (patch) | |
| tree | 439767850396f9d5ab689162ea3e757e12623d94 | |
| parent | 0cc664f82535eb33b811e23fa3229b10f2c2bf95 (diff) | |
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/+/115968
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | svtools/source/control/valueset.cxx | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/svtools/source/control/valueset.cxx b/svtools/source/control/valueset.cxx index c9a94de237a1..1d961ad4ad32 100644 --- a/svtools/source/control/valueset.cxx +++ b/svtools/source/control/valueset.cxx @@ -425,6 +425,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; } |