From fdab8ee608297bb618ae911f46b525d06eb4cac1 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 3 May 2019 16:03:52 +0100
Subject: Resolves: tdf#125105 missing can-focus
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 sc/source/ui/dbgui/scuiimoptdlg.cxx | 2 ++
 sc/uiconfig/scalc/ui/imoptdialog.ui | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'sc')

diff --git a/sc/source/ui/dbgui/scuiimoptdlg.cxx b/sc/source/ui/dbgui/scuiimoptdlg.cxx
index f72135e9d16a..0a0d8b2b884b 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();
     }
 
diff --git a/sc/uiconfig/scalc/ui/imoptdialog.ui b/sc/uiconfig/scalc/ui/imoptdialog.ui
index fe4526d65f32..80b6a0ee99be 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>
-- 
cgit