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

[Johnny_M]

 svx/source/svdraw/svdedtv2.cxx |   14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit d7b8e1c8682dfd29847c9dc4b962c6a1cfa3d09f
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 10 11:54:23 2018 +0100

    Translate German variable names
    
    Akt -> Current in svdedtv2
    
    Change-Id: Iae43ec7ccd0a220b0296780bafecd5b4d232c3d5
    Reviewed-on: https://gerrit.libreoffice.org/51032
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx
index 42380e506605..01820c63bc34 100644
--- a/svx/source/svdraw/svdedtv2.cxx
+++ b/svx/source/svdraw/svdedtv2.cxx
@@ -1264,7 +1264,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
 
     // continue as before
     basegfx::B2DPolyPolygon aPolyPolygon;
-    SdrObjList* pAktOL = nullptr;
+    SdrObjList* pCurrentOL = nullptr;
     SdrMarkList aRemoveMerker;
 
     SortMarkedObjects();
@@ -1280,9 +1280,9 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly)
         SdrObject* pObj = pM->GetMarkedSdrObj();
         SdrObjList* pThisOL = pObj->GetObjList();
 
-        if(pAktOL != pThisOL)
+        if(pCurrentOL != pThisOL)
         {
-            pAktOL = pThisOL;
+            pCurrentOL = pThisOL;
         }
 
         if(ImpCanConvertForCombine(pObj))
@@ -1736,8 +1736,8 @@ void SdrEditView::GroupMarked()
 
         if(pPV)
         {
-            SdrObjList* pAktLst=pPV->GetObjList();
-            SdrObjList* pSrcLst=pAktLst;
+            SdrObjList* pCurrentLst=pPV->GetObjList();
+            SdrObjList* pSrcLst=pCurrentLst;
             SdrObjList* pSrcLst0=pSrcLst;
             // make sure OrdNums are correct
             if (pSrcLst->IsObjOrdNumsDirty())
@@ -1768,7 +1768,7 @@ void SdrEditView::GroupMarked()
                         if (pSrcLst->IsObjOrdNumsDirty())
                             pSrcLst->RecalcObjOrdNums();
                     }
-                    bool bForeignList=pSrcLst!=pAktLst;
+                    bool bForeignList=pSrcLst!=pCurrentLst;
                     if (!bForeignList && bNeedInsPos)
                     {
                         nInsPos=pObj->GetOrdNum(); // this way, all ObjOrdNum of the page are set
@@ -1787,7 +1787,7 @@ void SdrEditView::GroupMarked()
             {
                 aNewMark.InsertEntry(SdrMark(pGrp,pPV));
                 const size_t nCount=pDstLst->GetObjCount();
-                pAktLst->InsertObject(pGrp,nInsPos);
+                pCurrentLst->InsertObject(pGrp,nInsPos);
                 if( bUndo )
                 {
                     AddUndo(GetModel()->GetSdrUndoFactory().CreateUndoNewObject(*pGrp,true)); // no recalculation!