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

[Johnny_M]

 sw/inc/crsrsh.hxx              |    6 +++---
 sw/source/core/crsr/crsrsh.cxx |   28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 8ba463a9d42c50d0ace62e1767ddfd42dfccd3ad
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 3 23:23:51 2018 +0100

    Translate German variable names
    
    Akt -> Current in crsrsh
    
    (Including translation fix of a two-line comment, where
    it was no longer cleat that it is one.)
    
    Change-Id: Iccf33ef63c2b02dcde04504676bc273ea059c3f0
    Reviewed-on: https://gerrit.libreoffice.org/50704
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Bartosz Kosiorek <gang65 at poczta.onet.pl>

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index ef89060b88f6..8eb324b6abf8 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -191,9 +191,9 @@ private:
     long m_nUpDownX;              /**< try to move the cursor on up/down always
                                    in the same column */
     long m_nLeftFramePos;
-    sal_uLong m_nAktNode;             // save CursorPos at Start-Action
-    sal_Int32 m_nAktContent;
-    SwNodeType m_nAktNdTyp;
+    sal_uLong m_nCurrentNode;     // save CursorPos at Start-Action
+    sal_Int32 m_nCurrentContent;
+    SwNodeType m_nCurrentNdTyp;
 
     /*
      * Via the Method SttCursorMove and EndCursorMove this counter gets
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index beece9959b25..fe121cf36254 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -218,11 +218,11 @@ void SwCursorShell::StartAction()
     {
         // save for update of the ribbon bar
         const SwNode& rNd = m_pCurrentCursor->GetPoint()->nNode.GetNode();
-        m_nAktNode = rNd.GetIndex();
-        m_nAktContent = m_pCurrentCursor->GetPoint()->nContent.GetIndex();
-        m_nAktNdTyp = rNd.GetNodeType();
+        m_nCurrentNode = rNd.GetIndex();
+        m_nCurrentContent = m_pCurrentCursor->GetPoint()->nContent.GetIndex();
+        m_nCurrentNdTyp = rNd.GetNodeType();
         if( rNd.IsTextNode() )
-            m_nLeftFramePos = SwCallLink::getLayoutFrame( GetLayout(), *rNd.GetTextNode(), m_nAktContent, true );
+            m_nLeftFramePos = SwCallLink::getLayoutFrame( GetLayout(), *rNd.GetTextNode(), m_nCurrentContent, true );
         else
             m_nLeftFramePos = 0;
     }
@@ -272,10 +272,10 @@ void SwCursorShell::EndAction( const bool bIdleEnd, const bool DoSetPosX )
     UpdateCursor( eFlags, bIdleEnd );      // Show Cursor changes
 
     {
-        SwCallLink aLk( *this );        // watch Cursor-Moves
-        aLk.nNode = m_nAktNode;           // call Link if needed
-        aLk.nNdTyp = m_nAktNdTyp;
-        aLk.nContent = m_nAktContent;
+        SwCallLink aLk( *this );           // Watch cursor moves,
+        aLk.nNode = m_nCurrentNode;        // possibly call the link
+        aLk.nNdTyp = m_nCurrentNdTyp;
+        aLk.nContent = m_nCurrentContent;
         aLk.nLeftFramePos = m_nLeftFramePos;
 
         if( !m_nCursorMove ||
@@ -2644,9 +2644,9 @@ SwCursorShell::SwCursorShell( SwCursorShell& rShell, vcl::Window *pInitWin )
     , m_pBoxPtr( nullptr )
     , m_nUpDownX(0)
     , m_nLeftFramePos(0)
-    , m_nAktNode(0)
-    , m_nAktContent(0)
-    , m_nAktNdTyp(SwNodeType::NONE)
+    , m_nCurrentNode(0)
+    , m_nCurrentContent(0)
+    , m_nCurrentNdTyp(SwNodeType::NONE)
     , m_nCursorMove( 0 )
     , m_eMvState( MV_NONE )
     , m_sMarkedListId()
@@ -2680,9 +2680,9 @@ SwCursorShell::SwCursorShell( SwDoc& rDoc, vcl::Window *pInitWin,
     , m_pBoxPtr( nullptr )
     , m_nUpDownX(0)
     , m_nLeftFramePos(0)
-    , m_nAktNode(0)
-    , m_nAktContent(0)
-    , m_nAktNdTyp(SwNodeType::NONE)
+    , m_nCurrentNode(0)
+    , m_nCurrentContent(0)
+    , m_nCurrentNdTyp(SwNodeType::NONE)
     , m_nCursorMove( 0 )
     , m_eMvState( MV_NONE ) // state for crsr-travelling - GetCursorOfst
     , m_sMarkedListId()