[Libreoffice-commits] core.git: sw/AllLangResTarget_sw.mk sw/source sw/uiconfig sw/UIConfig_swriter.mk

Szymon KÅ‚os eszkadev at gmail.com
Wed Aug 6 07:58:01 PDT 2014


 sw/AllLangResTarget_sw.mk           |    1 
 sw/UIConfig_swriter.mk              |    1 
 sw/source/ui/envelp/mailmrge.cxx    |  476 ++++++--------------
 sw/source/ui/envelp/mailmrge.hrc    |   74 ---
 sw/source/ui/envelp/mailmrge.src    |  340 --------------
 sw/source/uibase/inc/mailmrge.hxx   |   98 +---
 sw/uiconfig/swriter/ui/mailmerge.ui |  837 ++++++++++++++++++++++++++++++++++++
 7 files changed, 1044 insertions(+), 783 deletions(-)

New commits:
commit d72a3d46022860f2ffe9f7acb268efe5756b0f13
Author: Szymon KÅ‚os <eszkadev at gmail.com>
Date:   Tue Aug 5 13:42:48 2014 +0200

    DLG_MAILMERGE conversion to .ui
    
    Change-Id: I9f62470666dfdc2e1a3e636ccc1893871b8e8bd4
    Reviewed-on: https://gerrit.libreoffice.org/10753
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/sw/AllLangResTarget_sw.mk b/sw/AllLangResTarget_sw.mk
index bf03701..1fd4a17 100644
--- a/sw/AllLangResTarget_sw.mk
+++ b/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 \
diff --git a/sw/UIConfig_swriter.mk b/sw/UIConfig_swriter.mk
index 2fa2e70..6af4be8 100644
--- a/sw/UIConfig_swriter.mk
+++ b/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 \
diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx
index 2b2bc53..f385dab 100644
--- a/sw/source/ui/envelp/mailmrge.cxx
+++ b/sw/source/ui/envelp/mailmrge.cxx
@@ -39,7 +39,6 @@
 #include <modcfg.hxx>
 #include <mailmergehelper.hxx>
 #include <envelp.hrc>
-#include <mailmrge.hrc>
 #include <mailmrge.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/docfilt.hxx>
@@ -113,12 +112,12 @@ void SwXSelChgLstnr_Impl::selectionChanged( const EventObject&  ) throw (Runtime
         rParent.pImpl->xSelSupp->getSelection() >>= aSelection;
 
     bool bEnable = aSelection.getLength() > 0;
-    rParent.aMarkedRB.Enable(bEnable);
+    rParent.m_pMarkedRB->Enable(bEnable);
     if(bEnable)
-        rParent.aMarkedRB.Check();
-    else if(rParent.aMarkedRB.IsChecked())
+        rParent.m_pMarkedRB->Check();
+    else if(rParent.m_pMarkedRB->IsChecked())
     {
-        rParent.aAllRB.Check();
+        rParent.m_pAllRB->Check();
         rParent.m_aSelection.realloc(0);
     }
 }
@@ -135,56 +134,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         const uno::Reference< XConnection>& _xConnection,
         Sequence< Any >* pSelection) :
 
-    SvxStandardDialog(pParent, SW_RES(DLG_MAILMERGE)),
-    pBeamerWin      (new Window(this, SW_RES(WIN_BEAMER))),
-
-    aAllRB          (this, SW_RES(RB_ALL)),
-    aMarkedRB       (this, SW_RES(RB_MARKED)),
-    aFromRB         (this, SW_RES(RB_FROM)),
-    aFromNF         (this, SW_RES(NF_FROM)),
-    aBisFT          (this, SW_RES(FT_BIS)),
-    aToNF           (this, SW_RES(NF_TO)),
-    aRecordFL       (this, SW_RES(FL_RECORD)),
-
-    aSeparatorFL    (this, SW_RES(FL_SEPARATOR)),
-
-    aPrinterRB      (this, SW_RES(RB_PRINTER)),
-    aMailingRB      (this, SW_RES(RB_MAILING)),
-    aFileRB         (this, SW_RES(RB_FILE)),
-
-    aSingleJobsCB   (this, SW_RES(CB_SINGLE_JOBS)),
-
-    aSaveMergedDocumentFL(this, SW_RES(     FL_SAVE_MERGED_DOCUMENT)),
-    aSaveSingleDocRB(this, SW_RES(          RB_SAVE_SINGLE_DOC )),
-    aSaveIndividualRB(this, SW_RES(         RB_SAVE_INDIVIDUAL )),
-    aGenerateFromDataBaseCB(this, SW_RES(   RB_GENERATE_FROM_DATABASE )),
-
-    aColumnFT       (this, SW_RES(FT_COLUMN)),
-    aColumnLB       (this, SW_RES(LB_COLUMN)),
-
-    aPathFT         (this, SW_RES(FT_PATH)),
-    aPathED         (this, SW_RES(ED_PATH)),
-    aPathPB         (this, SW_RES(PB_PATH)),
-    aFilterFT       (this, SW_RES(FT_FILTER)),
-    aFilterLB       (this, SW_RES(LB_FILTER)),
-
-    aAddressFldLB   (this, SW_RES(LB_ADDRESSFLD)),
-    aSubjectFT      (this, SW_RES(FT_SUBJECT)),
-    aSubjectED      (this, SW_RES(ED_SUBJECT)),
-    aFormatFT       (this, SW_RES(FT_FORMAT)),
-    aAttachFT       (this, SW_RES(FT_ATTACH)),
-    aAttachED       (this, SW_RES(ED_ATTACH)),
-    aAttachPB       (this, SW_RES(PB_ATTACH)),
-    aFormatHtmlCB   (this, SW_RES(CB_FORMAT_HTML)),
-    aFormatRtfCB    (this, SW_RES(CB_FORMAT_RTF)),
-    aFormatSwCB     (this, SW_RES(CB_FORMAT_SW)),
-    aDestFL         (this, SW_RES(FL_DEST)),
-
-    aBottomSeparatorFL(this, SW_RES(FL_BOTTOM_SEPARATOR)),
-
-    aOkBTN          (this, SW_RES(BTN_OK)),
-    aCancelBTN      (this, SW_RES(BTN_CANCEL)),
-    aHelpBTN        (this, SW_RES(BTN_HELP)),
+    SvxStandardDialog(pParent, "MailmergeDialog", "modules/swriter/ui/mailmerge.ui"),
 
     pImpl           (new SwMailMergeDlg_Impl),
 
