sc/source/ui/dbgui/pvfundlg.cxx | 11 ++---------
sc/source/ui/inc/pvfundlg.hxx | 3 +--
sc/uiconfig/scalc/ui/datafielddialog.ui | 6 +++++-
sc/uiconfig/scalc/ui/formulacalculationoptions.ui | 3 +--
sc/uiconfig/scalc/ui/pivotfielddialog.ui | 10 ++++++++--
5 files changed, 17 insertions(+), 16 deletions(-)
New commits:
commit 251f21699ef786557134fc00ff1293acb57e4158
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 17 12:31:28 2014 +0000
ellipsize incorrectly set here for some reason
Change-Id: I85b89c59c3545aef538da47a3d3727110cff4a82
diff --git a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
index 2e1b93b..305e8e3 100644
--- a/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
+++ b/sc/uiconfig/scalc/ui/formulacalculationoptions.ui
@@ -178,7 +178,6 @@
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="wrap">True</property>
- <property name="ellipsize">end</property>
<property name="max_width_chars">56</property>
</object>
<packing>
@@ -291,7 +290,7 @@
<property name="orientation">vertical</property>
<property name="row_spacing">2</property>
<child>
- <object class="svtlo-SvTreeListBox" id="opencl_list">
+ <object class="svtlo-SvTreeListBox" id="opencl_list:border">
<property name="visible">True</property>
<property name="app_paintable">True</property>
<property name="can_focus">True</property>
commit e36321236417f3b900519bab10cf25e7aeba68e3
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 17 11:27:50 2014 +0000
tweak MultiListBox to ListBox
Change-Id: I94e39f29c2920eea57262cf047f899eb0bbe62c4
diff --git a/sc/source/ui/dbgui/pvfundlg.cxx b/sc/source/ui/dbgui/pvfundlg.cxx
index c6f5e13..7e4424f 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 a885541..44e6300 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 da0decc..3b24ff6 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 dcf9127..bc4972a 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>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
