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

[Johnny_M]

 sw/inc/swcrsr.hxx              |    2 +-
 sw/source/core/crsr/swcrsr.cxx |   20 ++++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 716eb586d0ddf8c7585a164ec76c63928a5ece93
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 3 12:45:09 2018 +0100

    Translate German variable names
    
    Akt -> Current in swcrsr
    
    Change-Id: I5c5dabefa6e2924620b8ab4829943b74dc7e6bcd
    Reviewed-on: https://gerrit.libreoffice.org/50665
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 7d872757f48f..bbe3ac688f8a 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -284,7 +284,7 @@ public:
     const SwSelBoxes& GetSelectedBoxes() const { return m_SelectedBoxes; }
 
     // Creates cursor for all boxes.
-    SwCursor* MakeBoxSels( SwCursor* pAktCursor );
+    SwCursor* MakeBoxSels( SwCursor* pCurrentCursor );
     // Any boxes protected?
     bool HasReadOnlyBoxSel() const;
 
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index 0433bc655273..612367e785df 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -2151,7 +2151,7 @@ lcl_SeekEntry(const SwSelBoxes& rTmp, SwStartNode const*const pSrch,
     return false;
 }
 
-SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCursor )
+SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pCurrentCursor )
 {
     if (m_bChanged)
     {
@@ -2172,9 +2172,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCursor )
         SwSelBoxes aTmp(m_SelectedBoxes);
 
         // compare old and new ones
-        SwNodes& rNds = pAktCursor->GetDoc()->GetNodes();
+        SwNodes& rNds = pCurrentCursor->GetDoc()->GetNodes();
         const SwStartNode* pSttNd;
-        SwPaM* pCur = pAktCursor;
+        SwPaM* pCur = pCurrentCursor;
         do {
             size_t nPos;
             bool bDel = false;
@@ -2214,12 +2214,12 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCursor )
             {
                 SwPaM* pDel = pCur->GetPrev();
 
-                if( pDel == pAktCursor )
-                    pAktCursor->DeleteMark();
+                if( pDel == pCurrentCursor )
+                    pCurrentCursor->DeleteMark();
                 else
                     delete pDel;
             }
-        } while ( pAktCursor != pCur );
+        } while ( pCurrentCursor != pCur );
 
         for (size_t nPos = 0; nPos < aTmp.size(); ++nPos)
         {
@@ -2232,9 +2232,9 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCursor )
             if( !pNd->IsContentNode() )
                 pNd = rNds.GoNextSection( &aIdx, true, false );
 
-            SwPaM *const pNew = (!pAktCursor->IsMultiSelection() && !pAktCursor->HasMark())
-                ? pAktCursor
-                : pAktCursor->Create( pAktCursor );
+            SwPaM *const pNew = (!pCurrentCursor->IsMultiSelection() && !pCurrentCursor->HasMark())
+                ? pCurrentCursor
+                : pCurrentCursor->Create( pCurrentCursor );
             pNew->GetPoint()->nNode = *pNd;
             pNew->GetPoint()->nContent.Assign( static_cast<SwContentNode*>(pNd), 0 );
             pNew->SetMark();
@@ -2247,7 +2247,7 @@ SwCursor* SwTableCursor::MakeBoxSels( SwCursor* pAktCursor )
             pPos->nContent.Assign(static_cast<SwContentNode*>(pNd), pNd ? static_cast<SwContentNode*>(pNd)->Len() : 0);
         }
     }
-    return pAktCursor;
+    return pCurrentCursor;
 }
 
 void SwTableCursor::InsertBox( const SwTableBox& rTableBox )