@@ -192,72 +142,69 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     nMergeType      (DBMGR_MERGE_MAILING),
     m_aDialogSize( GetSizePixel() )
 {
-    FreeResource();
-    aSingleJobsCB.Show(false); // not supported in since cws printerpullpages anymore
+    get(m_pBeamerWin, "beamer");
+
+    get(m_pAllRB, "all");
+    get(m_pMarkedRB, "selected");
+    get(m_pFromRB, "rbfrom");
+    get(m_pFromNF, "from");
+    get(m_pToNF, "to");
+
+    get(m_pPrinterRB, "printer");
+    get(m_pMailingRB, "electronic");
+    get(m_pFileRB, "file");
+
+    get(m_pSingleJobsCB, "singlejobs");
+
+    get(m_pSaveMergedDocumentFT, "savemergeddoclabel");
+    get(m_pSaveSingleDocRB, "singledocument");
+    get(m_pSaveIndividualRB, "idividualdocuments");
+    get(m_pGenerateFromDataBaseCB, "generate");
+
+    get(m_pColumnFT, "fieldlabel");
+    get(m_pColumnLB, "field");
+
+    get(m_pPathFT, "pathlabel");
+    get(m_pPathED, "path");
+    get(m_pPathPB, "pathpb");
+    get(m_pFilterFT, "fileformatlabel");
+    get(m_pFilterLB, "fileformat");
+
+    get(m_pAddressFldLB, "address");
+    get(m_pSubjectFT, "subjectlabel");
+    get(m_pSubjectED, "subject");
+    get(m_pFormatFT, "mailformatlabel");
+    get(m_pAttachFT, "attachmentslabel");
+    get(m_pAttachED, "attachments");
+    get(m_pAttachPB, "attach");
+    get(m_pFormatHtmlCB, "html");
+    get(m_pFormatRtfCB, "rtf");
+    get(m_pFormatSwCB, "swriter");
+
+    get(m_pOkBTN, "ok");
+
+    m_pSingleJobsCB->Show(false); // not supported in since cws printerpullpages anymore
     //task #97066# mailing of form letters is currently not supported
-    aMailingRB.Show(false);
-    aSubjectFT.Show(false);
-    aSubjectED.Show(false);
-    aFormatFT.Show(false);
-    aFormatSwCB.Show(false);
-    aFormatHtmlCB.Show(false);
-    aFormatRtfCB.Show(false);
-    aAttachFT.Show(false);
-    aAttachED.Show(false);
-    aAttachPB.Show(false);
-
-    Point aMailPos = aMailingRB.GetPosPixel();
-    Point aFilePos = aFileRB.GetPosPixel();
+    m_pMailingRB->Show(false);
+    m_pSubjectFT->Show(false);
+    m_pSubjectED->Show(false);
+    m_pFormatFT->Show(false);
+    m_pFormatSwCB->Show(false);
+    m_pFormatHtmlCB->Show(false);
+    m_pFormatRtfCB->Show(false);
+    m_pAttachFT->Show(false);
+    m_pAttachED->Show(false);
+    m_pAttachPB->Show(false);
+
+    Point aMailPos = m_pMailingRB->GetPosPixel();
+    Point aFilePos = m_pFileRB->GetPosPixel();
     aFilePos.X() -= (aFilePos.X() - aMailPos.X()) /2;
-    aFileRB.SetPosPixel(aFilePos);
+    m_pFileRB->SetPosPixel(aFilePos);
     uno::Reference< lang::XMultiServiceFactory > xMSF = comphelper::getProcessServiceFactory();
     if(pSelection)
     {
         m_aSelection = *pSelection;
-        //move all controls
-        long nDiff = aRecordFL.GetPosPixel().Y() - pBeamerWin->GetPosPixel().Y();
-        pBeamerWin->Show(false);
-        ::Size aSize = GetSizePixel();
-        aSize.Height() -= nDiff;
-        SetSizePixel(aSize);
-        Window* aCntrlArr[] = {
-            &aAllRB       ,
-            &aMarkedRB    ,
-            &aFromRB      ,
-            &aFromNF      ,
-            &aBisFT       ,
-            &aToNF        ,
-            &aRecordFL    ,
-            &aPrinterRB   ,
-            &aMailingRB   ,
-            &aFileRB      ,
-            &aSingleJobsCB,
-            &aPathFT      ,
-            &aPathED      ,
-            &aPathPB      ,
-            &aFilterFT    ,
-            &aFilterLB    ,
-            &aColumnLB    ,
-            &aAddressFldLB,
-            &aSubjectFT   ,
-            &aSubjectED   ,
-            &aFormatFT    ,
-            &aAttachFT    ,
-            &aAttachED    ,
-            &aAttachPB    ,
-            &aFormatHtmlCB,
-            &aFormatRtfCB ,
-            &aFormatSwCB  ,
-            &aDestFL      ,
-            &aSeparatorFL ,
-            0};
-
-        for( Window** ppW = aCntrlArr; *ppW; ++ppW )
-        {
-            ::Point aPnt( (*ppW)->GetPosPixel() );
-            aPnt.Y() -= nDiff;
-            (*ppW)->SetPosPixel( aPnt );
-        }
+        m_pBeamerWin->Show(false);
     }
     else
     {
@@ -265,7 +212,8 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
         {
             // create a frame wrapper for myself
             m_xFrame = frame::Frame::create( comphelper::getProcessComponentContext() );
-            m_xFrame->initialize( VCLUnoHelper::GetInterface ( pBeamerWin ) );
+            m_pUIBuilder->drop_ownership(m_pBeamerWin);
+            m_xFrame->initialize( VCLUnoHelper::GetInterface ( m_pBeamerWin ) );
         }
         catch (const Exception&)
         {
@@ -289,7 +237,7 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
                 pProperties[2].Name = "CommandType";
                 pProperties[2].Value <<= nCommandType;
                 xD->dispatch(aURL, aProperties);
-                pBeamerWin->Show();
+                m_pBeamerWin->Show();
             }
             uno::Reference<XController> xController = m_xFrame->getController();
             pImpl->xFController = uno::Reference<runtime::XFormController>(xController, UNO_QUERY);
@@ -309,55 +257,55 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     pModOpt = SW_MOD()->GetModuleConfig();
 
     sal_Int16 nMailingMode(pModOpt->GetMailingFormats());
-    aFormatSwCB.Check((nMailingMode & TXTFORMAT_OFFICE) != 0);
-    aFormatHtmlCB.Check((nMailingMode & TXTFORMAT_HTML) != 0);
-    aFormatRtfCB.Check((nMailingMode & TXTFORMAT_RTF) != 0);
+    m_pFormatSwCB->Check((nMailingMode & TXTFORMAT_OFFICE) != 0);
+    m_pFormatHtmlCB->Check((nMailingMode & TXTFORMAT_HTML) != 0);
+    m_pFormatRtfCB->Check((nMailingMode & TXTFORMAT_RTF) != 0);
 
-    aAllRB.Check(true);
+    m_pAllRB->Check(true);
 
     // Install handlers
     Link aLk = LINK(this, SwMailMergeDlg, ButtonHdl);
-    aOkBTN.SetClickHdl(aLk);
+    m_pOkBTN->SetClickHdl(aLk);
 
-    aPathPB.SetClickHdl(LINK(this, SwMailMergeDlg, InsertPathHdl));
+    m_pPathPB->SetClickHdl(LINK(this, SwMailMergeDlg, InsertPathHdl));
 
     aLk = LINK(this, SwMailMergeDlg, OutputTypeHdl);
-    aPrinterRB.SetClickHdl(aLk);
-    aFileRB.SetClickHdl(aLk);
+    m_pPrinterRB->SetClickHdl(aLk);
+    m_pFileRB->SetClickHdl(aLk);
 
     //#i63267# printing might be disabled
     bool bIsPrintable = !Application::GetSettings().GetMiscSettings().GetDisablePrinting();
-    aPrinterRB.Enable(bIsPrintable);
-    OutputTypeHdl(bIsPrintable ? &aPrinterRB : &aFileRB);
+    m_pPrinterRB->Enable(bIsPrintable);
+    OutputTypeHdl(bIsPrintable ? m_pPrinterRB : m_pFileRB);
 
     aLk = LINK(this, SwMailMergeDlg, FilenameHdl);
-    aGenerateFromDataBaseCB.SetClickHdl( aLk );
+    m_pGenerateFromDataBaseCB->SetClickHdl( aLk );
     bool bColumn = pModOpt->IsNameFromColumn();
     if(bColumn)
-        aGenerateFromDataBaseCB.Check();
+        m_pGenerateFromDataBaseCB->Check();
 
-    FilenameHdl( &aGenerateFromDataBaseCB );
+    FilenameHdl( m_pGenerateFromDataBaseCB );
     aLk = LINK(this, SwMailMergeDlg, SaveTypeHdl);
-    aSaveSingleDocRB.Check( true );
-    aSaveSingleDocRB.SetClickHdl( aLk );
-    aSaveIndividualRB.SetClickHdl( aLk );
-    aLk.Call( &aSaveSingleDocRB );
+    m_pSaveSingleDocRB->Check( true );
+    m_pSaveSingleDocRB->SetClickHdl( aLk );
+    m_pSaveIndividualRB->SetClickHdl( aLk );
+    aLk.Call( m_pSaveSingleDocRB );
 
     aLk = LINK(this, SwMailMergeDlg, ModifyHdl);
-    aFromNF.SetModifyHdl(aLk);
-    aToNF.SetModifyHdl(aLk);
-    aFromNF.SetMax(SAL_MAX_INT32);
-    aToNF.SetMax(SAL_MAX_INT32);
+    m_pFromNF->SetModifyHdl(aLk);
+    m_pToNF->SetModifyHdl(aLk);
+    m_pFromNF->SetMax(SAL_MAX_INT32);
+    m_pToNF->SetMax(SAL_MAX_INT32);
 
     SwDBManager* pDBManager = rSh.GetDBManager();
     if(_xConnection.is())
-        pDBManager->GetColumnNames(&aAddressFldLB, _xConnection, rTblName);
+        pDBManager->GetColumnNames(m_pAddressFldLB, _xConnection, rTblName);
     else
-        pDBManager->GetColumnNames(&aAddressFldLB, rSourceName, rTblName);
-    for(sal_Int32 nEntry = 0; nEntry < aAddressFldLB.GetEntryCount(); ++nEntry)
-        aColumnLB.InsertEntry(aAddressFldLB.GetEntry(nEntry));
+        pDBManager->GetColumnNames(m_pAddressFldLB, rSourceName, rTblName);
+    for(sal_Int32 nEntry = 0; nEntry < m_pAddressFldLB->GetEntryCount(); ++nEntry)
+        m_pColumnLB->InsertEntry(m_pAddressFldLB->GetEntry(nEntry));
 
-    aAddressFldLB.SelectEntry("EMAIL");
+    m_pAddressFldLB->SelectEntry("EMAIL");
 
     OUString sPath(pModOpt->GetMailingPath());
     if(sPath.isEmpty())
@@ -367,30 +315,30 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
     }
     INetURLObject aURL(sPath);
     if(aURL.GetProtocol() == INET_PROT_FILE)
-        aPathED.SetText(aURL.PathToFileName());
+        m_pPathED->SetText(aURL.PathToFileName());
     else
-        aPathED.SetText(aURL.GetFull());
+        m_pPathED->SetText(aURL.GetFull());
 
     if (!bColumn )
     {
-        aColumnLB.SelectEntry("NAME");
+        m_pColumnLB->SelectEntry("NAME");
     }
     else
-        aColumnLB.SelectEntry(pModOpt->GetNameFromColumn());
+        m_pColumnLB->SelectEntry(pModOpt->GetNameFromColumn());
 
-    if (aAddressFldLB.GetSelectEntryCount() == 0)
-        aAddressFldLB.SelectEntryPos(0);
-    if (aColumnLB.GetSelectEntryCount() == 0)
-        aColumnLB.SelectEntryPos(0);
+    if (m_pAddressFldLB->GetSelectEntryCount() == 0)
+        m_pAddressFldLB->SelectEntryPos(0);
+    if (m_pColumnLB->GetSelectEntryCount() == 0)
+        m_pColumnLB->SelectEntryPos(0);
 
     const bool bEnable = m_aSelection.getLength() != 0;
-    aMarkedRB.Enable(bEnable);
+    m_pMarkedRB->Enable(bEnable);
     if (bEnable)
-        aMarkedRB.Check();
+        m_pMarkedRB->Check();
     else
     {
-        aAllRB.Check();
-        aMarkedRB.Enable(false);
+        m_pAllRB->Check();
+        m_pMarkedRB->Enable(false);
     }
     SetMinOutputSizePixel(m_aDialogSize);
     try
@@ -426,13 +374,13 @@ SwMailMergeDlg::SwMailMergeDlg(Window* pParent, SwWrtShell& rShell,
             }
             if( !sUIName2.isEmpty() )
             {
-                const sal_Int32 nFilter = aFilterLB.InsertEntry( sUIName2 );
+                const sal_Int32 nFilter = m_pFilterLB->InsertEntry( sUIName2 );
                 if( sFilter.equalsAscii("writer8") )
                     nODT = nFilter;
-                aFilterLB.SetEntryData( nFilter, new OUString( sFilter ) );
+                m_pFilterLB->SetEntryData( nFilter, new OUString( sFilter ) );
             }
         }
