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

[Caolán McNamara]

 sc/inc/sc.hrc                           |    8 +++++++-
 sc/source/ui/inc/retypepassdlg.hrc      |   29 -----------------------------
 sc/source/ui/miscdlgs/retypepassdlg.cxx |    2 +-
 sc/source/ui/miscdlgs/retypepassdlg.src |    2 +-
 4 files changed, 9 insertions(+), 32 deletions(-)

New commits:
commit 2a17daf8a1fb1e83c11fd4c74da62518b27bb025
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jul 11 11:08:23 2014 +0100

    move the retype strings to sc.hrc
    
    Change-Id: I70bbbac0dff8c64bedcf8a46006378291a7fac23

diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index 5204efb..f420815 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -985,7 +985,13 @@
 #define STR_SOUTH               (STR_START + 432)
 #define STR_SUM                 (STR_START + 433)
 #define SCSTR_UPDATE_EXTDOCS    (STR_START + 434)
-#define STR_END                 (SCSTR_UPDATE_EXTDOCS)
+#define STR_NOT_PROTECTED       (STR_START + 435)
+#define STR_NOT_PASS_PROTECTED  (STR_START + 436)
+#define STR_HASH_BAD            (STR_START + 437)
+#define STR_HASH_GOOD           (STR_START + 438)
+#define STR_HASH_REGENERATED    (STR_START + 439)
+#define STR_RETYPE              (STR_START + 440)
+#define STR_END                 (STR_RETYPE)
 
 #define BMP_START               (STR_END)
 
diff --git a/sc/source/ui/inc/retypepassdlg.hrc b/sc/source/ui/inc/retypepassdlg.hrc
deleted file mode 100644
index c509291..0000000
--- a/sc/source/ui/inc/retypepassdlg.hrc
+++ /dev/null
@@ -1,29 +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 <sc.hrc>
-
-#define STR_NOT_PROTECTED       256
-#define STR_NOT_PASS_PROTECTED  257
-#define STR_HASH_BAD            258
-#define STR_HASH_GOOD           259
-#define STR_HASH_REGENERATED    260
-#define STR_RETYPE              261
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index 76a4a71..a029bae 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include "sc.hrc"
 #include "retypepassdlg.hxx"
-#include "retypepassdlg.hrc"
 #include "scresid.hxx"
 #include "document.hxx"
 #include "tabprotection.hxx"
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.src b/sc/source/ui/miscdlgs/retypepassdlg.src
index b88dde7..20beed4 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.src
+++ b/sc/source/ui/miscdlgs/retypepassdlg.src
@@ -17,7 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "retypepassdlg.hrc"
+#include "sc.hrc"
 
 String STR_NOT_PROTECTED
 {