sc/inc/helpids.h | 2 --
sc/source/ui/inc/consdlg.hxx | 1 -
sc/source/ui/inc/crnrdlg.hxx | 1 -
sc/source/ui/miscdlgs/crnrdlg.cxx | 5 ++---
sc/uiconfig/scalc/ui/namerangesdialog.ui | 12 ++++++------
5 files changed, 8 insertions(+), 13 deletions(-)
New commits:
commit f54a68427fb8b4b665c16aaa15edab43cdee41ba
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jul 24 20:29:15 2013 +0100
set widgets to use for extra title text in shrink mode
Change-Id: Ie53a1c36cca6ed1d1133abe1a70d76e2c2492786
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index 358887c..b7856b2 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -98,8 +98,6 @@
#define HID_SC_SCENARIO_DELETE
"SC_HID_SC_SCENARIO_DELETE"
#define HID_SC_SCENARIO_EDIT
"SC_HID_SC_SCENARIO_EDIT"
-#define HID_COLROWNAMERANGES
"SC_HID_COLROWNAMERANGES"
-
#define HID_FUNCTION_BOX
"SC_HID_FUNCTION_BOX"
#define HID_SC_REDLIN_CTR
"SC_HID_SC_REDLIN_CTR"
diff --git a/sc/source/ui/inc/consdlg.hxx b/sc/source/ui/inc/consdlg.hxx
index 204db24..8dd89d6 100644
--- a/sc/source/ui/inc/consdlg.hxx
+++ b/sc/source/ui/inc/consdlg.hxx
@@ -73,7 +73,6 @@ private:
OKButton* pBtnOk;
CancelButton* pBtnCancel;
- HelpButton* pBtnHelp;
PushButton* pBtnAdd;
PushButton* pBtnRemove;
diff --git a/sc/source/ui/inc/crnrdlg.hxx b/sc/source/ui/inc/crnrdlg.hxx
index c2efd2d..b7f522c 100644
--- a/sc/source/ui/inc/crnrdlg.hxx
+++ b/sc/source/ui/inc/crnrdlg.hxx
@@ -58,7 +58,6 @@ private:
OKButton* pBtnOk;
CancelButton* pBtnCancel;
- HelpButton* pBtnHelp;
PushButton* pBtnAdd;
PushButton* pBtnRemove;
diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx
b/sc/source/ui/miscdlgs/crnrdlg.cxx
index 0e38a24..3cf2f12 100644
--- a/sc/source/ui/miscdlgs/crnrdlg.cxx
+++ b/sc/source/ui/miscdlgs/crnrdlg.cxx
@@ -80,11 +80,13 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings*
pB,
get(pEdAssign,"edassign");
get(pRbAssign,"rbassign");
pRbAssign->SetReferences(this, pEdAssign);
+ pEdAssign->SetReferences(this,
get<VclFrame>("rangeframe")->get_label_widget());
get(pBtnColHead,"colhead");
get(pBtnRowHead,"rowhead");
get(pEdAssign2,"edassign2");
get(pRbAssign2,"rbassign2");
pRbAssign2->SetReferences(this, pEdAssign2);
+ pEdAssign2->SetReferences(this, get<FixedText>("datarange"));
get(pBtnOk,"ok");
get(pBtnCancel,"cancel");
@@ -94,9 +96,6 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB,
xColNameRanges = pDoc->GetColNameRanges()->Clone();
xRowNameRanges = pDoc->GetRowNameRanges()->Clone();
Init();
-
- pRbAssign->SetAccessibleRelationMemberOf(pEdAssign);
- pRbAssign2->SetAccessibleRelationMemberOf(pEdAssign);
}
diff --git a/sc/uiconfig/scalc/ui/namerangesdialog.ui
b/sc/uiconfig/scalc/ui/namerangesdialog.ui
index f81b8fc..a06b96c 100644
--- a/sc/uiconfig/scalc/ui/namerangesdialog.ui
+++ b/sc/uiconfig/scalc/ui/namerangesdialog.ui
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
+ <!-- interface-requires LibreOffice 1.0 -->
<!-- interface-requires gtk+ 3.0 -->
<object class="GtkDialog" id="NameRangesDialog">
<property name="can_focus">False</property>
@@ -9,6 +10,8 @@
<child internal-child="vbox">
<object class="GtkBox" id="dialog-vbox1">
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child internal-child="action_area">
@@ -70,10 +73,11 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="rangeframe">
<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>
@@ -96,7 +100,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="foruilo-RefEdit" id="edassign">
@@ -141,7 +144,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="GtkRadioButton" id="colhead">
@@ -192,7 +194,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel" id="datarange">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -212,7 +214,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="column_spacing">12</property>
<child>
<object class="foruilo-RefEdit" id="edassign2">
@@ -257,7 +258,6 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="hexpand">True</property>
- <property name="vexpand">True</property>
<property name="spacing">12</property>
<property name="layout_style">center</property>
<child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
