convert add/rename entries dialogs to .ui

Change-Id: I40040a237763a0706177ba5c6c1a664a51b3ee07

5 files changed, 46 insertions, 105 deletions

diff --git a/sw/source/ui/dbui/createaddresslistdialog.hrc b/sw/source/ui/dbui/createaddresslistdialog.hrc
index dc436abfdbb9..1ec8a4187935 100644
--- a/sw/source/ui/dbui/createaddresslistdialog.hrc
+++ b/sw/source/ui/dbui/createaddresslistdialog.hrc
@@ -46,10 +46,6 @@
 #define CB_FINDONLY             3
 #define LB_FINDONLY             4
 
-#define FT_FIELDNAME            1
-#define ED_FIELDNAME            2
-#define ST_RENAME_TITLE         3
-#define ST_ADD_BUTTON           4
 #define PB_FIND                 5
 
 
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.cxx b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
index b4784e42a0ce..881458de5693 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.cxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.cxx
@@ -58,7 +58,7 @@ SwCustomizeAddressListDialog::SwCustomizeAddressListDialog(
     m_aUpPB.SetClickHdl(aUpDownLk);
     m_aDownPB.SetClickHdl(aUpDownLk);
 
-    ::std::vector< OUString >::iterator aHeaderIter;
+    std::vector< OUString >::iterator aHeaderIter;
 
     for(aHeaderIter = m_pNewData->aDBColumnHeaders.begin();
                 aHeaderIter != m_pNewData->aDBColumnHeaders.end(); ++aHeaderIter)
@@ -85,8 +85,11 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton)
     if(nPos == LISTBOX_ENTRY_NOTFOUND)
         nPos = 0;
 
-    SwAddRenameEntryDialog* pDlg =
-            new SwAddRenameEntryDialog(pButton, bRename, m_pNewData->aDBColumnHeaders);
+    SwAddRenameEntryDialog* pDlg;
+    if (bRename)
+        pDlg = new SwRenameEntryDialog(pButton, m_pNewData->aDBColumnHeaders);
+    else
+        pDlg = new SwAddEntryDialog(pButton, m_pNewData->aDBColumnHeaders);
     if(bRename)
     {
         String aTemp = m_aFieldsLB.GetEntry(nPos);
@@ -108,7 +111,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, AddRenameHdl_Impl, PushButton*, pButton)
             m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sNew);
             //add a new entry into all data arrays
             String sTemp;
-            ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
+            std::vector< std::vector< OUString > >::iterator aDataIter;
             for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
                 aDataIter->insert(aDataIter->begin() + nPos, sTemp);
 
@@ -131,7 +134,7 @@ IMPL_LINK_NOARG(SwCustomizeAddressListDialog, DeleteHdl_Impl)
     //remove the column
     m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nPos);
     //remove the data
-    ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
+    std::vector< std::vector< OUString > >::iterator aDataIter;
     for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
         aDataIter->erase(aDataIter->begin() + nPos);
 
@@ -155,7 +158,7 @@ IMPL_LINK(SwCustomizeAddressListDialog, UpDownHdl_Impl, PushButton*, pButton)
     OUString sHeader = m_pNewData->aDBColumnHeaders[nOldPos];
     m_pNewData->aDBColumnHeaders.erase(m_pNewData->aDBColumnHeaders.begin() + nOldPos);
     m_pNewData->aDBColumnHeaders.insert(m_pNewData->aDBColumnHeaders.begin() + nPos, sHeader);
-    ::std::vector< ::std::vector< OUString > >::iterator aDataIter;
+    std::vector< std::vector< OUString > >::iterator aDataIter;
     for( aDataIter = m_pNewData->aDBData.begin(); aDataIter != m_pNewData->aDBData.end(); ++aDataIter)
     {
         OUString sData = (*aDataIter)[nOldPos];
@@ -183,32 +186,15 @@ SwCSVData*    SwCustomizeAddressListDialog::GetNewData()
 }
 
 SwAddRenameEntryDialog::SwAddRenameEntryDialog(
-        Window* pParent, bool bRename, const ::std::vector< OUString >& rCSVHeader) :
-    SfxModalDialog(pParent, SW_RES(DLG_MM_ADD_RENAME_ENTRY)),
-#ifdef _MSC_VER
-#pragma warning (disable : 4355)
-#endif
-    m_aFieldNameFT( this, SW_RES( FT_FIELDNAME)),
-    m_aFieldNameED( this, SW_RES( ED_FIELDNAME)),
-    m_aOK( this, SW_RES(          PB_OK)),
-    m_aCancel( this, SW_RES(      PB_CANCEL)),
-    m_aHelp( this, SW_RES(        PB_HELP)),
-#ifdef _MSC_VER
-#pragma warning (default : 4355)
-#endif
-    m_rCSVHeader(rCSVHeader)
-{
-    if(bRename)
-        SetText(String(SW_RES(ST_RENAME_TITLE)));
-    else
-        m_aOK.SetText(String(SW_RES(ST_ADD_BUTTON)));
-    FreeResource();
-    m_aFieldNameED.SetModifyHdl(LINK(this, SwAddRenameEntryDialog, ModifyHdl_Impl));
-    ModifyHdl_Impl( &m_aFieldNameED );
-}
-
-SwAddRenameEntryDialog::~SwAddRenameEntryDialog()
+        Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+        const std::vector< OUString >& rCSVHeader)
+    : SfxModalDialog(pParent, rID, rUIXMLDescription)
+    , m_rCSVHeader(rCSVHeader)
 {
+    get(m_pOK, "ok");
+    get(m_pFieldNameED, "entry");
+    m_pFieldNameED->SetModifyHdl(LINK(this, SwAddRenameEntryDialog, ModifyHdl_Impl));
+    ModifyHdl_Impl(m_pFieldNameED);
 }
 
 IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
