mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small expand tweak

Browse Source 
+

a) use default dropdown count
b) SAL_N_ELEMENTS

Change-Id: I67f12137eedb19bcaf79309fc64bf5c29a70e64d
This commit is contained in:
Caolán McNamara
2013-08-02 10:10:32 +02:00
parent 1f0da38c7d
commit 4f950ffb89
3 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
reportdesign/inc/helpids.hrc
View File

@@ -41,7 +41,6 @@
#define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER" #define HID_RPT_SORTORDER "REPORTDESIGN_HID_RPT_SORTORDER"
#define HID_RPT_GROUPSBRW "REPORTDESIGN_HID_RPT_GROUPSBRW" #define HID_RPT_GROUPSBRW "REPORTDESIGN_HID_RPT_GROUPSBRW"
#define HID_RPT_GROUPSSORTING_DLG "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG" #define HID_RPT_GROUPSSORTING_DLG "REPORTDESIGN_HID_RPT_GROUPSSORTING_DLG"
#define HID_RPT_DATETIME_DLG "REPORTDESIGN_HID_RPT_DATETIME_DLG"
#define HID_RPT_CONDFORMAT_DLG "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG" #define HID_RPT_CONDFORMAT_DLG "REPORTDESIGN_HID_RPT_CONDFORMAT_DLG"
#define HID_RPT_CONDFORMAT_TB "REPORTDESIGN_HID_RPT_CONDFORMAT_TB" #define HID_RPT_CONDFORMAT_TB "REPORTDESIGN_HID_RPT_CONDFORMAT_TB"
#define HID_RPT_CRTL_FORMAT_PREVIEW "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW" #define HID_RPT_CRTL_FORMAT_PREVIEW "REPORTDESIGN_HID_RPT_CRTL_FORMAT_PREVIEW"

20
reportdesign/source/ui/dlg/DateTime.cxx
View File

@@ -53,10 +53,10 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
,OReportController* _pController) ,OReportController* _pController)
: ModalDialog( _pParent, "DateTimeDialog" , "modules/dbreport/ui/datetimedialog.ui" ) : ModalDialog( _pParent, "DateTimeDialog" , "modules/dbreport/ui/datetimedialog.ui" )
,m_aDateControlling() , m_aDateControlling()
,m_aTimeControlling() , m_aTimeControlling()
,m_pController(_pController) , m_pController(_pController)
,m_xHoldAlive(_xHoldAlive) , m_xHoldAlive(_xHoldAlive)
{ {
get(m_pDate,"date"); get(m_pDate,"date");
get(m_pFTDateFormat,"datelistbox_label"); get(m_pFTDateFormat,"datelistbox_label");
@@ -76,23 +76,21 @@ ODateTimeDialog::ODateTimeDialog( Window* _pParent
InsertEntry(util::NumberFormat::DATE); InsertEntry(util::NumberFormat::DATE);
InsertEntry(util::NumberFormat::TIME); InsertEntry(util::NumberFormat::TIME);
} }
catch(uno::Exception&) catch (const uno::Exception&)
{ {
} }
m_pDateListBox->SetDropDownLineCount(20);
m_pDateListBox->SelectEntryPos(0); m_pDateListBox->SelectEntryPos(0);
m_pTimeListBox->SetDropDownLineCount(20);
m_pTimeListBox->SelectEntryPos(0); m_pTimeListBox->SelectEntryPos(0);
// use nice enhancement, to toggle enable/disable if a checkbox is checked or not // use nice enhancement, to toggle enable/disable if a checkbox is checked or not
m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat, *m_pDateListBox); m_aDateControlling.enableOnCheckMark( *m_pDate, *m_pFTDateFormat, *m_pDateListBox);
m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat, *m_pTimeListBox); m_aTimeControlling.enableOnCheckMark( *m_pTime, *m_pFTTimeFormat, *m_pTimeListBox);
CheckBox* pCheckBoxes[] = { m_pDate,m_pTime}; CheckBox* aCheckBoxes[] = { m_pDate,m_pTime};
for ( size_t i = 0 ; i < sizeof(pCheckBoxes)/sizeof(pCheckBoxes[0]); ++i) for ( size_t i = 0 ; i < SAL_N_ELEMENTS(aCheckBoxes); ++i)
pCheckBoxes[i]->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl)); aCheckBoxes[i]->SetClickHdl(LINK(this,ODateTimeDialog,CBClickHdl));
} }
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
@@ -165,7 +163,7 @@ short ODateTimeDialog::Execute()
m_pController->executeChecked(SID_DATETIME,aValues); m_pController->executeChecked(SID_DATETIME,aValues);
} }
catch(uno::Exception&) catch (const uno::Exception&)
{ {
nRet = RET_NO; nRet = RET_NO;
} }

3
reportdesign/uiconfig/dbreport/ui/datetimedialog.ui
View File

@@ -75,7 +75,8 @@
<object class="GtkGrid" id="grid2"> <object class="GtkGrid" id="grid2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="hexpand">True</property> <property name="halign">start</property>
<property name="valign">start</property>
<property name="vexpand">True</property> <property name="vexpand">True</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<property name="column_spacing">12</property> <property name="column_spacing">12</property>