DLG_MAILMERGE conversion to .ui

Change-Id: I9f62470666dfdc2e1a3e636ccc1893871b8e8bd4
Reviewed-on: https://gerrit.libreoffice.org/10753Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

sw/AllLangResTarget_sw.mk

@@ -100,7 +100,6 @@ $(eval $(call gb_SrsTarget_add_files,sw/res,\
     sw/source/ui/envelp/envelp.src \
     sw/source/ui/envelp/label.src \
     sw/source/ui/envelp/labfmt.src \
-    sw/source/ui/envelp/mailmrge.src \
     sw/source/ui/fldui/fldui.src \
     sw/source/ui/frmdlg/frmui.src \
     sw/source/ui/globdoc/globdoc.src \

sw/UIConfig_swriter.mk

@@ -165,6 +165,7 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/swriter,\
 	sw/uiconfig/swriter/ui/queryrotateintostandarddialog \
 	sw/uiconfig/swriter/ui/querysavelabeldialog \
 	sw/uiconfig/swriter/ui/queryshowchangesdialog \
+	sw/uiconfig/swriter/ui/mailmerge \
 	sw/uiconfig/swriter/ui/mmaddressblockpage \
 	sw/uiconfig/swriter/ui/mmcreatingdialog \
 	sw/uiconfig/swriter/ui/mmlayoutpage \

sw/source/ui/envelp/mailmrge.hrc

-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef _MAILMRGE_HRC
-#define _MAILMRGE_HRC
-
-#include "envelp.hrc"
-
-// elements -----------------------------------------------------------------
-
-#define FL_RECORD               1
-#define RB_ALL          2
-#define RB_MARKED       3
-#define RB_FROM         4
-#define NF_FROM         5
-#define FT_BIS          6
-#define NF_TO           7
-#define BTN_OK          8
-#define BTN_CANCEL      9
-#define BTN_HELP        10
-#define RB_PRINTER      11
-#define RB_MAILING      12
-#define FT_ADDRESS      13
-#define LB_ADDRESSFLD   14
-#define FT_SUBJECT      15
-#define ED_SUBJECT      16
-#define FL_DEST                 17
-#define CB_SINGLE_JOBS  18
-#define FT_FORMAT       19
-#define CB_FORMAT_SW    20
-#define CB_FORMAT_HTML  21
-#define CB_FORMAT_RTF   22
-#define RB_FILE         23
-#define FT_PATH         24
-#define ED_PATH         25
-#define PB_PATH         26
-#define LB_COLUMN       30
-#define FT_ATTACH       32
-#define ED_ATTACH       33
-#define PB_ATTACH       34
-#define WIN_BEAMER      35
-#define FL_SEPARATOR    36
-#define FL_BOTTOM_SEPARATOR             37
-#define FL_SAVE_MERGED_DOCUMENT         38
-#define RB_SAVE_SINGLE_DOC              39
-#define RB_SAVE_INDIVIDUAL              40
-#define RB_GENERATE_FROM_DATABASE       41
-#define FT_COLUMN                       42
-#define FT_FILTER                       43
-#define LB_FILTER                       44
-
-#define BT_OK           4
-#define BT_CANCEL       5
-#define BT_HELP         6
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/source/uibase/inc/mailmrge.hxx

@@ -51,55 +51,46 @@ class SwMailMergeDlg : public SvxStandardDialog
 {
     friend class SwXSelChgLstnr_Impl;
 
-    Window*         pBeamerWin;
-
-    RadioButton     aAllRB;
-    RadioButton     aMarkedRB;
-    RadioButton     aFromRB;
-    NumericField    aFromNF;
-    FixedText       aBisFT;
-    NumericField    aToNF;
-    FixedLine       aRecordFL;
-
-    FixedLine       aSeparatorFL;
-
-    RadioButton     aPrinterRB;
-    RadioButton     aMailingRB;
-    RadioButton     aFileRB;
-
-    CheckBox        aSingleJobsCB;
-
-    FixedLine       aSaveMergedDocumentFL;
-    RadioButton     aSaveSingleDocRB;
-    RadioButton     aSaveIndividualRB;
-
-    CheckBox        aGenerateFromDataBaseCB;
-
-    FixedText       aColumnFT;
-    ListBox         aColumnLB;
-    FixedText       aPathFT;
-    Edit            aPathED;
-    PushButton      aPathPB;
-    FixedText       aFilterFT;
-    ListBox         aFilterLB;
-
-    ListBox         aAddressFldLB;
-    FixedText       aSubjectFT;
-    Edit            aSubjectED;
-    FixedText       aFormatFT;
-    FixedText       aAttachFT;
-    Edit            aAttachED;
-    PushButton      aAttachPB;
-    CheckBox        aFormatHtmlCB;
-    CheckBox        aFormatRtfCB;
-    CheckBox        aFormatSwCB;
-    FixedLine       aDestFL;
-
-    FixedLine       aBottomSeparatorFL;
-
-    OKButton        aOkBTN;
-    CancelButton    aCancelBTN;
-    HelpButton      aHelpBTN;
+    Window*         m_pBeamerWin;
+
+    RadioButton*     m_pAllRB;
+    RadioButton*     m_pMarkedRB;
+    RadioButton*     m_pFromRB;
+    NumericField*    m_pFromNF;
+    NumericField*    m_pToNF;
+
+    RadioButton*     m_pPrinterRB;
+    RadioButton*     m_pMailingRB;
+    RadioButton*     m_pFileRB;
+
+    CheckBox*        m_pSingleJobsCB;
+
+    FixedText*       m_pSaveMergedDocumentFT;
+    RadioButton*     m_pSaveSingleDocRB;
+    RadioButton*     m_pSaveIndividualRB;
+
+    CheckBox*        m_pGenerateFromDataBaseCB;
+
+    FixedText*       m_pColumnFT;
+    ListBox*         m_pColumnLB;
+    FixedText*       m_pPathFT;
+    Edit*            m_pPathED;
+    PushButton*      m_pPathPB;
+    FixedText*       m_pFilterFT;
+    ListBox*         m_pFilterLB;
+
+    ListBox*         m_pAddressFldLB;
+    FixedText*       m_pSubjectFT;
+    Edit*            m_pSubjectED;
+    FixedText*       m_pFormatFT;
+    FixedText*       m_pAttachFT;
+    Edit*            m_pAttachED;
+    PushButton*      m_pAttachPB;
+    CheckBox*        m_pFormatHtmlCB;
+    CheckBox*        m_pFormatRtfCB;
+    CheckBox*        m_pFormatSwCB;
+
+    OKButton*        m_pOkBTN;
 
     SwMailMergeDlg_Impl* pImpl;
 
@@ -121,7 +112,6 @@ class SwMailMergeDlg : public SvxStandardDialog
     DECL_LINK( SaveTypeHdl, RadioButton* pBtn );
 
     virtual void    Apply() SAL_OVERRIDE;
-    virtual void    Resize() SAL_OVERRIDE;
     bool            ExecQryShell();
 
 public:
@@ -135,10 +125,10 @@ public:
 
     inline sal_uInt16   GetMergeType() { return nMergeType; }
 
-    bool IsSaveIndividualDocs() const { return aSaveIndividualRB.IsChecked(); }
-    bool IsGenerateFromDataBase() const { return aGenerateFromDataBaseCB.IsChecked(); }
-    OUString GetColumnName() const { return aColumnLB.GetSelectEntry();}
-    OUString GetPath() const { return aPathED.GetText();}
+    bool IsSaveIndividualDocs() const { return m_pSaveIndividualRB->IsChecked(); }
+    bool IsGenerateFromDataBase() const { return m_pGenerateFromDataBaseCB->IsChecked(); }
+    OUString GetColumnName() const { return m_pColumnLB->GetSelectEntry();}
+    OUString GetPath() const { return m_pPathED->GetText();}
 
     const OUString& GetSaveFilter() const {return m_sSaveFilter;}
     inline const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > GetSelection() const { return m_aSelection; }