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

[Johnny_M]

 sw/source/ui/table/tabledlg.cxx    |   28 ++++++++++++++--------------
 sw/source/uibase/table/tablepg.hxx |    2 +-
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 89c4a6a385d489e08345135ac3ec81220e0ce9bd
Author: Johnny_M <klasse at partyheld.de>
Date:   Sat Mar 24 21:07:13 2018 +0100

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

diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 3c99d5bfc0f8..52da54c14c00 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -982,7 +982,7 @@ void   SwTableColumnPage::ModifyHdl( MetricField const * pField )
         UpdateCols( aValueTable[i] );
 }
 
-void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
+void SwTableColumnPage::UpdateCols( sal_uInt16 nCurrentPos )
 {
     SwTwips nSum = 0;
 
@@ -1001,9 +1001,9 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
         sal_uInt16 nLoopCount = 0;
         while( nDiff )
         {
-            if( ++nAktPos == nNoOfVisibleCols)
+            if( ++nCurrentPos == nNoOfVisibleCols)
             {
-                nAktPos = 0;
+                nCurrentPos = 0;
                 ++nLoopCount;
                 //#i101353# in small tables it might not be possible to balance column width
                 if( nLoopCount > 1 )
@@ -1011,25 +1011,25 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
             }
             if( nDiff < 0 )
             {
-                SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff);
+                SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff);
                 nDiff = 0;
             }
-            else if( GetVisibleWidth(nAktPos) >= nDiff + nMinWidth )
+            else if( GetVisibleWidth(nCurrentPos) >= nDiff + nMinWidth )
             {
-                SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff);
+                SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff);
                 nDiff = 0;
             }
-            if( nDiff > 0 && GetVisibleWidth(nAktPos) > nMinWidth )
+            if( nDiff > 0 && GetVisibleWidth(nCurrentPos) > nMinWidth )
             {
-                if( nDiff >= (GetVisibleWidth(nAktPos) - nMinWidth) )
+                if( nDiff >= (GetVisibleWidth(nCurrentPos) - nMinWidth) )
                 {
-                    nDiff -= (GetVisibleWidth(nAktPos) - nMinWidth);
-                    SetVisibleWidth(nAktPos, nMinWidth);
+                    nDiff -= (GetVisibleWidth(nCurrentPos) - nMinWidth);
+                    SetVisibleWidth(nCurrentPos, nMinWidth);
                 }
                 else
                 {
                     nDiff = 0;
-                    SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) -nDiff);
+                    SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) -nDiff);
                 }
                 OSL_ENSURE(nDiff >= 0, "nDiff < 0 cannot be here!");
             }
@@ -1044,7 +1044,7 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
         if(nDiff > nActSpace)
         {
             nTableWidth = pTableData->GetSpace();
-            SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nActSpace );
+            SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) - nDiff + nActSpace );
         }
         else
         {
@@ -1060,13 +1060,13 @@ void SwTableColumnPage::UpdateCols( sal_uInt16 nAktPos )
         if(nDiff * nNoOfVisibleCols > pTableData->GetSpace() - nTableWidth)
         {
             nAdd = (pTableData->GetSpace() - nTableWidth) / nNoOfVisibleCols;
-            SetVisibleWidth(nAktPos, GetVisibleWidth(nAktPos) - nDiff + nAdd );
+            SetVisibleWidth(nCurrentPos, GetVisibleWidth(nCurrentPos) - nDiff + nAdd );
             nDiff = nAdd;
         }
         if(nAdd)
             for( sal_uInt16 i = 0; i < nNoOfVisibleCols; i++ )
             {
-                if(i == nAktPos)
+                if(i == nCurrentPos)
                     continue;
                 SwTwips nVisWidth;
                 if((nVisWidth = GetVisibleWidth(i)) + nDiff < MINLAY)
diff --git a/sw/source/uibase/table/tablepg.hxx b/sw/source/uibase/table/tablepg.hxx
index 337fa3951ccb..8ee2fba972f6 100644
--- a/sw/source/uibase/table/tablepg.hxx
+++ b/sw/source/uibase/table/tablepg.hxx
@@ -124,7 +124,7 @@ class SwTableColumnPage : public SfxTabPage
     DECL_LINK( DownHdl, SpinField&, void );
     DECL_LINK( LoseFocusHdl, Control&, void );
     DECL_LINK( ModeHdl, Button *, void );
-    void        UpdateCols( sal_uInt16 nAktPos );
+    void        UpdateCols( sal_uInt16 nCurrentPos );
     SwTwips     GetVisibleWidth(sal_uInt16 nPos);
     void        SetVisibleWidth(sal_uInt16 nPos, SwTwips nNewWidth);