-        aFilterLB.SelectEntryPos( nODT );
+        m_pFilterLB->SelectEntryPos( nODT );
     }
     catch (const uno::Exception&)
     {
@@ -446,12 +394,10 @@ SwMailMergeDlg::~SwMailMergeDlg()
         m_xFrame->setComponent(NULL, NULL);
         m_xFrame->dispose();
     }
-    else
-        delete pBeamerWin;
 
-    for( sal_Int32 nFilter = 0; nFilter < aFilterLB.GetEntryCount(); ++nFilter )
+    for( sal_Int32 nFilter = 0; nFilter < m_pFilterLB->GetEntryCount(); ++nFilter )
     {
-        OUString* pData = reinterpret_cast< OUString* >( aFilterLB.GetEntryData(nFilter) );
+        OUString* pData = reinterpret_cast< OUString* >( m_pFilterLB->GetEntryData(nFilter) );
         delete pData;
     }
     delete pImpl;
@@ -461,107 +407,9 @@ void SwMailMergeDlg::Apply()
 {
 }
 
-static void lcl_MoveControlY( Window* ppW, long nDiffSize )
-{
-    Point aPos( ppW->GetPosPixel());
-    aPos.Y() += nDiffSize;
-    ppW->SetPosPixel( aPos );
-}
-
-static void lcl_MoveControlX( Window* ppW, long nDiffSize )
-{
-    Point aPos( ppW->GetPosPixel());
-    aPos.X() += nDiffSize;
-    ppW->SetPosPixel( aPos );
-}
-
-static void lcl_ChangeWidth( Window* ppW, long nDiffSize )
-{
-    Size aSize( ppW->GetSizePixel());
-    aSize.Width() += nDiffSize;
-    ppW->SetSizePixel( aSize );
-}
-
-void    SwMailMergeDlg::Resize()
-{
-    //the only controls that profit from the resize is pBeamerWin
-    // and aPathED, aFilenameED and aColumnLB
-
-    Size aCurSize( GetSizePixel() );
-    //find the difference
-    Size aDiffSize( aCurSize.Width() - m_aDialogSize.Width(),
-                            aCurSize.Height() - m_aDialogSize.Height() );
-    m_aDialogSize = aCurSize;
-    if( pBeamerWin->IsVisible() )
-    {
-        Window* aCntrlArr[] = {
-            &aAllRB       ,
-            &aMarkedRB    ,
-            &aFromRB      ,
-            &aFromNF      ,
-            &aBisFT       ,
-            &aToNF        ,
-            &aRecordFL    ,
-            &aPrinterRB   ,
-            &aMailingRB   ,
-            &aFileRB      ,
-            &aSingleJobsCB,
-            &aSaveMergedDocumentFL,
-            &aSaveSingleDocRB,
-            &aSaveIndividualRB,
-            &aGenerateFromDataBaseCB,
-            &aPathFT      ,
-            &aPathED      ,
-            &aPathPB      ,
-            &aColumnFT,
-            &aColumnLB    ,
-            &aFilterFT    ,
-            &aFilterLB    ,
-            &aAddressFldLB,
-            &aSubjectFT   ,
-            &aSubjectED   ,
-            &aFormatFT    ,
-            &aAttachFT    ,
-            &aAttachED    ,
-            &aAttachPB    ,
-            &aFormatHtmlCB,
-            &aFormatRtfCB ,
-            &aFormatSwCB  ,
-            &aDestFL      ,
-            &aSeparatorFL ,
-            &aBottomSeparatorFL,
-            &aOkBTN,
-            &aCancelBTN,
-            &aHelpBTN,
-            0};
-        for( Window** ppW = aCntrlArr; *ppW; ++ppW )
-        {
-            lcl_MoveControlY( *ppW, aDiffSize.Height() );
-        }
-        //some controls have to be extended horizontally
-        lcl_MoveControlX( &aOkBTN, aDiffSize.Width() );
-        lcl_MoveControlX( &aCancelBTN, aDiffSize.Width() );
-        lcl_MoveControlX( &aHelpBTN, aDiffSize.Width() );
-        lcl_MoveControlX( &aPathPB, aDiffSize.Width() );
-        lcl_MoveControlX( &aFileRB, aDiffSize.Width()/2 );
-
-        lcl_ChangeWidth( &aBottomSeparatorFL, aDiffSize.Width() );
-        lcl_ChangeWidth( &aSaveMergedDocumentFL, aDiffSize.Width() );
-        lcl_ChangeWidth( &aColumnLB, aDiffSize.Width() );
-        lcl_ChangeWidth( &aPathED, aDiffSize.Width() );
-        lcl_ChangeWidth( &aFilterLB, aDiffSize.Width() );
-        lcl_ChangeWidth( &aDestFL, aDiffSize.Width() );
-
-        Size aBeamerSize( pBeamerWin->GetSizePixel() ) ;
-        aBeamerSize.Width() += aDiffSize.Width();
-        aBeamerSize.Height() += aDiffSize.Height();
-        pBeamerWin->SetSizePixel(aBeamerSize);
-    }
-}
-
 IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn )
 {
-    if (pBtn == &aOkBTN)
+    if (pBtn == m_pOkBTN)
     {
         if( ExecQryShell() )
             EndDialog(RET_OK);
@@ -571,27 +419,27 @@ IMPL_LINK( SwMailMergeDlg, ButtonHdl, Button *, pBtn )
 
 IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn )
 {
-    bool bPrint = pBtn == &aPrinterRB;
-    aSingleJobsCB.Enable(bPrint);
+    bool bPrint = pBtn == m_pPrinterRB;
+    m_pSingleJobsCB->Enable(bPrint);
 
-    aSaveMergedDocumentFL.Enable( !bPrint );
-    aSaveSingleDocRB.Enable( !bPrint );
-    aSaveIndividualRB.Enable( !bPrint );
+    m_pSaveMergedDocumentFT->Enable( !bPrint );
+    m_pSaveSingleDocRB->Enable( !bPrint );
+    m_pSaveIndividualRB->Enable( !bPrint );
 
     if( !bPrint )
     {
-        SaveTypeHdl( aSaveSingleDocRB.IsChecked() ? &aSaveSingleDocRB : &aSaveIndividualRB );
+        SaveTypeHdl( m_pSaveSingleDocRB->IsChecked() ? m_pSaveSingleDocRB : m_pSaveIndividualRB );
     }
     else
     {
-        aPathFT.Enable(false);
-        aPathED.Enable(false);
-        aPathPB.Enable(false);
-        aColumnFT.Enable(false);
-        aColumnLB.Enable(false);
-        aFilterFT.Enable(false);
-        aFilterLB.Enable(false);
-        aGenerateFromDataBaseCB.Enable(false);
+        m_pPathFT->Enable(false);
+        m_pPathED->Enable(false);
+        m_pPathPB->Enable(false);
+        m_pColumnFT->Enable(false);
+        m_pColumnLB->Enable(false);
+        m_pFilterFT->Enable(false);
+        m_pFilterLB->Enable(false);
+        m_pGenerateFromDataBaseCB->Enable(false);
     }
 
     return 0;
@@ -599,22 +447,22 @@ IMPL_LINK( SwMailMergeDlg, OutputTypeHdl, RadioButton *, pBtn )
 
 IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*,  pBtn )
 {
-    bool bIndividual = pBtn == &aSaveIndividualRB;
+    bool bIndividual = pBtn == m_pSaveIndividualRB;
 
-    aGenerateFromDataBaseCB.Enable( bIndividual );
+    m_pGenerateFromDataBaseCB->Enable( bIndividual );
     if( bIndividual )
     {
-        FilenameHdl( &aGenerateFromDataBaseCB );
+        FilenameHdl( m_pGenerateFromDataBaseCB );
     }
     else
     {
-        aColumnFT.Enable(false);
-        aColumnLB.Enable(false);
-        aPathFT.Enable( false );
-        aPathED.Enable( false );
-        aPathPB.Enable( false );
-        aFilterFT.Enable( false );
-        aFilterLB.Enable( false );
+        m_pColumnFT->Enable(false);
+        m_pColumnLB->Enable(false);
+        m_pPathFT->Enable( false );
+        m_pPathED->Enable( false );
+        m_pPathPB->Enable( false );
+        m_pFilterFT->Enable( false );
+        m_pFilterLB->Enable( false );
     }
     return 0;
 }
@@ -622,19 +470,19 @@ IMPL_LINK( SwMailMergeDlg, SaveTypeHdl, RadioButton*,  pBtn )
 IMPL_LINK( SwMailMergeDlg, FilenameHdl, CheckBox*, pBox )
 {
     bool bEnable = pBox->IsChecked();
-    aColumnFT.Enable( bEnable );
-    aColumnLB.Enable(bEnable);
-    aPathFT.Enable( bEnable );
-    aPathED.Enable(bEnable);
-    aPathPB.Enable( bEnable );
-    aFilterFT.Enable( bEnable );
-    aFilterLB.Enable( bEnable );
+    m_pColumnFT->Enable( bEnable );
+    m_pColumnLB->Enable(bEnable);
+    m_pPathFT->Enable( bEnable );
+    m_pPathED->Enable(bEnable);
+    m_pPathPB->Enable( bEnable );
+    m_pFilterFT->Enable( bEnable );
+    m_pFilterLB->Enable( bEnable );
  return 0;
 }
 
 IMPL_LINK_NOARG(SwMailMergeDlg, ModifyHdl)
 {
-    aFromRB.Check();
+    m_pFromRB->Check();
     return (0);
 }
 
@@ -646,11 +494,11 @@ bool SwMailMergeDlg::ExecQryShell()
     }
     SwDBManager* pMgr = rSh.GetDBManager();
 
