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

[Johnny_M]

 sw/source/core/text/itratr.cxx |   30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

New commits:
commit c41504e358d08f89df9ed9d2ce500e38326c42ed
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 10 11:22:29 2018 +0100

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

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index baf09a0f30fa..494cf572e746 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -379,13 +379,13 @@ static bool lcl_MinMaxString( SwMinMaxArgs& rArg, SwFont* pFnt, const OUString &
             nStop = nEnd;
 
         SwDrawTextInfo aDrawInf( rArg.pSh, *rArg.pOut, nullptr, rText, nIdx, nStop - nIdx );
-        long nAktWidth = pFnt->GetTextSize_( aDrawInf ).Width();
-        rArg.nRowWidth += nAktWidth;
+        long nCurrentWidth = pFnt->GetTextSize_( aDrawInf ).Width();
+        rArg.nRowWidth += nCurrentWidth;
         if( bClear )
             rArg.NewWord();
         else
         {
-            rArg.nWordWidth += nAktWidth;
+            rArg.nWordWidth += nCurrentWidth;
             if( static_cast<long>(rArg.rAbsMin) < rArg.nWordWidth )
                 rArg.rAbsMin = rArg.nWordWidth;
             rArg.Minimum( rArg.nWordWidth + rArg.nWordAdd );
@@ -600,7 +600,7 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM
     sal_Int32 nIdx = 0;
     aIter.SeekAndChgAttrIter( nIdx, pOut );
     sal_Int32 nLen = m_Text.getLength();
-    long nAktWidth = 0;
+    long nCurrentWidth = 0;
     long nAdd = 0;
     SwMinMaxArgs aArg( pOut, pSh, rMin, rAbsMin );
     while( nIdx < nLen )
@@ -654,9 +654,9 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM
                 OUString sTmp( cChar );
                 SwDrawTextInfo aDrawInf( getIDocumentLayoutAccess().GetCurrentViewShell(),
                     *pOut, nullptr, sTmp, 0, 1, 0, false );
-                nAktWidth = aIter.GetFnt()->GetTextSize_( aDrawInf ).Width();
-                aArg.nWordWidth += nAktWidth;
-                aArg.nRowWidth += nAktWidth;
+                nCurrentWidth = aIter.GetFnt()->GetTextSize_( aDrawInf ).Width();
+                aArg.nWordWidth += nCurrentWidth;
+                aArg.nRowWidth += nCurrentWidth;
                 if( static_cast<long>(rAbsMin) < aArg.nWordWidth )
                     rAbsMin = aArg.nWordWidth;
                 aArg.Minimum( aArg.nWordWidth + aArg.nWordAdd );
@@ -682,9 +682,9 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM
                         {
                             const SdrObject* pSObj = pFrameFormat->FindSdrObject();
                             if( pSObj )
-                                nAktWidth = pSObj->GetCurrentBoundRect().GetWidth();
+                                nCurrentWidth = pSObj->GetCurrentBoundRect().GetWidth();
                             else
-                                nAktWidth = 0;
+                                nCurrentWidth = 0;
                         }
                         else
                         {
@@ -697,17 +697,17 @@ void SwTextNode::GetMinMaxSize( sal_uLong nIndex, sal_uLong& rMin, sal_uLong &rM
                                 // and USHRT_MAX as maximum width
                                 // It were cleaner and maybe necessary later on to iterate over the content
                                 // of the text frame and call GetMinMaxSize recursively
-                                nAktWidth = FLYINCNT_MIN_WIDTH; // 0.5 cm
+                                nCurrentWidth = FLYINCNT_MIN_WIDTH; // 0.5 cm
                                 rMax = std::max(rMax, sal_uLong(USHRT_MAX));
                             }
                             else
-                                nAktWidth = pFrameFormat->GetFrameSize().GetWidth();
+                                nCurrentWidth = pFrameFormat->GetFrameSize().GetWidth();
                         }
-                        nAktWidth += rLR.GetLeft();
-                        nAktWidth += rLR.GetRight();
+                        nCurrentWidth += rLR.GetLeft();
+                        nCurrentWidth += rLR.GetRight();
                         aArg.nWordAdd = nOldWidth + nOldAdd;
-                        aArg.nWordWidth = nAktWidth;
-                        aArg.nRowWidth += nAktWidth;
+                        aArg.nWordWidth = nCurrentWidth;
+                        aArg.nRowWidth += nCurrentWidth;
                         if( static_cast<long>(rAbsMin) < aArg.nWordWidth )
                             rAbsMin = aArg.nWordWidth;
                         aArg.Minimum( aArg.nWordWidth + aArg.nWordAdd );