[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - dbaccess/uiconfig

[Caolán McNamara (via logerrit)]

 dbaccess/uiconfig/ui/odbcpage.ui |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c624a5c4af585633611b46fd800d1d87b2984bc
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Nov 16 09:01:28 2020 +0000
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Nov 17 17:05:12 2020 +0100

    Resolves: tdf#138240 GtkComboBox without model
    
    just use a GtkComboBoxText which comes with one by default
    
    Change-Id: I041d37be137aed4c888336c62db574ea3d730e4b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105857
    Tested-by: Jenkins
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

diff --git a/dbaccess/uiconfig/ui/odbcpage.ui b/dbaccess/uiconfig/ui/odbcpage.ui
index 91cf10d07177..5ea61c2fc57b 100644
--- a/dbaccess/uiconfig/ui/odbcpage.ui
+++ b/dbaccess/uiconfig/ui/odbcpage.ui
@@ -45,7 +45,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBox" id="charset">
+                  <object class="GtkComboBoxText" id="charset">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="hexpand">True</property>