convert add instance dialog to .ui

Change-Id: I92a82fb25b8b9d9cbedefb6fcebc7a4d167649bf

include/svx/fmresids.hrc

@@ -67,7 +67,6 @@
 
 #define RID_SVXDLG_ADD_SUBMISSION                   (RID_FORMS_START + 16)
 
-#define RID_SVXDLG_ADD_INSTANCE                     (RID_FORMS_START + 18)
 #define RID_SVXWIN_DATANAVIGATOR                    (RID_FORMS_START + 19)
 #define RID_SVX_XFORMS_TABPAGES                     (RID_FORMS_START + 20)
 

svx/UIConfig_svx.mk

@@ -11,6 +11,7 @@ $(eval $(call gb_UIConfig_UIConfig,svx))
 
 $(eval $(call gb_UIConfig_add_uifiles,svx,\
 	svx/uiconfig/ui/acceptrejectchangesdialog \
+	svx/uiconfig/ui/addinstancedialog \
 	svx/uiconfig/ui/addmodeldialog \
 	svx/uiconfig/ui/addnamespacedialog \
 	svx/uiconfig/ui/asianphoneticguidedialog \

svx/inc/fmhelp.hrc

@@ -75,7 +75,6 @@
 #define HID_XFORMS_MODELS_MENUBTN                             "SVX_HID_XFORMS_MODELS_MENUBTN"
 #define HID_XFORMS_INSTANCES_MENUBTN                          "SVX_HID_XFORMS_INSTANCES_MENUBTN"
 #define HID_XFORMS_ADDSUBMISSION_DLG                          "SVX_HID_XFORMS_ADDSUBMISSION_DLG"
-#define HID_XFORMS_ADDINSTANCE_DLG                            "SVX_HID_XFORMS_ADDINSTANCE_DLG"
 #define HID_XFORMS_MID_INSERT_CONTROL                         "SVX_HID_XFORMS_MID_INSERT_CONTROL"
 #define HID_XFORMS_TAB_CONTROL                                "SVX_HID_XFORMS_TAB_CONTROL"
 #define HID_FM_DELETEROWS                                     "SVX_HID_FM_DELETEROWS"

svx/source/form/datanavi.cxx

@@ -3597,39 +3597,25 @@ namespace svxform
     // class AddInstanceDialog
     //========================================================================
 
-    AddInstanceDialog::AddInstanceDialog( Window* pParent, bool _bEdit ) :
-
-        ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_INSTANCE ) ),
-
-        m_aInstanceFL       ( this, SVX_RES( FL_INSTANCE ) ),
-        m_aNameFT           ( this, SVX_RES( FT_INST_NAME ) ),
-        m_aNameED           ( this, SVX_RES( ED_INST_NAME ) ),
-        m_aURLFT            ( this, SVX_RES( FT_INST_URL ) ),
-        m_aURLED            ( this, SVX_RES( ED_INST_URL ) ),
-        m_aFilePickerBtn    ( this, SVX_RES( PB_FILEPICKER ) ),
-        m_aLinkInstanceCB   ( this, SVX_RES( CB_INST_LINKINST ) ),
-        m_aButtonsFL        ( this, SVX_RES( FL_DATANAV_BTN ) ),
-        m_aOKBtn            ( this, SVX_RES( BTN_DATANAV_OK ) ),
-        m_aEscBtn           ( this, SVX_RES( BTN_DATANAV_ESC ) ),
-        m_aHelpBtn          ( this, SVX_RES( BTN_DATANAV_HELP ) )
-
+    AddInstanceDialog::AddInstanceDialog(Window* pParent, bool _bEdit)
+        : ModalDialog(pParent, "AddInstanceDialog" , "svx/ui/addinstancedialog.ui")
     {
-        if ( _bEdit )
-            SetText(SVX_RESSTR(STR_EDIT_TEXT));
+        get(m_pNameED, "name");
+        get(m_pURLFT, "urlft");
+        get(m_pURLED, "url");
+        get(m_pFilePickerBtn, "browse");
+        get(m_pLinkInstanceCB, "link");
 
-        FreeResource();
+        if ( _bEdit )
+            SetText(get<FixedText>("alttitle")->GetText());
 
-        m_aURLED.DisableHistory();
-        m_aFilePickerBtn.SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
+        m_pURLED->DisableHistory();
+        m_pFilePickerBtn->SetClickHdl( LINK( this, AddInstanceDialog, FilePickerHdl ) );
 
         // load the filter name from fps_office resource
         m_sAllFilterName = ResId(STR_FILTERNAME_ALL, *ResMgr::CreateResMgr("fps_office")).toString();
     }
 
