summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-12-23 11:15:20 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2019-12-23 14:25:30 +0100
commit09c0dc8b80b91a4f2e7ad3569a59402ee131eaf4 (patch)
tree38d8b507f9d4164fa7d1c7c2ede30e0bb89abb1c
parentd020273875e6e1f840d8c7e2b0d27402456925e8 (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>
-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 14cb33e74dd7..61d31a6333ef 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -749,7 +749,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;