[Libreoffice-commits] core.git: svx/source

[Johnny_M]

 svx/source/svdraw/svdmodel.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 43bb99841254d668f1eb8f9791fb2aa5e821dbee
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 31 12:57:18 2018 +0200

    Translate German variable names
    
    Akt -> Current
    Anf -> Start
    in svdmodel
    
    Change-Id: I67b255bfcf67769d4baa11986acbcc3a7e919a8f
    Reviewed-on: https://gerrit.libreoffice.org/52189
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx
index bb237ba756cf..a4fa78c362ec 100644
--- a/svx/source/svdraw/svdmodel.cxx
+++ b/svx/source/svdraw/svdmodel.cxx
@@ -1550,9 +1550,9 @@ void SdrModel::Merge(SdrModel& rSourceModel,
             memset(pMasterNeed.get(), true, nSrcMasterPageCnt * sizeof(bool));
         } else {
             memset(pMasterNeed.get(), false, nSrcMasterPageCnt * sizeof(bool));
-            sal_uInt16 nAnf= bReverse ? nLastPageNum : nFirstPageNum;
+            sal_uInt16 nStart= bReverse ? nLastPageNum : nFirstPageNum;
             sal_uInt16 nEnd= bReverse ? nFirstPageNum : nLastPageNum;
-            for (sal_uInt16 i=nAnf; i<=nEnd; i++) {
+            for (sal_uInt16 i=nStart; i<=nEnd; i++) {
                 const SdrPage* pPg=rSourceModel.GetPage(i);
                 if(pPg->TRG_HasMasterPage())
                 {
@@ -1567,11 +1567,11 @@ void SdrModel::Merge(SdrModel& rSourceModel,
             }
         }
         // now determine the Mapping of the MasterPages
-        sal_uInt16 nAktMaPagNum=nDstMasterPageCnt;
+        sal_uInt16 nCurrentMaPagNum=nDstMasterPageCnt;
         for (sal_uInt16 i=0; i<nSrcMasterPageCnt; i++) {
             if (pMasterNeed[i]) {
-                pMasterMap[i]=nAktMaPagNum;
-                nAktMaPagNum++;
+                pMasterMap[i]=nCurrentMaPagNum;
+                nCurrentMaPagNum++;
                 nMasterNeed++;
             }
         }