convert DLG_MAILMERGECHILD floating window to .ui

Change-Id: I0ab16d3f5d86004b63f9a1baa454b18b7948f86a

3 files changed, 7 insertions, 95 deletions

diff --git a/sw/source/uibase/dbui/mailmergechildwindow.cxx b/sw/source/uibase/dbui/mailmergechildwindow.cxx
index 133472009159..f52bf6298d21 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.cxx
+++ b/sw/source/uibase/dbui/mailmergechildwindow.cxx
@@ -30,7 +30,6 @@
 #include <svtools/svmedit.hxx>
 #include <vcl/msgbox.hxx>
 #include <vcl/image.hxx>
-#include <mailmergechildwindow.hrc>
 #include <dbui.hrc>
 #include <helpid.h>
 
@@ -64,28 +63,14 @@ SwMailMergeChildWindow::SwMailMergeChildWindow( Window* _pParent,
     pWindow->Show();
 }
 
-SwMailMergeChildWin::SwMailMergeChildWin( SfxBindings* _pBindings,
-                            SfxChildWindow* pChild,
-                            Window *pParent) :
-    SfxFloatingWindow(_pBindings, pChild, pParent, SW_RES(DLG_MAILMERGECHILD)),
-    m_aBackTB(this, SW_RES( TB_BACK ))
-{
-    m_aBackTB.SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
-    sal_uInt16 nIResId = ILIST_TBX;
-    ResId aResId( nIResId, *pSwResMgr );
-    ImageList aIList(aResId);
-    FreeResource();
-
-    m_aBackTB.SetItemImage( 1, aIList.GetImage(FN_SHOW_ROOT) );
-    m_aBackTB.SetButtonType( BUTTON_SYMBOLTEXT );
-    Size aSz = m_aBackTB.CalcWindowSizePixel(1);
-    m_aBackTB.SetPosSizePixel( Point(), aSz );
-    SetOutputSizePixel(aSz);
-    m_aBackTB.Show();
-}
-
-SwMailMergeChildWin::~SwMailMergeChildWin()
+SwMailMergeChildWin::SwMailMergeChildWin(SfxBindings* _pBindings,
+    SfxChildWindow* pChild, Window *pParent)
+    : SfxFloatingWindow(_pBindings, pChild, pParent, "FloatingMMChild",
+                        "modules/swriter/ui/floatingmmchild.ui")
 {
+    get(m_pBackTB, "back");
+    m_pBackTB->SetSelectHdl(LINK(this, SwMailMergeChildWin, BackHdl));
+    m_pBackTB->SetButtonType( BUTTON_SYMBOLTEXT );
 }
 
 IMPL_LINK_NOARG(SwMailMergeChildWin, BackHdl)
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.hrc b/sw/source/uibase/dbui/mailmergechildwindow.hrc
deleted file mode 100644
index 84fe1759b50f..000000000000
--- a/sw/source/uibase/dbui/mailmergechildwindow.hrc
+++ /dev/null
@@ -1,23 +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 .
- */
-
-#define TB_BACK                     1
-#define ILIST_TBX                   90
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dbui/mailmergechildwindow.src b/sw/source/uibase/dbui/mailmergechildwindow.src
index c2572e18e778..68b37f0f0388 100644
--- a/sw/source/uibase/dbui/mailmergechildwindow.src
+++ b/sw/source/uibase/dbui/mailmergechildwindow.src
@@ -16,60 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "mailmergechildwindow.hrc"
 #include "dbui.hrc"
 #include "helpid.h"
 #include <cmdid.h>
 
-#define WIDTH  100
-#define HEIGHT 16
-
-#define WORKAROUND \
-    Text [ en-US ] = "Return to Mail Merge Wizard" ; \
-
-FloatingWindow DLG_MAILMERGECHILD\
-{
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( WIDTH , HEIGHT ) ;
-    Moveable = TRUE ;
-    Closeable = FALSE ;
-    Sizeable = FALSE ;
-    Zoomable = TRUE ;
-    HelpID = HID_MAILMERGECHILD ;
-    Hide = TRUE ;
-    Text [ en-US ] = "Mail Merge Wizard";\
-    ToolBox TB_BACK\
-    {
-        MenuStrings = TRUE ;
-        SVLook = TRUE ;
-        ItemList =
-        {
-            ToolBoxItem\
-            {
-                Identifier = 1;
-                HelpID = HID_RETURN_TO_MAILMERGE ;
-                Left = TRUE;
-                WORKAROUND
-            };
-        };
-    };
-    #define IMGLIST1_IDS\
-        IdList = \
-        { \
-            FN_SHOW_ROOT; \
-        }; \
-        IdCount = 1
-
-    ImageList ILIST_TBX
-    {
-        Prefix = "sc";
-        MaskColor = IMAGE_MASK_COLOR;
-        IMGLIST1_IDS;
-    };
-};
-
-
 String ST_SEND
 {
     Text[ en-US ] = "Sending e-mails...";