[Libreoffice-commits] core.git: sw/inc sw/source

[Caolán McNamara]

 sw/inc/dbui.hrc                          |    6 +++++
 sw/source/ui/dbui/mmaddressblockpage.cxx |    1 
 sw/source/ui/dbui/mmaddressblockpage.hrc |   37 -------------------------------
 sw/source/ui/dbui/mmaddressblockpage.src |    1 
 4 files changed, 6 insertions(+), 39 deletions(-)

New commits:
commit bc3830587c2a8325d6a9b0f94984d90b7683b295
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 3 12:48:28 2014 +0100

    make these global level resids
    
    Change-Id: I129fa1f649f8dfcec1434734193daf22ea841889

diff --git a/sw/inc/dbui.hrc b/sw/inc/dbui.hrc
index 58bbc6d..b9f9089 100644
--- a/sw/inc/dbui.hrc
+++ b/sw/inc/dbui.hrc
@@ -66,6 +66,12 @@
 #define ST_NAME                 (RC_DBUI_BEGIN + 35)
 #define ST_TABLE                (RC_DBUI_BEGIN + 36)
 #define ST_QUERY                (RC_DBUI_BEGIN + 37)
+#define ST_SALUTATIONPREVIEW    (RC_DBUI_BEGIN + 38)
+#define ST_SALUTATIONMATCHING   (RC_DBUI_BEGIN + 39)
+#define ST_SALUTATIONELEMENT    (RC_DBUI_BEGIN + 40)
+#define ST_ADDRESSELEMENT       (RC_DBUI_BEGIN + 41)
+#define ST_MATCHESTO            (RC_DBUI_BEGIN + 42)
+#define ST_PREVIEW              (RC_DBUI_BEGIN + 43)
 
 // Elements -----------------------------------------------------------------
 #define MM_PART_TITLE                   0
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index 406c7f8..349bbae 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -33,7 +33,6 @@
 
 #include <vector>
 #include <boost/scoped_ptr.hpp>
-#include <mmaddressblockpage.hrc>
 #include <globals.hrc>
 #include <dbui.hrc>
 #include <helpid.h>
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hrc b/sw/source/ui/dbui/mmaddressblockpage.hrc
deleted file mode 100644
index 3afdb63..0000000
--- a/sw/source/ui/dbui/mmaddressblockpage.hrc
+++ /dev/null
@@ -1,37 +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 _MAILMERGEADDRESSBLOCKPAGE_HRC
-#define _MAILMERGEADDRESSBLOCKPAGE_HRC
-
-
-#define STR_DOCUMENT            13
-#define STR_CHANGEADDRESS       16
-
-
-#define ST_SALUTATIONPREVIEW    72
-#define ST_SALUTATIONMATCHING   73
-#define ST_SALUTATIONELEMENT   74
-
-#define ST_ADDRESSELEMENT       2
-#define ST_MATCHESTO            3
-#define ST_PREVIEW              4
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index c06aecb..eae338e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -16,7 +16,6 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include <mmaddressblockpage.hrc>
 #include <dbui.hrc>
 #include <helpid.h>