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

[Libreoffice Gerrit user]

 compilerplugins/clang/singlevalfields.results |    2 +-
 sw/source/core/inc/UndoSort.hxx               |    4 ++--
 sw/source/core/undo/unsort.cxx                |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b2f52f4372e65b9af0e6fda588ca8b49e370ec0c
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sat Aug 18 11:44:18 2018 +0200
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Sun Aug 19 18:30:44 2018 +0200

    Translate German variable names
    
    Change-Id: I6b5fb91cbf32ce082fb77989e1b9ac5e8ecfe438
    Reviewed-on: https://gerrit.libreoffice.org/59283
    Tested-by: Jenkins
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/compilerplugins/clang/singlevalfields.results b/compilerplugins/clang/singlevalfields.results
index 34b3d39416e8..6ec49ca86374 100644
--- a/compilerplugins/clang/singlevalfields.results
+++ b/compilerplugins/clang/singlevalfields.results
@@ -116,7 +116,7 @@ sw/source/core/inc/frmtool.hxx:260
     SwBorderAttrs m_bBorderDist
     1
 sw/source/core/inc/UndoSort.hxx:38
-    SwSortUndoElement::(anonymous union)::(anonymous) nKenn
+    SwSortUndoElement::(anonymous union)::(anonymous) nID
     4294967295
 sw/source/filter/html/htmlcss1.cxx:77
     SwCSS1ItemIds nFormatBreak
diff --git a/sw/source/core/inc/UndoSort.hxx b/sw/source/core/inc/UndoSort.hxx
index 293d6a7ae0ae..167aaa4ef625 100644
--- a/sw/source/core/inc/UndoSort.hxx
+++ b/sw/source/core/inc/UndoSort.hxx
@@ -35,7 +35,7 @@ struct SwSortUndoElement
 {
     union {
         struct {
-            sal_uLong nKenn;
+            sal_uLong nID;
             sal_uLong nSource, nTarget;
         } TXT;
         struct {
@@ -52,7 +52,7 @@ struct SwSortUndoElement
     {
         SORT_TXT_TBL.TXT.nSource = nS;
         SORT_TXT_TBL.TXT.nTarget = nT;
-        SORT_TXT_TBL.TXT.nKenn   = 0xffffffff;
+        SORT_TXT_TBL.TXT.nID   = 0xffffffff;
     }
     ~SwSortUndoElement();
 };
diff --git a/sw/source/core/undo/unsort.cxx b/sw/source/core/undo/unsort.cxx
index e70ad166311f..2b2bc5b407f8 100644
--- a/sw/source/core/undo/unsort.cxx
+++ b/sw/source/core/undo/unsort.cxx
@@ -35,7 +35,7 @@
 SwSortUndoElement::~SwSortUndoElement()
 {
     // are there string pointers saved?
-    if( 0xffffffff != SORT_TXT_TBL.TXT.nKenn ) // Kenn(ung) = identifier
+    if( 0xffffffff != SORT_TXT_TBL.TXT.nID )
     {
         delete SORT_TXT_TBL.TBL.pSource;
         delete SORT_TXT_TBL.TBL.pTarget;