summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-12-23 11:15:20 +0100
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2019-12-27 20:49:35 +0100
commit3d4c6392071ce3df0b5fdcf45404e6ee781e4cce (patch)
tree13c93fe0a957f4596206c0b93df8a69d241ea459 /vcl
parent5a2657aed17d5163acbfec48193c968f6707fbb0 (diff)
tdf#129490 Fix enter key in combo box
Follow-up fix for 7de9417d5f65d35227c7f80f6d587c2a56bde4e0 Change-Id: I0b05f11b79d5fcd4e4823c1e31c087724ebc85f8 Reviewed-on: https://gerrit.libreoffice.org/85748 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 09c0dc8b80b91a4f2e7ad3569a59402ee131eaf4) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/85834 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/control/combobox.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 710b4a0bac3e..4b19c42ad5c4 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -745,7 +745,7 @@ bool ComboBox::EventNotify( NotifyEvent& rNEvt )
case KEY_RETURN:
{
- if (rNEvt.GetWindow() == m_pImpl->m_pSubEdit)
+ if ((rNEvt.GetWindow() == m_pImpl->m_pSubEdit) && IsInDropDown())
{
m_pImpl->m_pImplLB->ProcessKeyInput( aKeyEvt );
bDone = true;