commit fdab8ee608297bb618ae911f46b525d06eb4cac1
author Caolán McNamara <caolanm@redhat.com> Fri May 03 16:03:52 2019 +0100
committer Caolán McNamara <caolanm@redhat.com> Fri May 03 21:31:44 2019 +0200
tree e2eedf00df9472c48a0de5f7bd52a45df570c47a
parent fdbc12465e468ed50e4562268f44b24a73e22727

Resolves: tdf#125105 missing can-focus

Change-Id: I201b658cd0c643fbcaf2ec1411b2a2991eca36dd
Reviewed-on: https://gerrit.libreoffice.org/71758
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/svx/txencbox.hxx

diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 0bc69c2..0a69d0a 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -127,6 +127,7 @@ public:
    void connect_changed(const Link<weld::ComboBox&, void>& rLink) { m_xControl->connect_changed(rLink); }
    void grab_focus() { m_xControl->grab_focus(); }
    void show() { m_xControl->show(); }
    void hide() { m_xControl->hide(); }
};

class SVX_DLLPUBLIC TextEncodingTreeView
@@ -190,6 +191,7 @@ public:
    void connect_row_activated(const Link<weld::TreeView&, void>& rLink) { m_xControl->connect_row_activated(rLink); }
    void grab_focus() { m_xControl->grab_focus(); }
    void show() { m_xControl->show(); }
    void hide() { m_xControl->hide(); }
    int get_height_rows(int nRows) const
    {
        return m_xControl->get_height_rows(nRows);

sc/source/ui/dbgui/scuiimoptdlg.cxx

diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index f72135e..0a0d8b2 100644
--- a/sc/source/ui/dbgui/scuiimoptdlg.cxx
+++ b/sc/source/ui/dbgui/scuiimoptdlg.cxx
@@ -129,11 +129,13 @@ ScImportOptionsDlg::ScImportOptionsDlg(weld::Window* pParent, bool bAscii,
    {
        m_xDialog->set_help_id(m_xDialog->get_help_id() + "?config=NonTextImport");
        m_xLbCharset->show();
        m_xTvCharset->hide();
    }
    else
    {
        m_xTvCharset->set_size_request(-1, m_xTvCharset->get_height_rows(6));
        m_xEncGrid->set_vexpand(true);
        m_xLbCharset->hide();
        m_xTvCharset->show();
    }

sc/uiconfig/scalc/ui/imoptdialog.ui

diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui
index fe4526d..80b6a0e 100644
--- a/sc/uiconfig/scalc/ui/imoptdialog.ui
+++ b/sc/uiconfig/scalc/ui/imoptdialog.ui
@@ -216,7 +216,7 @@
                        <property name="has_entry">True</property>
                        <child internal-child="entry">
                          <object class="GtkEntry" id="comboboxtext-entry">
                            <property name="can_focus">False</property>
                            <property name="can_focus">True</property>
                            <property name="activates_default">True</property>
                          </object>
                        </child>