[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/inc sw/source

[Caolán McNamara]

 sw/inc/comcore.hrc              |   10 +++++-----
 sw/source/core/doc/docredln.cxx |    2 +-
 sw/source/core/undo/undo.src    |   10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 04e672364a5d6b7c38f8cb6e257b8c49af3e77d2
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Jun 10 17:14:52 2017 +0100

    there are *two* STR_REDLINE_INSERT sequences
    
    rename one of them to disambiguate
    
    Change-Id: I83eb6960bdb21c8ab04e62afd1427c8cc5731336
    Reviewed-on: https://gerrit.libreoffice.org/38641
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 6c9d6c2ae959..679020a5b198 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -37,11 +37,11 @@
 #define STR_HYPH_TITLE                      (RC_COMCORE_BEGIN + 16)
 #define STR_SHAPE_DEFNAME                   (RC_COMCORE_BEGIN + 17)
 
-#define STR_REDLINE_INSERT                  (RC_COMCORE_BEGIN + 19)
-#define STR_REDLINE_DELETE                  (RC_COMCORE_BEGIN + 20)
-#define STR_REDLINE_FORMAT                  (RC_COMCORE_BEGIN + 21)
-#define STR_REDLINE_TABLE                   (RC_COMCORE_BEGIN + 22)
-#define STR_REDLINE_FMTCOLL                 (RC_COMCORE_BEGIN + 23)
+#define STR_UNDO_REDLINE_INSERT             (RC_COMCORE_BEGIN + 19)
+#define STR_UNDO_REDLINE_DELETE             (RC_COMCORE_BEGIN + 20)
+#define STR_UNDO_REDLINE_FORMAT             (RC_COMCORE_BEGIN + 21)
+#define STR_UNDO_REDLINE_TABLE              (RC_COMCORE_BEGIN + 22)
+#define STR_UNDO_REDLINE_FMTCOLL            (RC_COMCORE_BEGIN + 23)
 #define STR_START_QUOTE                     (RC_COMCORE_BEGIN + 25)
 #define STR_END_QUOTE                       (RC_COMCORE_BEGIN + 26)
 #define STR_LDOTS                           (RC_COMCORE_BEGIN + 27)
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 709041ae486b..046c3ce4f0e1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -976,7 +976,7 @@ void SwRedlineData::SetExtraData( const SwRedlineExtraData* pData )
 
 OUString SwRedlineData::GetDescr() const
 {
-    return SwResId(STR_REDLINE_INSERT + GetType());
+    return SwResId(STR_UNDO_REDLINE_INSERT + GetType());
 }
 
 sal_uInt32 SwRangeRedline::m_nLastId = 1;
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index c433878a1fa4..34680f86bfb3 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -462,23 +462,23 @@ String STR_UNDO_COLBRKS
 {
     Text[ en-US ] = "column break";
 };
-String STR_REDLINE_INSERT
+String STR_UNDO_REDLINE_INSERT
 {
     Text [ en-US ] = "Insert $1";
 };
-String STR_REDLINE_DELETE
+String STR_UNDO_REDLINE_DELETE
 {
     Text [ en-US ] = "Delete $1";
 };
-String STR_REDLINE_FORMAT
+String STR_UNDO_REDLINE_FORMAT
 {
     Text [ en-US ] = "Attributes changed";
 };
-String STR_REDLINE_TABLE
+String STR_UNDO_REDLINE_TABLE
 {
     Text [ en-US ] = "Table changed";
 };
-String STR_REDLINE_FMTCOLL
+String STR_UNDO_REDLINE_FMTCOLL
 {
     Text [ en-US ] = "Style changed";
 };