WIP: first stab at converting the insert-row dialog

to UI format

Conflicts:
	cui/UI_cui.mk

Change-Id: I1b1888f667b31b6ca22d1eca57aeb9da7ce45b71

cui/UI_cui.mk

@@ -16,6 +16,7 @@ $(eval $(call gb_UI_add_uifiles,cui,\
 	cui/uiconfig/ui/insertfloatingframe \
 	cui/uiconfig/ui/insertoleobject \
 	cui/uiconfig/ui/insertplugin \
+	cui/uiconfig/ui/insrc \
 	cui/uiconfig/ui/macroselectordialog \
 	cui/uiconfig/ui/positionpage \
 	cui/uiconfig/ui/specialcharacters \

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 );
 }

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: