[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - include/svtools svtools/source

[Caolán McNamara (via logerrit)]

 include/svtools/editbrowsebox.hxx     |    2 ++
 svtools/source/brwbox/ebbcontrols.cxx |    8 ++++++++
 2 files changed, 10 insertions(+)

New commits:
commit 55e2721e1ea6b8db7c92e5bb304ec1fb2c3cf068
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Aug 14 16:42:32 2020 +0100
Commit:     Aron Budea <aron.budea at collabora.com>
CommitDate: Thu Jan 14 08:34:44 2021 +0100

    tdf#137694 let tab switch between cells
    
    Change-Id: I12806e2afc022c079d9db758973b8d1bfc0c7107
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100752
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 3dac8855e93e09fab9d66f6cc4126a106ed44952)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108584
    Reviewed-by: Aron Budea <aron.budea at collabora.com>

diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx
index 04c931d82fdd..a1a38353637e 100644
--- a/include/svtools/editbrowsebox.hxx
+++ b/include/svtools/editbrowsebox.hxx
@@ -324,6 +324,8 @@ namespace svt
         {
         }
         virtual bool ControlHasFocus() const = 0;
+    protected:
+        DECL_LINK(KeyInputHdl, const KeyEvent&, bool);
     };
 
     //= ComboBoxControl
diff --git a/svtools/source/brwbox/ebbcontrols.cxx b/svtools/source/brwbox/ebbcontrols.cxx
index e402f0a42a40..c38025d0a13e 100644
--- a/svtools/source/brwbox/ebbcontrols.cxx
+++ b/svtools/source/brwbox/ebbcontrols.cxx
@@ -22,6 +22,7 @@
 #include <vcl/fmtfield.hxx>
 #include <vcl/xtextedt.hxx>
 #include <vcl/textview.hxx>
+#include "datwin.hxx"
 
 namespace svt
 {
@@ -33,6 +34,7 @@ namespace svt
     {
         m_xWidget->set_entry_width_chars(1); // so a smaller than default width can be used
         m_xWidget->connect_changed(LINK(this, ComboBoxControl, SelectHdl));
+        m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
     }
 
     void ComboBoxControl::dispose()
@@ -109,6 +111,11 @@ namespace svt
         GetComboBox().save_value();
     }
 
+    IMPL_LINK(ControlBase, KeyInputHdl, const KeyEvent&, rKEvt, bool)
+    {
+        return static_cast<BrowserDataWin*>(GetParent())->GetParent()->ProcessKey(rKEvt);
+    }
+
     //= ListBoxControl
     ListBoxControl::ListBoxControl(vcl::Window* pParent)
         : ControlBase(pParent, "svt/ui/listcontrol.ui", "ListControl")
@@ -116,6 +123,7 @@ namespace svt
     {
         m_xWidget->set_size_request(42, -1); // so a later narrow size request can stick
         m_xWidget->connect_changed(LINK(this, ListBoxControl, SelectHdl));
+        m_xWidget->connect_key_press(LINK(this, ControlBase, KeyInputHdl));
     }
 
     void ListBoxControl::dispose()