-    AddInstanceDialog::~AddInstanceDialog()
-    {
-    }
-
     //------------------------------------------------------------------------
     IMPL_LINK_NOARG(AddInstanceDialog, FilePickerHdl)
     {
@@ -3644,7 +3630,7 @@ namespace svxform
         aDlg.SetDisplayDirectory( aFile.GetMainURL( INetURLObject::NO_DECODE ) );
 
         if( aDlg.Execute() == ERRCODE_NONE )
-            m_aURLED.SetText( aDlg.GetPath() );
+            m_pURLED->SetText( aDlg.GetPath() );
 
         return 0;
     }

svx/source/form/datanavi.src

@@ -868,95 +868,6 @@ ModalDialog RID_SVXDLG_ADD_SUBMISSION
     };
 };
 
-ModalDialog RID_SVXDLG_ADD_INSTANCE
-{
-    HelpID = HID_XFORMS_ADDINSTANCE_DLG ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 210 , 88 ) ;
-    Text [ en-US ] = "Add Instance" ;
-    Moveable = TRUE ;
-    FixedLine FL_INSTANCE
-    {
-        Pos = MAP_APPFONT ( 4 , 3 ) ;
-        Size = MAP_APPFONT ( 202 , 8 ) ;
-        Text [ en-US ] = "Instance" ;
-    };
-    FixedText FT_INST_NAME
-    {
-        Pos = MAP_APPFONT ( 6 , 15 ) ;
-        Size = MAP_APPFONT ( 51 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~Name" ;
-    };
-    Edit ED_INST_NAME
-    {
-        HelpID = "svx:Edit:RID_SVXDLG_ADD_INSTANCE:ED_INST_NAME";
-        Pos = MAP_APPFONT ( 60 , 14 ) ;
-        Size = MAP_APPFONT ( 144 , 12 ) ;
-        Border = TRUE ;
-    };
-    FixedText FT_INST_URL
-    {
-        Pos = MAP_APPFONT ( 6 , 30 ) ;
-        Size = MAP_APPFONT ( 51 , 8 ) ;
-        LeftLabel = TRUE ;
-        Text [ en-US ] = "~URL" ;
-    };
-    ComboBox ED_INST_URL
-    {
-        HelpID = "svx:ComboBox:RID_SVXDLG_ADD_INSTANCE:ED_INST_URL";
-        Pos = MAP_APPFONT ( 60 , 29 ) ;
-        Size = MAP_APPFONT ( 127 , 48 ) ;
-        DropDown = TRUE ;
-        Border = TRUE ;
-    };
-    PushButton PB_FILEPICKER
-    {
-        HelpID = "svx:PushButton:RID_SVXDLG_ADD_INSTANCE:PB_FILEPICKER";
-        Pos = MAP_APPFONT ( 190 , 28 ) ;
-        Size = MAP_APPFONT ( 14 , 14 ) ;
-        TabStop = TRUE ;
-        Text = "~..." ;
-    };
-    CheckBox CB_INST_LINKINST
-    {
-        HelpID = "svx:CheckBox:RID_SVXDLG_ADD_INSTANCE:CB_INST_LINKINST";
-        Pos = MAP_APPFONT ( 6 , 44 ) ;
-        Size = MAP_APPFONT ( 198 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Link instance" ;
-    };
-    FixedLine FL_DATANAV_BTN
-    {
-        Pos = MAP_APPFONT ( 4 , 57 ) ;
-        Size = MAP_APPFONT ( 202 , 8 ) ;
-    };
-    OKButton BTN_DATANAV_OK
-    {
-        Pos = MAP_APPFONT ( 45 , 68 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_DATANAV_ESC
-    {
-        Pos = MAP_APPFONT ( 98 , 68 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton BTN_DATANAV_HELP
-    {
-        Pos = MAP_APPFONT ( 154 , 68 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    String STR_EDIT_TEXT
-    {
-        Text [ en-US ] = "Edit Instance" ;
-    };
-};
-
 String RID_STR_DATANAV_SUBM_PARENT
 {
     Text [ en-US ] = "Submission: " ;

svx/source/inc/datanavi.hrc

@@ -126,8 +126,6 @@
 #define STR_HEADER_PREFIX       10
 #define STR_HEADER_URL          11
 
-#define STR_EDIT_TEXT           10
-
 // class AddSubmissionDialog
 #define FL_SUBMISSION           10
 #define FT_SUBMIT_NAME          11
@@ -156,15 +154,6 @@
 #define FT_MODEL_NAME           11
 #define ED_MODEL_NAME           12
 
-// class AddInstanceDialog
-#define FL_INSTANCE             10
-#define FT_INST_NAME            11
-#define ED_INST_NAME            12
-#define FT_INST_URL             13
-#define ED_INST_URL             14
-#define PB_FILEPICKER           15
-#define CB_INST_LINKINST        16
-
 // class AddModelDialog
 #define CB_MODIFIES_DOCUMENT    1
 

svx/source/inc/datanavi.hxx

@@ -526,17 +526,11 @@ namespace svxform
     class AddInstanceDialog : public ModalDialog
     {
     private:
-        FixedLine               m_aInstanceFL;
-        FixedText               m_aNameFT;
-        Edit                    m_aNameED;
-        FixedText               m_aURLFT;
-        SvtURLBox               m_aURLED;
-        PushButton              m_aFilePickerBtn;
-        CheckBox                m_aLinkInstanceCB;
-        FixedLine               m_aButtonsFL;
-        OKButton                m_aOKBtn;
-        CancelButton            m_aEscBtn;
-        HelpButton              m_aHelpBtn;
+        Edit*                   m_pNameED;
+        FixedText*              m_pURLFT;
+        SvtURLBox*              m_pURLED;
+        PushButton*             m_pFilePickerBtn;
+        CheckBox*               m_pLinkInstanceCB;
 
         OUString                m_sAllFilterName;
 
@@ -544,24 +538,21 @@ namespace svxform
 
     public:
         AddInstanceDialog( Window* pParent, bool _bEdit );
-        ~AddInstanceDialog();
-
-        inline void             SetRenameMode();
-        inline OUString         GetName() const { return m_aNameED.GetText(); }
-        inline void             SetName( const OUString& _rName ) { m_aNameED.SetText( _rName );}
-        inline OUString         GetURL() const { return m_aURLED.GetText(); }
-        inline void             SetURL( const OUString& _rURL ) { m_aURLED.SetText( _rURL );}
-        inline bool             IsLinkInstance() const { return ( m_aLinkInstanceCB.IsChecked() != sal_False ); }
-        inline void             SetLinkInstance( bool _bLink ) { m_aLinkInstanceCB.Check( _bLink != false ); }
-    };
 
-    inline void AddInstanceDialog::SetRenameMode()
-    {
-        m_aURLFT.Disable();
-        m_aURLED.Disable();
-        m_aFilePickerBtn.Disable();
-        m_aLinkInstanceCB.Disable();
-    }
+        void SetRenameMode()
+        {
+            m_pURLFT->Disable();
+            m_pURLED->Disable();
+            m_pFilePickerBtn->Disable();
+            m_pLinkInstanceCB->Disable();
+        }
+        OUString         GetName() const { return m_pNameED->GetText(); }
+        void             SetName( const OUString& _rName ) { m_pNameED->SetText( _rName );}
+        OUString         GetURL() const { return m_pURLED->GetText(); }
+        void             SetURL( const OUString& _rURL ) { m_pURLED->SetText( _rURL );}
+        bool             IsLinkInstance() const { return ( m_pLinkInstanceCB->IsChecked() != sal_False ); }
+        void             SetLinkInstance( bool _bLink ) { m_pLinkInstanceCB->Check( _bLink != false ); }
+    };
 
     //========================================================================
     class LinkedInstanceWarningBox : public MessBox