diff options
| author | Philipp Kaluza <floss@ghostroute.eu> | 2012-10-21 00:05:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-02 15:46:53 +0000 |
| commit | fb3a7529bc77211d795936a960211f147f658d8f (patch) | |
| tree | 4498bfbefd4db0fa93ca56b043ab32e604991efd /cui/source | |
| parent | e8487c8a3f3ece74143928352e1e8a7dfb72d424 (diff) | |
WIP: first stab at converting the insert-row dialog
to UI format
Conflicts:
cui/UI_cui.mk
Change-Id: I1b1888f667b31b6ca22d1eca57aeb9da7ce45b71
Diffstat (limited to 'cui/source')
| -rw-r--r-- | cui/source/dialogs/insrc.cxx | 19 | ||||
| -rw-r--r-- | cui/source/inc/insrc.hxx | 13 |
2 files changed, 9 insertions, 23 deletions
diff --git a/cui/source/dialogs/insrc.cxx b/cui/source/dialogs/insrc.cxx index 81b8c0c6019c..e48a8eb0967a 100644 --- a/cui/source/dialogs/insrc.cxx +++ b/cui/source/dialogs/insrc.cxx @@ -25,30 +25,23 @@ bool SvxInsRowColDlg::isInsertBefore() const { - return !aAfterBtn.IsChecked(); + return !m_pAfterBtn->IsChecked(); } sal_uInt16 SvxInsRowColDlg::getInsertCount() const { - return static_cast< sal_uInt16 >( aCountEdit.GetValue() ); + return static_cast< sal_uInt16 >( m_pCountEdit->GetValue() ); } SvxInsRowColDlg::SvxInsRowColDlg(Window* pParent, bool bCol, const rtl::OString& sHelpId ) - : ModalDialog( pParent, CUI_RES(DLG_INS_ROW_COL) ), - aCount( this, CUI_RES( FT_COUNT ) ), - aCountEdit( this, CUI_RES( ED_COUNT ) ), - aInsFL( this, CUI_RES( FL_INS ) ), - aBeforeBtn( this, CUI_RES( CB_POS_BEFORE ) ), - aAfterBtn( this, CUI_RES( CB_POS_AFTER ) ), - aPosFL( this, CUI_RES( FL_POS ) ), + : ModalDialog( pParent, "insert_row_dialog", "cui/ui/insrc.ui" ), aRow(CUI_RESSTR(STR_ROW)), aCol(CUI_RESSTR(STR_COL)), - aOKBtn( this, CUI_RES( BT_OK ) ), - aCancelBtn( this, CUI_RES( BT_CANCEL ) ), - aHelpBtn( this, CUI_RES( BT_HELP ) ), bColumn( bCol ) { - FreeResource(); + get(m_pCountEdit, "insert_number"); + get(m_pBeforeBtn, "insert_before"); + get(m_pAfterBtn, "insert_after"); SetText( bColumn ? aCol : aRow ); SetHelpId( sHelpId ); } diff --git a/cui/source/inc/insrc.hxx b/cui/source/inc/insrc.hxx index 4e472d43691b..98f393f082fa 100644 --- a/cui/source/inc/insrc.hxx +++ b/cui/source/inc/insrc.hxx @@ -31,21 +31,14 @@ class SvxInsRowColDlg : public SvxAbstractInsRowColDlg, public ModalDialog { - FixedText aCount; - NumericField aCountEdit; - FixedLine aInsFL; + NumericField* m_pCountEdit; - RadioButton aBeforeBtn; - RadioButton aAfterBtn; - FixedLine aPosFL; + RadioButton* m_pBeforeBtn; + RadioButton* m_pAfterBtn; rtl::OUString aRow; rtl::OUString aCol; - OKButton aOKBtn; - CancelButton aCancelBtn; - HelpButton aHelpBtn; - bool bColumn; public: |