diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-12-23 11:15:20 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-01-07 09:36:58 +0100 |
| commit | 8a542bd308a02083c26cc5be633b49b050ac3e92 (patch) | |
| tree | 6f4a414591515c68dc709c8ce866ba1a7ce41478 | |
| parent | DOCX table import: fix interaction of 1-cell rows and "inside" vertical borders (diff) | |
| download | core-8a542bd308a02083c26cc5be633b49b050ac3e92.tar.gz core-8a542bd308a02083c26cc5be633b49b050ac3e92.zip | |
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/+/85835
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -rw-r--r-- | vcl/source/control/combobox.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 311830cfd2e5..31f8a0373f52 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -748,7 +748,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; |