sc/inc/helpids.h | 1
sc/source/ui/inc/areasdlg.hxx | 3
sc/source/ui/pagedlg/areasdlg.cxx | 28 +++-----
sc/uiconfig/scalc/ui/printareasdialog.ui | 97 ++++++++++++++++---------------
4 files changed, 64 insertions(+), 65 deletions(-)
New commits:
commit 7908692490120350f2ad45241f7b19ba52dc0489
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jul 12 15:33:55 2013 +0100
GtkComboBox->GtkComboBoxText to use the items, etc
Change-Id: I6ece0c471fbe21fc832c4c65a02bfbc9cf991a5a
diff --git a/sc/inc/helpids.h b/sc/inc/helpids.h
index bb7e205..eae705d 100644
--- a/sc/inc/helpids.h
+++ b/sc/inc/helpids.h
@@ -60,7 +60,6 @@
#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_AREAS
"SC_HID_SCPAGE_AREAS"
#define HID_SCPAGE_SUBT_GROUP1
"SC_HID_SCPAGE_SUBT_GROUP1"
#define HID_SCPAGE_SUBT_GROUP2
"SC_HID_SCPAGE_SUBT_GROUP2"
#define HID_SCPAGE_SUBT_GROUP3
"SC_HID_SCPAGE_SUBT_GROUP3"
diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx
index 9f0a03e..3e1111d 100644
--- a/sc/source/ui/inc/areasdlg.hxx
+++ b/sc/source/ui/inc/areasdlg.hxx
@@ -48,17 +48,14 @@ public:
virtual sal_Bool Close();
private:
- FixedLine* pFlPrintArea;
ListBox* pLbPrintArea;
formula::RefEdit* pEdPrintArea;
formula::RefButton* pRbPrintArea;
- FixedLine* pFlRepeatRow;
ListBox* pLbRepeatRow;
formula::RefEdit* pEdRepeatRow;
formula::RefButton* pRbRepeatRow;
- FixedLine* pFlRepeatCol;
ListBox* pLbRepeatCol;
formula::RefEdit* pEdRepeatCol;
formula::RefButton* pRbRepeatCol;
diff --git a/sc/source/ui/pagedlg/areasdlg.cxx
b/sc/source/ui/pagedlg/areasdlg.cxx
index 97b8a16..e421b0b 100644
--- a/sc/source/ui/pagedlg/areasdlg.cxx
+++ b/sc/source/ui/pagedlg/areasdlg.cxx
@@ -105,32 +105,28 @@ static void printAddressFlags(sal_uInt16 nFlag)
//----------------------------------------------------------------------------
ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW,
Window* pParent )
- : ScAnyRefDlg ( pB, pCW, pParent, "PrintAreasDialog",
"modules/scalc/ui/printareasdialog.ui"),
- //
- bDlgLostFocus ( false ),
- pDoc ( NULL ),
- pViewData ( NULL ),
- nCurTab ( 0 )
+ : ScAnyRefDlg(pB, pCW, pParent, "PrintAreasDialog",
"modules/scalc/ui/printareasdialog.ui")
+ , bDlgLostFocus(false)
+ , pDoc(NULL)
+ , pViewData(NULL)
+ , nCurTab(0)
{
- get(pFlPrintArea,"label1");
get(pLbPrintArea,"lbprintarea");
get(pEdPrintArea,"edprintarea");
- pEdPrintArea->SetReferences(this, pFlPrintArea);
+ pEdPrintArea->SetReferences(this,
get<VclFrame>("printframe")->get_label_widget());
pRefInputEdit = pEdPrintArea;
get(pRbPrintArea,"rbprintarea");
pRbPrintArea->SetReferences(this, pEdPrintArea);
- get(pFlRepeatRow,"label2");
get(pLbRepeatRow,"lbrepeatrow");
get(pEdRepeatRow,"edrepeatrow");
- pEdRepeatRow->SetReferences(this, pFlRepeatRow);
+ pEdRepeatRow->SetReferences(this,
get<VclFrame>("rowframe")->get_label_widget());
get(pRbRepeatRow,"rbrepeatrow");
pRbRepeatRow->SetReferences(this, pEdRepeatRow);
- get(pFlRepeatCol,"label3");
get(pLbRepeatCol,"lbrepeatcol");
get(pEdRepeatCol,"edrepeatcol");
- pEdRepeatCol->SetReferences(this, pFlRepeatCol);
+ pEdRepeatCol->SetReferences(this,
get<VclFrame>("colframe")->get_label_widget());
get(pRbRepeatCol,"rbrepeatcol");
pRbRepeatCol->SetReferences(this, pEdRepeatCol);
@@ -162,13 +158,13 @@ ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB,
SfxChildWindow* pCW, Window*
ScPrintAreasDlg::~ScPrintAreasDlg()
{
// Extra-Data an ListBox-Entries abraeumen
- ListBox* pLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
+ ListBox* aLb[3] = { pLbPrintArea, pLbRepeatRow, pLbRepeatCol };
- for ( sal_uInt16 i=0; i<3; i++ )
+ for (sal_uInt16 i = 0; i < SAL_N_ELEMENTS(aLb); ++i)
{
- sal_uInt16 nCount = pLb[i]->GetEntryCount();
+ sal_uInt16 nCount = aLb[i]->GetEntryCount();
for ( sal_uInt16 j=0; j<nCount; j++ )
- delete (String*)pLb[i]->GetEntryData(j);
+ delete (String*)aLb[i]->GetEntryData(j);
}
}
diff --git a/sc/uiconfig/scalc/ui/printareasdialog.ui
b/sc/uiconfig/scalc/ui/printareasdialog.ui
index 6e119d4..d52ef6d 100644
--- a/sc/uiconfig/scalc/ui/printareasdialog.ui
+++ b/sc/uiconfig/scalc/ui/printareasdialog.ui
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<!-- interface-requires gtk+ 3.0 -->
+ <!-- interface-requires LibreOffice 1.0 -->
<object class="GtkDialog" id="PrintAreasDialog">
<property name="can_focus">False</property>
<property name="border_width">6</property>
+ <property name="title" translatable="yes">Edit Print Ranges</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
<object class="GtkBox" id="internal-box1">
@@ -19,6 +21,8 @@
<property name="label">gtk-ok</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -71,7 +75,7 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame1">
+ <object class="GtkFrame" id="printframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -119,15 +123,16 @@
</packing>
</child>
<child>
- <object class="GtkComboBox" id="lbprintarea">
+ <object class="GtkComboBoxText" id="lbprintarea">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="hexpand">True</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
<items>
- <item>- none -</item>
- <item>- entire sheet -</item>
- <item>- user defined -</item>
- <item>- selection -</item>
+ <item translatable="yes">- none -</item>
+ <item translatable="yes">- entire sheet -</item>
+ <item translatable="yes">- user defined -</item>
+ <item translatable="yes">- selection -</item>
</items>
</object>
<packing>
@@ -159,7 +164,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame2">
+ <object class="GtkFrame" id="rowframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -177,23 +182,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkComboBox" id="lbrepeatrow">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item>- none -</item>
- <item>- user defined -</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="foruilo-RefEdit" id="edrepeatrow">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -210,7 +198,7 @@
<child>
<object class="foruilo-RefButton" id="rbrepeatrow">
<property name="visible">True</property>
- <property name="can_focus">Fales</property>
+ <property name="can_focus">False</property>
<property name="receives_default">False</property>
<child>
<placeholder/>
@@ -223,6 +211,24 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkComboBoxText" id="lbrepeatrow">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">- none -</item>
+ <item translatable="yes">- user defined -</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -231,7 +237,7 @@
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Moves to
repeat</property>
+ <property name="label" translatable="yes">Rows to
repeat</property>
<attributes>
<attribute name="weight" value="bold"/>
</attributes>
@@ -245,7 +251,7 @@
</packing>
</child>
<child>
- <object class="GtkFrame" id="frame3">
+ <object class="GtkFrame" id="colframe">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -263,23 +269,6 @@
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkComboBox" id="lbrepeatcol">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <items>
- <item>- none -</item>
- <item>- user defined -</item>
- </items>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="foruilo-RefEdit" id="edrepeatcol">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -309,6 +298,24 @@
<property name="height">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkComboBoxText" id="lbrepeatcol">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="entry_text_column">0</property>
+ <property name="id_column">1</property>
+ <items>
+ <item translatable="yes">- none -</item>
+ <item translatable="yes">- user defined -</item>
+ </items>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">1</property>
+ <property name="height">1</property>
+ </packing>
+ </child>
</object>
</child>
</object>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
