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

[Johnny_M]

 sw/source/filter/ww8/ww8graf2.cxx |   16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 886efb9577c6661581033e994819990026affe86
Author: Johnny_M <kla...@partyheld.de>
Date:   Sat Mar 10 11:36:07 2018 +0100

    Translate German variable names
    
    Akt -> Current in ww8graf2
    
    Change-Id: Idf70cdc5ebac2385ad7a74084b58c1a1aae652a7
    Reviewed-on: https://gerrit.libreoffice.org/51037
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Michael Stahl <mst...@redhat.com>

diff --git a/sw/source/filter/ww8/ww8graf2.cxx 
b/sw/source/filter/ww8/ww8graf2.cxx
index 7e634e5114fe..68695e277a24 100644
--- a/sw/source/filter/ww8/ww8graf2.cxx
+++ b/sw/source/filter/ww8/ww8graf2.cxx
@@ -322,14 +322,14 @@ WW8PicDesc::WW8PicDesc( const WW8_PIC& rPic )
     nCT = rPic.dyaCropTop;
     nCB = rPic.dyaCropBottom;
 
-    long nAktWidth  = nOriWidth - (nCL + nCR);  // Size after crop
-    long nAktHeight = nOriHeight - (nCT + nCB);
-    if (!nAktWidth)
-        nAktWidth  = 1;
-    if (!nAktHeight)
-        nAktHeight = 1;
-    nWidth = nAktWidth * rPic.mx / 1000;        // Writer Size
-    nHeight = nAktHeight * rPic.my / 1000;
+    long nCurrentWidth  = nOriWidth - (nCL + nCR);  // Size after crop
+    long nCurrentHeight = nOriHeight - (nCT + nCB);
+    if (!nCurrentWidth)
+        nCurrentWidth  = 1;
+    if (!nCurrentHeight)
+        nCurrentHeight = 1;
+    nWidth = nCurrentWidth * rPic.mx / 1000;        // Writer Size
+    nHeight = nCurrentHeight * rPic.my / 1000;
 }
 
 void SwWW8ImplReader::ReplaceObj(const SdrObject &rReplaceObj,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits