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

[Caolán McNamara (via logerrit)]

 svx/source/tbxctrls/tbcontrl.cxx |    8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit cb392730620cc13c41c739aa5222a423661a1147
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Jun 10 12:16:17 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Jun 10 21:40:18 2020 +0200

    grab focus to style combobox when parent gets focus
    
    Change-Id: Iaee1a8399e8e4f70a52ce99be113e9e7607a5ab7
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95989
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 70288fcd23ba..732ad7d9f835 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -263,7 +263,13 @@ private:
             InterimItemWindow::Disable();
     }
 
-    virtual void    DataChanged( const DataChangedEvent& rDCEvt ) override;
+    virtual void DataChanged(const DataChangedEvent& rDCEvt) override;
+    virtual void GetFocus() override
+    {
+        if (m_xWidget)
+            m_xWidget->grab_focus();
+        InterimItemWindow::GetFocus();
+    }
     void            SetOptimalSize();
 };