@@ -218,7 +204,7 @@ IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
 
     if(!bFound)
     {
-        ::std::vector< OUString >::const_iterator aHeaderIter;
+        std::vector< OUString >::const_iterator aHeaderIter;
         for(aHeaderIter = m_rCSVHeader.begin();
                     aHeaderIter != m_rCSVHeader.end();
                     ++aHeaderIter)
@@ -228,7 +214,7 @@ IMPL_LINK(SwAddRenameEntryDialog, ModifyHdl_Impl, Edit*, pEdit)
                 break;
             }
     }
-    m_aOK.Enable(!bFound);
+    m_pOK->Enable(!bFound);
     return 0;
 }
 
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hrc b/sw/source/ui/dbui/customizeaddresslistdialog.hrc
index 67713ae60e59..4130046755cb 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hrc
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hrc
@@ -32,12 +32,6 @@
 #define PB_CANCEL               15
 #define PB_HELP                 16
 
-#define FT_FIELDNAME            1
-#define ED_FIELDNAME            2
-#define ST_RENAME_TITLE         3
-#define ST_ADD_BUTTON           4
-
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.hxx b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
index 3eec3fbb4e8e..ecea2dcf9943 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.hxx
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.hxx
@@ -62,23 +62,38 @@ public:
 
 class SwAddRenameEntryDialog : public SfxModalDialog
 {
-    FixedText               m_aFieldNameFT;
-    Edit                    m_aFieldNameED;
-
-    OKButton                m_aOK;
-    CancelButton            m_aCancel;
-    HelpButton              m_aHelp;
-
-    const ::std::vector< OUString >& m_rCSVHeader;
+    Edit*     m_pFieldNameED;
+    OKButton* m_pOK;
+    const std::vector< OUString >& m_rCSVHeader;
 
     DECL_LINK(ModifyHdl_Impl, Edit*);
+protected:
+    SwAddRenameEntryDialog(Window* pParent, const OString& rID,
+        const OUString& rUIXMLDescription, const std::vector< OUString >& rCSVHeader);
 public:
-    SwAddRenameEntryDialog(Window* pParent, bool bRename, const ::std::vector< OUString >& aCSVHeader);
-    ~SwAddRenameEntryDialog();
+    void                SetFieldName(const OUString& rName) {m_pFieldNameED->SetText(rName);}
+    OUString            GetFieldName() const {return m_pFieldNameED->GetText();};
+
+};
 
-    void                SetFieldName(const String& rName) {m_aFieldNameED.SetText(rName);}
-    String              GetFieldName() const {return m_aFieldNameED.GetText();};
+class SwAddEntryDialog : public SwAddRenameEntryDialog
+{
+public:
+    SwAddEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader)
+        : SwAddRenameEntryDialog(pParent, "AddEntryDialog",
+            "modules/swriter/ui/addentrydialog.ui", rCSVHeader)
+    {
+    }
+};
 
+class SwRenameEntryDialog : public SwAddRenameEntryDialog
+{
+public:
+    SwRenameEntryDialog(Window* pParent, const std::vector< OUString >& rCSVHeader)
+        : SwAddRenameEntryDialog(pParent, "RenameEntryDialog",
+            "modules/swriter/ui/renameentrydialog.ui", rCSVHeader)
+    {
+    }
 };
 
 #endif
diff --git a/sw/source/ui/dbui/customizeaddresslistdialog.src b/sw/source/ui/dbui/customizeaddresslistdialog.src
index b58ee959e62e..345f41156288 100644
--- a/sw/source/ui/dbui/customizeaddresslistdialog.src
+++ b/sw/source/ui/dbui/customizeaddresslistdialog.src
@@ -104,54 +104,4 @@ ModalDialog DLG_MM_CUSTOMIZE_ADDRESS_LIST
     };
 };
 
-ModalDialog DLG_MM_ADD_RENAME_ENTRY
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    HelpID = HID_MM_ADD_RENAME_ENTRY;
-    Size = MAP_APPFONT ( 188 , 60 ) ;
-    Moveable = TRUE ;
-
-    Text [ en-US ] = "Add Element";
-
-    FixedText  FT_FIELDNAME
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 50 , 8 ) ;
-        Text [ en-US ] = "Element ~name";
-    };
-    Edit       ED_FIELDNAME
-    {
-        HelpID = "sw:Edit:DLG_MM_ADD_RENAME_ENTRY:ED_FIELDNAME";
-        Pos = MAP_APPFONT ( 6 , 14 ) ;
-        Size = MAP_APPFONT ( 120 , 12 ) ;
-        Border = TRUE;
-    };
-
-    OKButton                PB_OK
-    {
-        Pos = MAP_APPFONT ( 132 , 3 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE;
-    };
-    CancelButton            PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 132 , 20 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton              PB_HELP
-    {
-        Pos = MAP_APPFONT ( 132 , 40 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    String ST_RENAME_TITLE
-    {
-        Text [ en-US ] = "Rename Element";
-    };
-    String ST_ADD_BUTTON
-    {
-        Text [ en-US ] = "Add";
-    };
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */