sw/source/core/crsr/callnk.cxx | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
New commits:
commit 43bb03c5b17b1a583d77747bba604b17487d2723
Author: Johnny_M <kla...@partyheld.de>
Date: Sun Feb 25 17:16:34 2018 +0100
Translate German variable names
Akt -> Current in callnk
Change-Id: I53506b07c73f4cd663be01f6a224a7fcd8c3ac89
Reviewed-on: https://gerrit.libreoffice.org/50311
Reviewed-by: Michael Stahl <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx
index f62093e3f90a..0d074c956d2b 100644
--- a/sw/source/core/crsr/callnk.cxx
+++ b/sw/source/core/crsr/callnk.cxx
@@ -117,15 +117,15 @@ SwCallLink::~SwCallLink()
}
lcl_notifyRow(pNode, rShell);
- sal_Int32 nCmp, nAktContent =
pCurrentCursor->GetPoint()->nContent.GetIndex();
+ sal_Int32 nCmp, nCurrentContent =
pCurrentCursor->GetPoint()->nContent.GetIndex();
SwNodeType nNdWhich = pCNd->GetNodeType();
- sal_uLong nAktNode = pCurrentCursor->GetPoint()->nNode.GetIndex();
+ sal_uLong nCurrentNode = pCurrentCursor->GetPoint()->nNode.GetIndex();
// Register the Shell as dependent at the current Node. By doing this all
// attribute changes can be signaled over the link.
pCNd->Add( &rShell );
- if( nNdTyp != nNdWhich || nNode != nAktNode )
+ if( nNdTyp != nNdWhich || nNode != nCurrentNode )
{
// Every time a switch between nodes occurs, there is a chance that
// new attributes do apply - meaning text-attributes.
@@ -139,16 +139,16 @@ SwCallLink::~SwCallLink()
rShell.CallChgLnk();
}
else if( rShell.m_aChgLnk.IsSet() && SwNodeType::Text == nNdWhich &&
- nContent != nAktContent )
+ nContent != nCurrentContent )
{
// If travelling with left/right only and the frame is
// unchanged (columns!) then check text hints.
- if( nLeftFramePos == SwCallLink::getLayoutFrame( rShell.GetLayout(),
*pCNd->GetTextNode(), nAktContent,
+ if( nLeftFramePos == SwCallLink::getLayoutFrame( rShell.GetLayout(),
*pCNd->GetTextNode(), nCurrentContent,
!rShell.ActionPend() ) &&
- (( nCmp = nContent ) + 1 == nAktContent || // Right
- nContent -1 == ( nCmp = nAktContent )) ) // Left
+ (( nCmp = nContent ) + 1 == nCurrentContent || // Right
+ nContent -1 == ( nCmp = nCurrentContent )) ) // Left
{
- if( nCmp == nAktContent && pCurrentCursor->HasMark() ) // left &
select
+ if( nCmp == nCurrentContent && pCurrentCursor->HasMark() ) // left
& select
++nCmp;
if ( pCNd->GetTextNode()->HasHints() )
@@ -164,7 +164,7 @@ SwCallLink::~SwCallLink()
// If "only start" or "start and end equal" then call on
// every overflow of start.
if( ( !pEnd || ( nStart == *pEnd ) ) &&
- ( nStart == nContent || nStart == nAktContent) )
+ ( nStart == nContent || nStart == nCurrentContent) )
{
rShell.CallChgLnk();
return;
@@ -187,7 +187,7 @@ SwCallLink::~SwCallLink()
const OUString rText = pCNd->GetTextNode()->GetText();
if( !nCmp ||
g_pBreakIt->GetBreakIter()->getScriptType( rText, nContent )
- != g_pBreakIt->GetBreakIter()->getScriptType(rText,
nAktContent))
+ != g_pBreakIt->GetBreakIter()->getScriptType(rText,
nCurrentContent))
{
rShell.CallChgLnk();
return;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
