From 6f28fa72d68c893dc284a5b47ba08bde0f4a074f Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Fri, 19 Jul 2013 13:42:52 +0100
Subject: use VclComboBoxText to set max width on listbox

This is to avoid the problem that happened as fdo#60764 in a similar dialog

Change-Id: I88e68032467f06429b49f89a658212b0d6222f15
---
 sc/inc/helpids.h                            |  1 -
 sc/source/ui/dbgui/tpsubt.cxx               |  3 ---
 sc/uiconfig/scalc/ui/sortoptionspage.ui     | 11 ++++++-----
 sc/uiconfig/scalc/ui/subtotaloptionspage.ui | 12 ++++++++++--
 4 files changed, 16 insertions(+), 11 deletions(-)

(limited to 'sc')

diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index eae705d16d22..358887c54cb3 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -58,7 +58,6 @@
 #define HID_SC_PIVOTFILTER                                      "SC_HID_SC_PIVOTFILTER"
 #define HID_SC_INPORTOPT                                        "SC_HID_SC_INPORTOPT"
 #define HID_SC_PIVOTSUBT                                        "SC_HID_SC_PIVOTSUBT"
-#define HID_SCPAGE_SUBT_OPTIONS                                 "SC_HID_SCPAGE_SUBT_OPTIONS"
 #define HID_SCPAGE_SUBT_GROUP                                   "SC_HID_SCPAGE_SUBT_GROUP"
 #define HID_SCPAGE_SUBT_GROUP1                                  "SC_HID_SCPAGE_SUBT_GROUP1"
 #define HID_SCPAGE_SUBT_GROUP2                                  "SC_HID_SCPAGE_SUBT_GROUP2"
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index 36d4f6d4685b..9bdc44c648bf 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -484,9 +484,6 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window*               pParent,
     get(pLbUserDef,"lbuserdef");
 
     Init();
-
-    pLbUserDef->SetAccessibleRelationLabeledBy(pBtnUserDef);
-    pLbUserDef->SetAccessibleName(pBtnUserDef->GetText());
 }
 
 // -----------------------------------------------------------------------
diff --git a/sc/uiconfig/scalc/ui/sortoptionspage.ui b/sc/uiconfig/scalc/ui/sortoptionspage.ui
index f6815af78bb7..44128d0e6910 100644
--- a/sc/uiconfig/scalc/ui/sortoptionspage.ui
+++ b/sc/uiconfig/scalc/ui/sortoptionspage.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="SortOptionsPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -113,7 +114,7 @@
                   <object class="GtkComboBox" id="outarealb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">20</property>
+                    <property name="margin_left">12</property>
                     <accessibility>
                       <relation type="labelled-by" target="copyresult"/>
                       <relation type="label-for" target="outareaed"/>
@@ -167,7 +168,7 @@
                   <object class="VclComboBoxText" id="sortuserlb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="margin_left">20</property>
+                    <property name="margin_left">12</property>
                     <property name="max_width_chars">65</property>
                     <accessibility>
                       <relation type="labelled-by" target="sortuser"/>
@@ -214,9 +215,9 @@
                 </child>
                 <child>
                   <object class="svxcorelo-SvxLanguageBox" id="language">
-                <property name="visible">True</property>
-                <property name="can_focus">False</property>
-              </object>
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                  </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">9</property>
diff --git a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
index 5962bc283a2e..447e8e19e7c5 100644
--- a/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
+++ b/sc/uiconfig/scalc/ui/subtotaloptionspage.ui
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkBox" id="SubTotalOptionsPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
+    <property name="border_width">6</property>
     <property name="orientation">vertical</property>
     <property name="spacing">12</property>
-    <property name="border_width">6</property>
     <child>
       <object class="GtkFrame" id="frame1">
         <property name="visible">True</property>
@@ -195,6 +196,9 @@
                     <property name="use_underline">True</property>
                     <property name="xalign">0</property>
                     <property name="draw_indicator">True</property>
+                    <accessibility>
+                      <relation type="label-for" target="lbuserdef"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
@@ -204,12 +208,16 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkComboBoxText" id="lbuserdef">
+                  <object class="VclComboBoxText" id="lbuserdef">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="margin_left">12</property>
                     <property name="entry_text_column">0</property>
                     <property name="id_column">1</property>
+                    <property name="max_width_chars">65</property>
+                    <accessibility>
+                      <relation type="labelled-by" target="btnuserdef"/>
+                    </accessibility>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
-- 
cgit