[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-6-1+backports' - vcl/source

[Samuel Mehrbrodt (via logerrit)]

 vcl/source/control/combobox.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5ad310f5bdef8535d3c934f36d7d79c52a2c1619
Author:     Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
AuthorDate: Mon Dec 23 11:15:20 2019 +0100
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Wed Jan 8 12:11:13 2020 +0100

    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 at cib.de>
    (cherry picked from commit 09c0dc8b80b91a4f2e7ad3569a59402ee131eaf4)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86324
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 3ce77bacb950..4508d34022fc 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -739,7 +739,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;