[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sc/uiconfig

[Caolán McNamara]

 sc/uiconfig/scalc/ui/optformula.ui |   27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

New commits:
commit 2f6f9236eb6d64f1adaef275df100dde898a8dd5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 8 17:05:19 2014 +0000

    designate which elements should shrink when limited width
    
    Change-Id: I46c5290ab411ac133ef8ea1e461197b00d837068
    (cherry picked from commit 6cdf269a93685d5dfd7811faabb55acd2d7b2561)

diff --git a/sc/uiconfig/scalc/ui/optformula.ui b/sc/uiconfig/scalc/ui/optformula.ui
index b77d2da..dfefcc0 100644
--- a/sc/uiconfig/scalc/ui/optformula.ui
+++ b/sc/uiconfig/scalc/ui/optformula.ui
@@ -1,13 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.0 on Wed Jan  8 17:04:17 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
-  <object class="GtkAdjustment" id="adjustment1">
-    <property name="lower">1</property>
-    <property name="upper">32000</property>
-    <property name="value">1</property>
-    <property name="step_increment">1</property>
-    <property name="page_increment">10</property>
-  </object>
   <object class="GtkBox" id="OptFormula">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -293,8 +287,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="valign">center</property>
+                                <property name="hexpand">True</property>
                                 <property name="invisible_char">●</property>
-                                <property name="invisible_char_set">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -308,8 +302,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="valign">center</property>
+                                <property name="hexpand">True</property>
                                 <property name="invisible_char">●</property>
-                                <property name="invisible_char_set">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -323,8 +317,8 @@
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
                                 <property name="valign">center</property>
+                                <property name="hexpand">True</property>
                                 <property name="invisible_char">●</property>
-                                <property name="invisible_char_set">True</property>
                               </object>
                               <packing>
                                 <property name="left_attach">1</property>
@@ -437,8 +431,7 @@
                       <object class="GtkComboBoxText" id="ooxmlrecalc">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
+                        <property name="hexpand">True</property>
                         <items>
                           <item translatable="yes">Always recalculate</item>
                           <item translatable="yes">Never recalculate</item>
@@ -456,8 +449,7 @@
                       <object class="GtkComboBoxText" id="odfrecalc">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="entry_text_column">0</property>
-                        <property name="id_column">1</property>
+                        <property name="hexpand">True</property>
                         <items>
                           <item translatable="yes">Always recalculate</item>
                           <item translatable="yes">Never recalculate</item>
@@ -500,4 +492,11 @@
       </packing>
     </child>
   </object>
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="upper">32000</property>
+    <property name="value">1</property>
+    <property name="step_increment">1</property>
+    <property name="page_increment">10</property>
+  </object>
 </interface>