tweak MultiListBox to ListBox

Change-Id: I94e39f29c2920eea57262cf047f899eb0bbe62c4

4 files changed, 16 insertions, 14 deletions

diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index c6f5e1347a7f..7e4424f9befe 100644
--- a/sc/source/ui/dbgui/pvfundlg.cxx
+++ b/sc/source/ui/dbgui/pvfundlg.cxx
@@ -157,13 +157,7 @@ static const ScDPListBoxWrapper::MapEntryType spShowFromMap[] =
 // ============================================================================
 
 ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, WinBits nStyle)
-    : MultiListBox(pParent, nStyle)
-{
-    FillFunctionNames();
-}
-
-ScDPFunctionListBox::ScDPFunctionListBox(Window* pParent, const ResId& rResId)
-    : MultiListBox(pParent, rResId)
+    : ListBox(pParent, nStyle)
 {
     FillFunctionNames();
 }
@@ -225,8 +219,6 @@ ScDPFunctionDlg::ScDPFunctionDlg(
     get(mpBtnOk, "ok");
 
     Init( rLabelData, rFuncData );
-
-    mpLbFunc->EnableMultiSelection(false);
 }
 
 sal_uInt16 ScDPFunctionDlg::GetFuncMask() const
@@ -438,6 +430,7 @@ ScDPSubtotalDlg::ScDPSubtotalDlg( Window* pParent, ScDPObject& rDPObj,
     get(mpCbShowAll, "showall");
     get(mpFtName, "name");
     get(mpLbFunc, "functions");
+    mpLbFunc->EnableMultiSelection(true);
     mpLbFunc->set_height_request(mpLbFunc->GetTextHeight() * 8);
     get(mpRbNone, "none");
     get(mpRbAuto, "auto");
diff --git a/sc/source/ui/inc/pvfundlg.hxx b/sc/source/ui/inc/pvfundlg.hxx
index a88554181090..44e6300a2e49 100644
--- a/sc/source/ui/inc/pvfundlg.hxx
+++ b/sc/source/ui/inc/pvfundlg.hxx
@@ -45,11 +45,10 @@ class ScDPObject;
 
 // ============================================================================
 
-class ScDPFunctionListBox : public MultiListBox
+class ScDPFunctionListBox : public ListBox
 {
 public:
     ScDPFunctionListBox(Window* pParent, WinBits nStyle);
-    ScDPFunctionListBox(Window* pParent, const ResId& rResId);
 
     void                SetSelection( sal_uInt16 nFuncMask );
     sal_uInt16          GetSelection() const;
diff --git a/sc/uiconfig/scalc/ui/datafielddialog.ui b/sc/uiconfig/scalc/ui/datafielddialog.ui
index da0decc8b6d6..3b24ff6fe176 100644
--- a/sc/uiconfig/scalc/ui/datafielddialog.ui
+++ b/sc/uiconfig/scalc/ui/datafielddialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 17 09:55:40 2014 -->
+<!-- Generated with glade 3.16.0 on Fri Jan 17 11:23:34 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
@@ -84,6 +84,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
@@ -92,12 +93,15 @@
                     <property name="can_focus">False</property>
                     <property name="margin_top">6</property>
                     <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="scuilo-ScDPFunctionListBox" id="functions:border">
diff --git a/sc/uiconfig/scalc/ui/pivotfielddialog.ui b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
index dcf9127d7887..bc4972a75f0e 100644
--- a/sc/uiconfig/scalc/ui/pivotfielddialog.ui
+++ b/sc/uiconfig/scalc/ui/pivotfielddialog.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Fri Jan 17 10:58:52 2014 -->
+<!-- Generated with glade 3.16.0 on Fri Jan 17 11:22:49 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <!-- interface-requires LibreOffice 1.0 -->
@@ -99,6 +99,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
                 <property name="label_xalign">0</property>
                 <property name="shadow_type">none</property>
                 <child>
@@ -107,12 +108,15 @@
                     <property name="can_focus">False</property>
                     <property name="margin_top">6</property>
                     <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                     <property name="top_padding">6</property>
                     <property name="left_padding">12</property>
                     <child>
                       <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
+                        <property name="hexpand">True</property>
+                        <property name="vexpand">True</property>
                         <property name="row_spacing">6</property>
                         <child>
                           <object class="GtkRadioButton" id="none">
@@ -176,7 +180,9 @@
                             <property name="hexpand">True</property>
                             <property name="vexpand">True</property>
                             <child internal-child="selection">
-                              <object class="GtkTreeSelection" id="DPFunctionListBox-selection4"/>
+                              <object class="GtkTreeSelection" id="DPFunctionListBox-selection4">
+                                <property name="mode">multiple</property>
+                              </object>
                             </child>
                           </object>
                           <packing>