[Libreoffice-commits] core.git: sw/inc sw/source
Szymon KÅ‚os
eszkadev at gmail.com
Thu Jul 24 08:08:44 PDT 2014
sw/inc/dbui.hrc | 16 ++++-
sw/source/ui/dbui/mailmergewizard.cxx | 5 -
sw/source/ui/dbui/mailmergewizard.hrc | 31 -----------
sw/source/ui/dbui/mailmergewizard.src | 92 ++++++++++++++++------------------
4 files changed, 57 insertions(+), 87 deletions(-)
New commits:
commit be97f2f553bfb1a584646ad75bd932e686ba80c2
Author: Szymon KÅ‚os <eszkadev at gmail.com>
Date: Wed Jul 23 16:38:34 2014 +0200
DLG_MAILMERGEWIZARD conversion to .ui
Conflicts:
sw/inc/dbui.hrc
Change-Id: Id224fd3a99abe8ec497a38c40b099dd7ae917890
Reviewed-on: https://gerrit.libreoffice.org/10494
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index b4ec5bf..35f84c2 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -22,10 +22,6 @@
#include "rcid.hrc"
-// Dialoge --------------------------------------------------------------------
-
-#define DLG_MAILMERGEWIZARD (RC_DBUI_BEGIN + 3)
-
#define DLG_MAILMERGECHILD (RC_DBUI_BEGIN + 26)
// Strings ------------------------------------------------------------------
@@ -79,9 +75,19 @@
#define ST_COMPLETED (RC_DBUI_BEGIN + 49)
#define ST_FAILED (RC_DBUI_BEGIN + 50)
#define ST_TERMINATEQUERY (RC_DBUI_BEGIN + 51)
+#define ST_STARTING (RC_DBUI_BEGIN + 52)
+#define ST_DOCUMETNTYPE (RC_DBUI_BEGIN + 53)
+#define ST_ADDRESSBLOCK (RC_DBUI_BEGIN + 54)
+#define ST_GREETINGSLINE (RC_DBUI_BEGIN + 55)
+#define ST_LAYOUT (RC_DBUI_BEGIN + 56)
+#define ST_PREPAREMERGE (RC_DBUI_BEGIN + 57)
+#define ST_MERGE (RC_DBUI_BEGIN + 58)
+#define ST_OUTPUT (RC_DBUI_BEGIN + 59)
+#define ST_FINISH (RC_DBUI_BEGIN + 60)
+#define ST_ADDRESSLIST (RC_DBUI_BEGIN + 61)
// ImageList
-#define ILIST (RC_DBUI_BEGIN + 52)
+#define ILIST (RC_DBUI_BEGIN + 62)
// Elements -----------------------------------------------------------------
#define MM_PART_TITLE 0
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx
index 59fdfad..b816633 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -36,15 +36,13 @@
#include <vcl/msgbox.hxx>
#include <helpid.h>
-#include <mailmergewizard.hrc>
using namespace svt;
using namespace ::com::sun::star;
SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem) :
RoadmapWizard(&rView.GetViewFrame()->GetWindow(),
- SW_RES(DLG_MAILMERGEWIZARD),
- WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP),
+ static_cast<sal_uInt32>(WZB_NEXT|WZB_PREVIOUS|WZB_FINISH|WZB_CANCEL|WZB_HELP)),
m_pSwView(&rView),
m_bDocumentLoad( false ),
m_rConfigItem(rItem),
@@ -60,7 +58,6 @@ SwMailMergeWizard::SwMailMergeWizard(SwView& rView, SwMailMergeConfigItem& rItem
m_sFinish( SW_RES( ST_FINISH )),
m_nRestartPage( MM_DOCUMENTSELECTPAGE )
{
- FreeResource();
ShowButtonFixedLine(true);
defaultButton(WZB_NEXT);
enableButtons(WZB_FINISH, false);
diff --git a/sw/source/ui/dbui/mailmergewizard.hrc b/sw/source/ui/dbui/mailmergewizard.hrc
deleted file mode 100644
index ecae685..0000000
--- a/sw/source/ui/dbui/mailmergewizard.hrc
+++ /dev/null
@@ -1,31 +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 ST_STARTING 1
-#define ST_DOCUMETNTYPE 2
-#define ST_ADDRESSBLOCK 3
-#define ST_GREETINGSLINE 4
-#define ST_LAYOUT 5
-#define ST_PREPAREMERGE 6
-#define ST_MERGE 7
-#define ST_OUTPUT 8
-#define ST_FINISH 9
-#define ST_ADDRESSLIST 10
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mailmergewizard.src b/sw/source/ui/dbui/mailmergewizard.src
index 5194fbd..367657e 100644
--- a/sw/source/ui/dbui/mailmergewizard.src
+++ b/sw/source/ui/dbui/mailmergewizard.src
@@ -17,58 +17,56 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <mailmergewizard.hrc>
#include <dbui.hrc>
-ModalDialog DLG_MAILMERGEWIZARD
+String ST_STARTING
{
- HelpID = "sw:ModalDialog:DLG_MAILMERGEWIZARD";
- OutputSize = TRUE ;
- SVLook = TRUE ;
- Text [ en-US ] = "Mail Merge Wizard" ;
- Moveable = TRUE ;
+ Text [ en-US ] = "Select starting document";
+};
- String ST_STARTING
- {
- Text [ en-US ] = "Select starting document";
- };
- String ST_DOCUMETNTYPE
- {
- Text [ en-US ] = "Select document type";
- };
- String ST_ADDRESSBLOCK
- {
- Text [ en-US ] = "Insert address block";
- };
- String ST_ADDRESSLIST
- {
- Text [ en-US ] = "Select address list";
- };
- String ST_GREETINGSLINE
- {
- Text [ en-US ] = "Create salutation";
- };
- String ST_LAYOUT
- {
- Text [ en-US ] = "Adjust layout";
- };
- String ST_PREPAREMERGE
- {
- Text [ en-US ] = "Edit document";
- };
- String ST_MERGE
- {
- Text [ en-US ] = "Personalize document";
- };
- String ST_OUTPUT
- {
- Text [ en-US ] = "Save, print or send";
- };
- String ST_FINISH
- {
- Text [ en-US ] = "~Finish";
- };
+String ST_DOCUMETNTYPE
+{
+ Text [ en-US ] = "Select document type";
+};
+String ST_ADDRESSBLOCK
+{
+ Text [ en-US ] = "Insert address block";
+};
+
+String ST_ADDRESSLIST
+{
+ Text [ en-US ] = "Select address list";
+};
+
+String ST_GREETINGSLINE
+{
+ Text [ en-US ] = "Create salutation";
+};
+
+String ST_LAYOUT
+{
+ Text [ en-US ] = "Adjust layout";
+};
+
+String ST_PREPAREMERGE
+{
+ Text [ en-US ] = "Edit document";
+};
+
+String ST_MERGE
+{
+ Text [ en-US ] = "Personalize document";
+};
+
+String ST_OUTPUT
+{
+ Text [ en-US ] = "Save, print or send";
+};
+
+String ST_FINISH
+{
+ Text [ en-US ] = "~Finish";
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list