convert merge table dialog to .ui

Change-Id: I59ff70e3280d4e746b0d20f7f9532a341d88cb57

3 files changed, 5 insertions, 117 deletions

diff --git a/sw/source/ui/table/mergetbl.cxx b/sw/source/ui/table/mergetbl.cxx
index 16114295b5cf..bafb3fc14134 100644
--- a/sw/source/ui/table/mergetbl.cxx
+++ b/sw/source/ui/table/mergetbl.cxx
@@ -19,29 +19,18 @@
 
 #include <swtypes.hxx>
 #include <mergetbl.hxx>
-#include <mergetbl.hrc>
-#include <table.hrc>
-
 
 SwMergeTblDlg::SwMergeTblDlg( Window *pParent, sal_Bool& rWithPrev )
-    : SvxStandardDialog(pParent, SW_RES(DLG_MERGE_TABLE)),
-    aOKPB(                  this, SW_RES(PB_OK      )),
-    aCancelPB(              this, SW_RES(PB_CANCEL  )),
-    aHelpPB(                this, SW_RES(PB_HELP        )),
-    aMergeFL(               this, SW_RES(FL_MERGE    )),
-    aMergePrevRB(           this, SW_RES(RB_MERGE_PREV)),
-    aMergeNextRB(           this, SW_RES(RB_MERGE_NEXT)),
-    rMergePrev(             rWithPrev )
+    : SvxStandardDialog(pParent, "MergeTableDialog", "modules/swriter/ui/mergetabledialog.ui")
+    , m_rMergePrev(rWithPrev)
 {
-    FreeResource();
-    aMergePrevRB.Check();
+    get(m_pMergePrevRB, "prev");
+    m_pMergePrevRB->Check();
 }
 
 void SwMergeTblDlg::Apply()
 {
-    rMergePrev = aMergePrevRB.IsChecked();
+    m_rMergePrev = m_pMergePrevRB->IsChecked();
 }
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/mergetbl.hrc b/sw/source/ui/table/mergetbl.hrc
deleted file mode 100644
index 97e81b7ff274..000000000000
--- a/sw/source/ui/table/mergetbl.hrc
+++ /dev/null
@@ -1,26 +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 PB_OK           1
-#define PB_CANCEL       2
-#define PB_HELP         3
-#define FL_MERGE            4
-#define RB_MERGE_PREV   5
-#define RB_MERGE_NEXT   6
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/table/mergetbl.src b/sw/source/ui/table/mergetbl.src
deleted file mode 100644
index 3593f9e5c8e4..000000000000
--- a/sw/source/ui/table/mergetbl.src
+++ /dev/null
@@ -1,75 +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 "table.hrc"
-#include "mergetbl.hrc"
-#include "cmdid.h"
-#include "helpid.h"
-ModalDialog DLG_MERGE_TABLE
-{
-    HelpID = CMD_FN_TABLE_MERGE_TABLE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 207 , 57 ) ;
-    Moveable = TRUE ;
-    OKButton PB_OK
-    {
-        Pos = MAP_APPFONT ( 151 , 6 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-        DefButton = TRUE ;
-    };
-    CancelButton PB_CANCEL
-    {
-        Pos = MAP_APPFONT ( 151 , 23 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    HelpButton PB_HELP
-    {
-        Pos = MAP_APPFONT ( 151 , 40 ) ;
-        Size = MAP_APPFONT ( 50 , 14 ) ;
-        TabStop = TRUE ;
-    };
-    FixedLine FL_MERGE
-    {
-        Pos = MAP_APPFONT ( 6 , 3 ) ;
-        Size = MAP_APPFONT ( 139 , 8 ) ;
-        Text [ en-US ] = "Mode" ;
-    };
-    RadioButton RB_MERGE_PREV
-    {
-        HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_PREV";
-        Pos = MAP_APPFONT ( 12 , 15 ) ;
-        Size = MAP_APPFONT ( 130 , 10 ) ;
-        Check = TRUE ;
-        TabStop = TRUE ;
-        Text [ en-US ] = "Join with ~previous table";
-    };
-    RadioButton RB_MERGE_NEXT
-    {
-        HelpID = "sw:RadioButton:DLG_MERGE_TABLE:RB_MERGE_NEXT";
-        Pos = MAP_APPFONT ( 12 , 30 ) ;
-        Size = MAP_APPFONT ( 130 , 10 ) ;
-        Text [ en-US ] = "Join with ~next table";
-    };
-    Text [ en-US ] = "Merge Tables";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */