[Libreoffice-commits] core.git: dbaccess/uiconfig extras/source vcl/source

[Caolán McNamara (via logerrit)]

 dbaccess/uiconfig/ui/directsqldialog.ui        |    2 -
 extras/source/glade/libreoffice-catalog.xml.in |   27 +++----------------------
 vcl/source/window/builder.cxx                  |    2 -
 3 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit e17c5e1247943300f333c8f0a0f34cebc10738d4
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 15 20:10:47 2019 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 16 10:08:42 2019 +0200

    drop VclComboBoxText in favor of GtkComboBoxText
    
    Change-Id: I772b0e9daeee69bf981ab68332d9be2ca0c2e02a
    Reviewed-on: https://gerrit.libreoffice.org/78967
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/uiconfig/ui/directsqldialog.ui b/dbaccess/uiconfig/ui/directsqldialog.ui
index d7d1e002dbcf..0b98f6f0af82 100644
--- a/dbaccess/uiconfig/ui/directsqldialog.ui
+++ b/dbaccess/uiconfig/ui/directsqldialog.ui
@@ -140,7 +140,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="VclComboBoxText" id="sqlhistory">
+                      <object class="GtkComboBoxText" id="sqlhistory">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
                         <property name="max_width_chars">60</property>
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 51fa0aedd37b..872ea92c39f1 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -31,27 +31,8 @@
                         generic-name="ConditionEdit" parent="GtkEntry"
                         icon-name="widget-gtk-comboboxtext"/>
 
-    <glade-widget-class title="VclComboBoxText" name="VclComboBoxText"
-                        generic-name="ComboBoxText" parent="GtkComboBoxText"
-                        icon-name="widget-gtk-comboboxtext">
-      <properties>
-        <property save="True" query="False" id="dropdown" default="True" name="Use DropDown">
-          <parameter-spec>
-            <type>GParamBoolean</type>
-          </parameter-spec>
-        </property>
-        <property save="True" query="False" id="max-width-chars" default="-1" name="Maximum Width in Characters">
-          <parameter-spec>
-            <type>GParamInt</type>
-            <min>-1</min>
-          </parameter-spec>
-          <tooltip>The desired maximum width of the ComboBox, in characters</tooltip>
-        </property>
-      </properties>
-    </glade-widget-class>
-
     <glade-widget-class title="VclComboBoxNumeric" name="VclComboBoxNumeric"
-                        generic-name="ComboBoxNumeric" parent="VclComboBoxText"
+                        generic-name="ComboBoxNumeric" parent="GtkComboBoxText"
                         icon-name="widget-gtk-comboboxtext">
       <properties>
         <property save="True" query="False" id="adjustment" name="Adjustment">
@@ -200,15 +181,15 @@
                         icon-name="widget-gtk-spinbutton"/>
 
     <glade-widget-class title="SvtURLBox" name="svtlo-SvtURLBox"
-                        generic-name="URLBox" parent="VclComboBoxText"
+                        generic-name="URLBox" parent="GtkComboBoxText"
                         icon-name="widget-gtk-comboboxtext"/>
 
     <glade-widget-class title="PropertyControl" name="sdlo-PropertyControl"
-                        generic-name="PropertyControl" parent="VclComboBoxText"
+                        generic-name="PropertyControl" parent="GtkComboBoxText"
                         icon-name="widget-gtk-comboboxtext"/>
 
     <glade-widget-class title="Language ListBox" name="svxcorelo-SvxLanguageBox"
-                        generic-name="LanguageBox" parent="VclComboBoxText"
+                        generic-name="LanguageBox" parent="GtkComboBoxText"
                         icon-name="widget-gtk-combobox"/>
 
     <glade-widget-class title="Fill Type ListBox" name="svxlo-SvxFillTypeBox"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 8d6203a2afa1..2ea3b178bf2a 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1952,7 +1952,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
     }
     else if (name == "GtkLinkButton")
         xWindow = VclPtr<FixedHyperlink>::Create(pParent, WB_CENTER|WB_VCENTER|WB_3DLOOK|WB_NOLABEL);
-    else if ((name == "GtkComboBox") || (name == "GtkComboBoxText") || (name == "VclComboBoxText"))
+    else if (name == "GtkComboBox" || name == "GtkComboBoxText")
     {
         OUString sPattern = BuilderUtils::extractCustomProperty(rMap);
         extractModel(id, rMap);