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

[Caolán McNamara]

 extras/source/glade/libreoffice-catalog.xml |    5 +++++
 vcl/source/window/builder.cxx               |    6 ++++++
 2 files changed, 11 insertions(+)

New commits:
commit 307c8cdd59bb46d66ba6902fe616d5cc19463c39
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 27 10:04:14 2013 +0000

    reluctantly support NumericBox as a custom widget
    
    Change-Id: I7bbd8032953a6573e8f480d4c7a992b178f310f3

diff --git a/extras/source/glade/libreoffice-catalog.xml b/extras/source/glade/libreoffice-catalog.xml
index cd3b0fc..1cf420d 100644
--- a/extras/source/glade/libreoffice-catalog.xml
+++ b/extras/source/glade/libreoffice-catalog.xml
@@ -78,5 +78,10 @@
       </properties>
     </glade-widget-class>
 
+    <glade-widget-class title="VclComboBoxNumeric" name="VclComboBoxNumeric"
+                        generic-name="ComboBoxNumeric" parent="VclComboBoxText"
+                        icon-name="widget-gtk-comboboxtext"/>
+
+
   </glade-widget-classes>
 </glade-catalog>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d46df66..8654b65 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1093,6 +1093,12 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
             pWindow = pListBox;
         }
     }
+    else if (name == "VclComboBoxNumeric")
+    {
+        NumericBox* pComboBox = new NumericBox(pParent, WB_LEFT|WB_DROPDOWN|WB_VCENTER|WB_3DLOOK);
+        pComboBox->EnableAutoSize(true);
+        pWindow = pComboBox;
+    }
     else if (name == "GtkTreeView")
     {
         //To-Do