-    if (aPrinterRB.IsChecked())
+    if (m_pPrinterRB->IsChecked())
         nMergeType = DBMGR_MERGE_MAILMERGE;
     else
     {
-        nMergeType = static_cast< sal_uInt16 >( aSaveSingleDocRB.IsChecked() ?
+        nMergeType = static_cast< sal_uInt16 >( m_pSaveSingleDocRB->IsChecked() ?
                     DBMGR_MERGE_SINGLE_FILE : DBMGR_MERGE_MAILFILES );
         SfxMedium* pMedium = rSh.GetView().GetDocShell()->GetMedium();
         INetURLObject aAbs;
@@ -658,20 +506,20 @@ bool SwMailMergeDlg::ExecQryShell()
             aAbs = pMedium->GetURLObject();
         OUString sPath(
             URIHelper::SmartRel2Abs(
-                aAbs, aPathED.GetText(), URIHelper::GetMaybeFileHdl()));
+                aAbs, m_pPathED->GetText(), URIHelper::GetMaybeFileHdl()));
         pModOpt->SetMailingPath(sPath);
 
         if (!sPath.endsWith("/"))
             sPath += "/";
 
-        pModOpt->SetIsNameFromColumn(aGenerateFromDataBaseCB.IsChecked());
+        pModOpt->SetIsNameFromColumn(m_pGenerateFromDataBaseCB->IsChecked());
 
