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

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Sat Dec 8 17:56:53 UTC 2018


 svx/source/svdraw/svdotxtr.cxx |   22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 623f504cabaa9cad1f9970f50dcb366802d6d972
Author:     Johnny_M <klasse at partyheld.de>
AuthorDate: Sun Nov 4 13:48:53 2018 +0100
Commit:     Eike Rathke <erack at redhat.com>
CommitDate: Sat Dec 8 18:56:33 2018 +0100

    Translate German variable names
    
    Change-Id: I141c003bead8eda9bdfa8a7fd286f76390cf77ac
    Reviewed-on: https://gerrit.libreoffice.org/62843
    Tested-by: Jenkins
    Reviewed-by: Eike Rathke <erack at redhat.com>

diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx
index 91c294eea919..1ae523c80f63 100644
--- a/svx/source/svdraw/svdotxtr.cxx
+++ b/svx/source/svdraw/svdotxtr.cxx
@@ -102,8 +102,8 @@ void SdrTextObj::NbcMove(const Size& rSiz)
 
 void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fraction& yFact)
 {
-    bool bNoShearMerk=aGeo.nShearAngle==0;
-    bool bRota90Merk=bNoShearMerk && aGeo.nRotationAngle % 9000 ==0;
+    bool bNotSheared=aGeo.nShearAngle==0;
+    bool bRotate90=bNotSheared && aGeo.nRotationAngle % 9000 ==0;
     bool bXMirr=(xFact.GetNumerator()<0) != (xFact.GetDenominator()<0);
     bool bYMirr=(yFact.GetNumerator()<0) != (yFact.GetDenominator()<0);
     if (bXMirr || bYMirr) {
@@ -153,7 +153,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
         Poly2Rect(aPol, maRect, aGeo);
     }
 
-    if (bRota90Merk) {
+    if (bRotate90) {
         bool bRota90=aGeo.nRotationAngle % 9000 ==0;
         if (!bRota90) { // there's seems to be a rounding error occurring: correct it
             long a=NormAngle36000(aGeo.nRotationAngle);
@@ -165,7 +165,7 @@ void SdrTextObj::NbcResize(const Point& rRef, const Fraction& xFact, const Fract
             aGeo.nRotationAngle=a;
             aGeo.RecalcSinCos();
         }
-        if (bNoShearMerk!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
+        if (bNotSheared!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
             aGeo.nShearAngle=0;
             aGeo.RecalcTan();
         }
@@ -233,12 +233,12 @@ void SdrTextObj::NbcShear(const Point& rRef, long /*nAngle*/, double tn, bool bV
 void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
 {
     SetGlueReallyAbsolute(true);
-    bool bNoShearMerk=aGeo.nShearAngle==0;
-    bool bRota90Merk = false;
-    if (bNoShearMerk &&
+    bool bNotSheared=aGeo.nShearAngle==0;
+    bool bRotate90 = false;
+    if (bNotSheared &&
         (rRef1.X()==rRef2.X() || rRef1.Y()==rRef2.Y() ||
          std::abs(rRef1.X()-rRef2.X())==std::abs(rRef1.Y()-rRef2.Y()))) {
-        bRota90Merk=aGeo.nRotationAngle % 9000 ==0;
+        bRotate90=aGeo.nRotationAngle % 9000 ==0;
     }
     tools::Polygon aPol(Rect2Poly(maRect,aGeo));
     sal_uInt16 i;
@@ -255,9 +255,9 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
     aPol[4]=aPol0[1];
     Poly2Rect(aPol,maRect,aGeo);
 
-    if (bRota90Merk) {
+    if (bRotate90) {
         bool bRota90=aGeo.nRotationAngle % 9000 ==0;
-        if (bRota90Merk && !bRota90) { // there's seems to be a rounding error occurring: correct it
+        if (bRotate90 && !bRota90) { // there's seems to be a rounding error occurring: correct it
             long a=NormAngle36000(aGeo.nRotationAngle);
             if (a<4500) a=0;
             else if (a<13500) a=9000;
@@ -268,7 +268,7 @@ void SdrTextObj::NbcMirror(const Point& rRef1, const Point& rRef2)
             aGeo.RecalcSinCos();
         }
     }
-    if (bNoShearMerk!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
+    if (bNotSheared!=(aGeo.nShearAngle==0)) { // correct a rounding error occurring with Shear
         aGeo.nShearAngle=0;
         aGeo.RecalcTan();
     }


More information about the Libreoffice-commits mailing list