-        if (aGenerateFromDataBaseCB.IsEnabled() && aGenerateFromDataBaseCB.IsChecked())
+        if (m_pGenerateFromDataBaseCB->IsEnabled() && m_pGenerateFromDataBaseCB->IsChecked())
         {
-            pMgr->SetEMailColumn(aColumnLB.GetSelectEntry());
-            pModOpt->SetNameFromColumn(aColumnLB.GetSelectEntry());
-            if( aFilterLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
-                m_sSaveFilter = *static_cast<const OUString*>(aFilterLB.GetEntryData( aFilterLB.GetSelectEntryPos() ));
+            pMgr->SetEMailColumn(m_pColumnLB->GetSelectEntry());
+            pModOpt->SetNameFromColumn(m_pColumnLB->GetSelectEntry());
+            if( m_pFilterLB->GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND)
+                m_sSaveFilter = *static_cast<const OUString*>(m_pFilterLB->GetEntryData( m_pFilterLB->GetSelectEntryPos() ));
         }
         else
         {
@@ -688,11 +536,11 @@ bool SwMailMergeDlg::ExecQryShell()
         pMgr->SetSubject(sPath);
     }
 
-    if (aFromRB.IsChecked())    // Insert list
+    if (m_pFromRB->IsChecked())    // Insert list
     {
         // Safe: the maximal value of the fields is limited
-        sal_Int32 nStart = sal::static_int_cast<sal_Int32>(aFromNF.GetValue());
-        sal_Int32 nEnd = sal::static_int_cast<sal_Int32>(aToNF.GetValue());
+        sal_Int32 nStart = sal::static_int_cast<sal_Int32>(m_pFromNF->GetValue());
+        sal_Int32 nEnd = sal::static_int_cast<sal_Int32>(m_pToNF->GetValue());
 
         if (nEnd < nStart)
             std::swap(nEnd, nStart);
@@ -702,7 +550,7 @@ bool SwMailMergeDlg::ExecQryShell()
         for (sal_Int32 i = nStart; i <= nEnd; ++i, ++pSelection)
             *pSelection <<= i;
     }
-    else if (aAllRB.IsChecked() )
+    else if (m_pAllRB->IsChecked() )
         m_aSelection.realloc(0);    // Empty selection = insert all
     else
     {
@@ -726,18 +574,18 @@ bool SwMailMergeDlg::ExecQryShell()
     }
     IDocumentDeviceAccess* pIDDA = rSh.getIDocumentDeviceAccess();
     SwPrintData aPrtData( pIDDA->getPrintData() );
-    aPrtData.SetPrintSingleJobs(aSingleJobsCB.IsChecked());
+    aPrtData.SetPrintSingleJobs(m_pSingleJobsCB->IsChecked());
     pIDDA->setPrintData(aPrtData);
 
-    pModOpt->SetSinglePrintJob(aSingleJobsCB.IsChecked());
+    pModOpt->SetSinglePrintJob(m_pSingleJobsCB->IsChecked());
 
     sal_uInt8 nMailingMode = 0;
 
-    if (aFormatSwCB.IsChecked())
+    if (m_pFormatSwCB->IsChecked())
         nMailingMode |= TXTFORMAT_OFFICE;
-    if (aFormatHtmlCB.IsChecked())
+    if (m_pFormatHtmlCB->IsChecked())
         nMailingMode |= TXTFORMAT_HTML;
-    if (aFormatRtfCB.IsChecked())
+    if (m_pFormatRtfCB->IsChecked())
         nMailingMode |= TXTFORMAT_RTF;
     pModOpt->SetMailingFormats(nMailingMode);
     return true;
@@ -745,7 +593,7 @@ bool SwMailMergeDlg::ExecQryShell()
 
 IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl)
 {
-    OUString sPath( aPathED.GetText() );
+    OUString sPath( m_pPathED->GetText() );
     if( sPath.isEmpty() )
     {
         SvtPathOptions aPathOpt;
@@ -759,9 +607,9 @@ IMPL_LINK_NOARG(SwMailMergeDlg, InsertPathHdl)
     {
         INetURLObject aURL(xFP->getDirectory());
         if(aURL.GetProtocol() == INET_PROT_FILE)
-            aPathED.SetText(aURL.PathToFileName());
+            m_pPathED->SetText(aURL.PathToFileName());
         else
-            aPathED.SetText(aURL.GetFull());
+            m_pPathED->SetText(aURL.GetFull());
     }
     return 0;
 }
diff --git a/sw/source/ui/envelp/mailmrge.hrc b/sw/source/ui/envelp/mailmrge.hrc
deleted file mode 100644
index a18506c..0000000
--- a/sw/source/ui/envelp/mailmrge.hrc
+++ /dev/null
@@ -1,74 +0,0 @@
-/* -*- 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: */
diff --git a/sw/source/ui/envelp/mailmrge.src b/sw/source/ui/envelp/mailmrge.src
deleted file mode 100644
index bd56557..0000000
--- a/sw/source/ui/envelp/mailmrge.src
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- 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 .
- */
-
-#include "mailmrge.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-
-#define _MAIL_MERGE_STRING_ \
-    Text [ en-US ] = "Mail Merge" ; \
-
-ModalDialog DLG_MAILMERGE
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 312 , 264 ) ;
-    _MAIL_MERGE_STRING_
-    Moveable = TRUE ;
-    Sizeable = TRUE;
-    HelpID = CMD_FN_QRY_MERGE ;
-    Window WIN_BEAMER
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 300 , 80 ) ;
-    };
-    RadioButton RB_ALL
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_ALL";
-        Pos = MAP_APPFONT ( 12 , 97 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~All" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_MARKED
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MARKED";
-        Pos = MAP_APPFONT ( 12 , 110 ) ;
-        Size = MAP_APPFONT ( 100 , 10 ) ;
-        Text [ en-US ] = "~Selected records" ;
-        TabStop = TRUE ;
-    };
-    RadioButton RB_FROM
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FROM";
-        Pos = MAP_APPFONT ( 12 , 123 ) ;
-        Size = MAP_APPFONT ( 33 , 10 ) ;
-        Text [ en-US ] = "~From:" ;
-        TabStop = TRUE ;
-    };
-    NumericField NF_FROM
-    {
-        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_FROM";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 48 , 122 ) ;
-        Size = MAP_APPFONT ( 24 , 12 ) ;
-        TabStop = TRUE ;
-        StrictFormat = TRUE ;
-        Minimum = 1 ;
-        Maximum = 999999 ;
-    };
-    FixedText FT_BIS
-    {
-        Pos = MAP_APPFONT ( 75 , 123 ) ;
-        Size = MAP_APPFONT ( 27 , 10 ) ;
-        Text [ en-US ] = "~To:" ;
-        Center = TRUE ;
-    };
-    NumericField NF_TO
-    {
-        HelpID = "sw:NumericField:DLG_MAILMERGE:NF_TO";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 105 , 122 ) ;
-        Size = MAP_APPFONT ( 24 , 12 ) ;
-        TabStop = TRUE ;
-        StrictFormat = TRUE ;
-        Minimum = 1 ;
-        Maximum = 999999 ;
-    };
-    FixedLine FL_RECORD
-    {
-        Pos = MAP_APPFONT ( 6 , 86 ) ;
-        Size = MAP_APPFONT ( 126 , 8 ) ;
-        Text [ en-US ] = "Records" ;
-    };
-    RadioButton RB_PRINTER
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_PRINTER";
-        Pos = MAP_APPFONT ( 144 , 97 ) ;
-        Size = MAP_APPFONT ( 53 , 10 ) ;
-        Check = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Printer" ;
-    };
-    RadioButton RB_MAILING
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_MAILING";
-        Pos = MAP_APPFONT ( 200 , 97 ) ;
-        Size = MAP_APPFONT ( 53 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Electronic" ;
-    };
-    RadioButton RB_FILE
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_FILE";
-        Pos = MAP_APPFONT ( 256 , 97 ) ;
-        Size = MAP_APPFONT ( 56 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "File" ;
-    };
-    CheckBox CB_SINGLE_JOBS
-    {
-        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_SINGLE_JOBS";
-        Pos = MAP_APPFONT ( 150 , 112 ) ;
-        Size = MAP_APPFONT ( 142 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "~Single print jobs" ;
-    };
-    FixedLine FL_SAVE_MERGED_DOCUMENT
-    {
-        Pos = MAP_APPFONT (  144, 128 ) ;
-        Size = MAP_APPFONT ( 156 , 8 ) ;
-        Text [ en-US ] = "Save merged document" ;
-    };
-    RadioButton RB_SAVE_SINGLE_DOC
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_SINGLE_DOC";
-        Pos = MAP_APPFONT (  150, 139 ) ;
-        Size = MAP_APPFONT ( 150 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "S~ave as single document";
-    };
-    RadioButton RB_SAVE_INDIVIDUAL
-    {
-        HelpID = "sw:RadioButton:DLG_MAILMERGE:RB_SAVE_INDIVIDUAL";
-        Pos = MAP_APPFONT (  150, 152 ) ;
-        Size = MAP_APPFONT ( 150 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Sa~ve as individual documents";
-    };
-    CheckBox RB_GENERATE_FROM_DATABASE
-    {
-        HelpID = "sw:CheckBox:DLG_MAILMERGE:RB_GENERATE_FROM_DATABASE";
-        Pos = MAP_APPFONT (  156, 168 ) ;
-        Size = MAP_APPFONT ( 144 , 10 ) ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Generate file name from ~Database";
-    };
-    FixedText FT_COLUMN
-    {
-        Pos = MAP_APPFONT ( 162 , 184 ) ;
-        Size = MAP_APPFONT ( 41 , 10 ) ;
-        Text [ en-US ] = "Field" ;
-    };
-    ListBox LB_COLUMN
-    {
-        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_COLUMN";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 205 , 182 ) ;
-        Size = MAP_APPFONT ( 103 , 84 ) ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_PATH
-    {
-        Pos = MAP_APPFONT ( 162 , 200 ) ;
-        Size = MAP_APPFONT ( 41 , 10 ) ;
-        Text [ en-US ] = "~Path" ;
-    };
-    Edit ED_PATH
-    {
-        HelpID = "sw:Edit:DLG_MAILMERGE:ED_PATH";
-        Pos = MAP_APPFONT ( 205 , 198 ) ;
-        Size = MAP_APPFONT ( 86 , 12 ) ;
-        Border = TRUE ;
-        TabStop = TRUE ;
-    };
-    PushButton PB_PATH
-    {
-        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_PATH";
-        Pos = MAP_APPFONT ( 294 , 198 ) ;
-        Size = MAP_APPFONT ( 14 , 12 ) ;
-         // Soll Groesse des Edits haben (12)!
-        Text = "~..." ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_FILTER
-    {
-        Pos = MAP_APPFONT ( 162 , 216 ) ;
-        Size = MAP_APPFONT ( 41 , 8 ) ;
-        Text [ en-US ] = "F~ile format" ;
-    };
-    ListBox LB_FILTER
-    {
-        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_FILTER";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 205 , 214 ) ;
-        Size = MAP_APPFONT ( 103 , 84 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    ListBox LB_ADDRESSFLD
-    {
-        HelpID = "sw:ListBox:DLG_MAILMERGE:LB_ADDRESSFLD";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 220 , 110 ) ;
-        Size = MAP_APPFONT ( 74 , 84 ) ;
-        Disable = TRUE ;
-        Hide = TRUE ;
-        TabStop = TRUE ;
-        DropDown = TRUE ;
-    };
-    FixedText FT_SUBJECT
-    {
-        Pos = MAP_APPFONT ( 144 , 125 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        Disable = TRUE ;
-        Text [ en-US ] = "~Subject" ;
-    };
-    Edit ED_SUBJECT
-    {
-        HelpID = "sw:Edit:DLG_MAILMERGE:ED_SUBJECT";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 220 , 127 ) ;
-        Size = MAP_APPFONT ( 88 , 12 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-    };
-    FixedText FT_ATTACH
-    {
-        Pos = MAP_APPFONT ( 144 , 140 ) ;
-        Size = MAP_APPFONT ( 51 , 10 ) ;
-        Disable = TRUE ;
-        Text [ en-US ] = "Attachments" ;
-    };
-    Edit ED_ATTACH
-    {
-        HelpID = "sw:Edit:DLG_MAILMERGE:ED_ATTACH";
-        Border = TRUE ;
-        Pos = MAP_APPFONT ( 220 , 140 ) ;
-        Size = MAP_APPFONT ( 72 , 12 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-        ReadOnly = TRUE ;
-    };
-    PushButton PB_ATTACH
-    {
-        HelpID = "sw:PushButton:DLG_MAILMERGE:PB_ATTACH";
-        Pos = MAP_APPFONT ( 294 , 140 ) ;
-        Size = MAP_APPFONT ( 14 , 12 ) ;
-         // Soll Groesse des Edits haben (12)!
-        Text = "~..." ;
-        TabStop = TRUE ;
-        Disable = TRUE ;
-    };
-    FixedText FT_FORMAT
-    {
-        Pos = MAP_APPFONT ( 144 , 157 ) ;
-        Size = MAP_APPFONT ( 51 , 8 ) ;
-        Disable = TRUE ;
-        Text [ en-US ] = "Mail Format" ;
-    };
-    CheckBox CB_FORMAT_HTML
-    {
-        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_HTML";
-        Pos = MAP_APPFONT ( 220 , 156 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "HTM~L" ;
-    };
-    CheckBox CB_FORMAT_RTF
-    {
-        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_RTF";
-        Pos = MAP_APPFONT ( 220 , 169 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "RT~F" ;
-    };
-    CheckBox CB_FORMAT_SW
-    {
-        HelpID = "sw:CheckBox:DLG_MAILMERGE:CB_FORMAT_SW";
-        Pos = MAP_APPFONT ( 220, 182 ) ;
-        Size = MAP_APPFONT ( 90 , 10 ) ;
-        Disable = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "%PRODUCTNAME Writer" ;
-    };
-    FixedLine FL_SEPARATOR
-    {
-        Pos = MAP_APPFONT ( 133 , 93 ) ;
-        Size = MAP_APPFONT ( 4 , 136 ) ;
-        Vert = TRUE;
-    };
-    FixedLine FL_DEST
-    {
-        Pos = MAP_APPFONT ( 138 , 86 ) ;
-        Size = MAP_APPFONT ( 162 , 8 ) ;
-        Text [ en-US ] = "Output" ;
-    };
-    FixedLine FL_BOTTOM_SEPARATOR
-    {
-        Pos = MAP_APPFONT (  0, 232 ) ;
-        Size = MAP_APPFONT ( 312 , 8 ) ;
-    };
-    OKButton BTN_OK
-    {
-        Pos = MAP_APPFONT ( 147 , 244 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        DefButton = TRUE ;
-    };
-    CancelButton BTN_CANCEL
-    {
-        Pos = MAP_APPFONT ( 200 , 244 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-    HelpButton BTN_HELP
-    {
-        Pos = MAP_APPFONT ( 256 , 244 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/inc/mailmrge.hxx b/sw/source/uibase/inc/mailmrge.hxx
index 29ee649..7262893 100644
--- a/sw/source/uibase/inc/mailmrge.hxx
+++ b/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; }
diff --git a/sw/uiconfig/swriter/ui/mailmerge.ui b/sw/uiconfig/swriter/ui/mailmerge.ui
new file mode 100644
index 0000000..40964d4
--- /dev/null
+++ b/sw/uiconfig/swriter/ui/mailmerge.ui
@@ -0,0 +1,837 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <!-- interface-requires gtk+ 3.0 -->
+  <object class="GtkAdjustment" id="adjustment1">
+    <property name="lower">1</property>
+    <property name="step_increment">1</property>
+  </object>
+  <object class="GtkDialog" id="MailmergeDialog">
+    <property name="can_focus">False</property>
+    <property name="border_width">5</property>
+    <property name="title" translatable="yes">Mail Merge</property>
+    <property name="type_hint">dialog</property>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="orientation">vertical</property>
+        <property name="spacing">2</property>
+        <child internal-child="action_area">
+          <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="ok">
+                <property name="label">gtk-ok</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="cancel">
+                <property name="label">gtk-cancel</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="help">
+                <property name="label">gtk-help</property>
+                <property name="use_action_appearance">False</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">2</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="pack_type">end</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="box1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="hexpand">True</property>
+            <property name="vexpand">True</property>
+            <property name="orientation">vertical</property>
+            <property name="spacing">6</property>
+            <child>
+              <object class="GtkDrawingArea" id="beamer">
+                <property name="height_request">150</property>
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkBox" id="box2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="hexpand">True</property>
+                <property name="vexpand">True</property>
+                <property name="spacing">6</property>
+                <child>
+                  <object class="GtkFrame" id="frame1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkBox" id="box3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="valign">start</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkRadioButton" id="all">
+                                <property name="label" translatable="yes">_All</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="active">True</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkRadioButton" id="selected">
+                                <property name="label" translatable="yes">_Selected records</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                                <property name="group">all</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkBox" id="box4">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="rbfrom">
+                                    <property name="label" translatable="yes">_From:</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">all</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="from">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="numeric">True</property>
+                                    <property name="adjustment">adjustment1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkLabel" id="label3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="label" translatable="yes">_To:</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="mnemonic_widget">to</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkSpinButton" id="to">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="invisible_char">•</property>
+                                    <property name="numeric">True</property>
+                                    <property name="adjustment">adjustment1</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">3</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">2</property>
+                              </packing>
+                            </child>
+                          </object>
+                        </child>
+                      </object>
+                    </child>
+                    <child type="label">
+                      <object class="GtkLabel" id="recordslabel">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="label" translatable="yes">Records</property>
+                        <attributes>
+                          <attribute name="weight" value="bold"/>
+                        </attributes>
+                      </object>
+                    </child>
+                  </object>
+                  <packing>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkFrame" id="frame2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
+                    <property name="label_xalign">0</property>
+                    <property name="shadow_type">none</property>
+                    <child>
+                      <object class="GtkAlignment" id="alignment2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="top_padding">6</property>
+                        <property name="left_padding">12</property>
+                        <child>
+                          <object class="GtkBox" id="box5">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="orientation">vertical</property>
+                            <property name="spacing">6</property>
+                            <child>
+                              <object class="GtkBox" id="box6">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">6</property>
+                                <child>
+                                  <object class="GtkRadioButton" id="printer">
+                                    <property name="label" translatable="yes">_Printer</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="active">True</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="electronic">
+                                    <property name="label" translatable="yes">_Electronic</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="use_underline">True</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">printer</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkRadioButton" id="file">
+                                    <property name="label" translatable="yes">File</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="xalign">0</property>
+                                    <property name="draw_indicator">True</property>
+                                    <property name="group">printer</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkCheckButton" id="singlejobs">
+                                <property name="label" translatable="yes">_Single print jobs</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="visible">True</property>
+                                <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
+                                <property name="use_action_appearance">False</property>
+                                <property name="use_underline">True</property>
+                                <property name="xalign">0</property>
+                                <property name="draw_indicator">True</property>
+                              </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">1</property>
+                              </packing>
+                            </child>
+                            <child>
+                              <object class="GtkFrame" id="frame3">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="hexpand">True</property>
+                                <property name="vexpand">True</property>
+                                <property name="label_xalign">0</property>
+                                <property name="shadow_type">none</property>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment3">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="top_padding">6</property>
+                                    <property name="left_padding">12</property>
+                                    <child>
+                                      <object class="GtkFrame" id="frame4">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label_xalign">0</property>
+                                        <property name="shadow_type">none</property>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment4">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="top_padding">6</property>
+                                            <property name="left_padding">12</property>
+                                            <child>
+                                              <object class="GtkGrid" id="grid1">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <property name="row_spacing">6</property>
+                                                <property name="column_spacing">6</property>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="generate">
+                                                    <property name="label" translatable="yes">Generate file name from _Database</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">0</property>
+                                                    <property name="width">3</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="fieldlabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Field</property>
+                                                  </object>
+                                                  <property name="mnemonic_widget">field</property>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="pathlabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">_Path</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">path</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="fileformatlabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">F_ile format</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">fileformat</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="field">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">1</property>
+                                                    <property name="width">2</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="fileformat">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">3</property>
+                                                    <property name="width">2</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkButton" id="pathpb">
+                                                    <property name="label">_...</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">True</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="use_underline">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">2</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="path">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">•</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">2</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="subjectlabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">_Subject</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="mnemonic_widget">subject</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">5</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="subject">
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">•</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">5</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="attachmentslabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Attachments</property>
+                                                    <property name="mnemonic_widget">attachments</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">6</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="attachments">
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">•</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">6</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkButton" id="attach">
+                                                    <property name="label">_...</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">True</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="use_underline">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">2</property>
+                                                    <property name="top_attach">6</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="mailformatlabel">
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="halign">start</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Mail Format</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">0</property>
+                                                    <property name="top_attach">7</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="html">
+                                                    <property name="label" translatable="yes">HTM_L</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">8</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="rtf">
+                                                    <property name="label" translatable="yes">RT_F</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="use_underline">True</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">9</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkCheckButton" id="swriter">
+                                                    <property name="label" translatable="yes">%PRODUCTNAME Writer</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="visible">True</property>
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="receives_default">False</property>
+                                                    <property name="use_action_appearance">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="draw_indicator">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">10</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <placeholder/>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkComboBox" id="address">
+                                                    <property name="sensitive">False</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="hexpand">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="left_attach">1</property>
+                                                    <property name="top_attach">4</property>
+                                                    <property name="width">1</property>
+                                                    <property name="height">1</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                        </child>
+                                        <child type="label">
+                                          <object class="GtkBox" id="box7">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="orientation">vertical</property>
+                                            <property name="spacing">6</property>
+                                            <child>
+                                              <object class="GtkRadioButton" id="singledocument">
+                                                <property name="label" translatable="yes">S_ave as single document</property>
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="active">True</property>
+                                                <property name="draw_indicator">True</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">0</property>
+                                              </packing>
+                                            </child>
+                                            <child>
+                                              <object class="GtkRadioButton" id="idividualdocuments">
+                                                <property name="label" translatable="yes">Sa_ve as individual documents</property>
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">True</property>
+                                                <property name="receives_default">False</property>
+                                                <property name="use_action_appearance">False</property>
+                                                <property name="use_underline">True</property>
+                                                <property name="xalign">0</property>
+                                                <property name="draw_indicator">True</property>
+                                                <property name="group">singledocument</property>
+                                              </object>
+                                              <packing>
+                                                <property name="expand">False</property>
+                                                <property name="fill">True</property>
+                                                <property name="position">1</property>

... etc. - the rest is truncated


More information about the Libreoffice-commits mailing list