[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - vcl/source

[Stephan Bergmann]

 vcl/source/filter/sgvspln.cxx |    6 ++++--
 vcl/source/filter/sgvtext.cxx |    6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 9e9dcb045fc0cedd16500f7c869744ceb6a0e655
Author: Stephan Bergmann <sberg...@redhat.com>
Date:   Wed Jan 13 17:23:41 2016 +0100

    -Werror=misleading-indentation (GCC 6)
    
    Change-Id: I50b57b3e78758271411bdb4c3d58a2413578db1c
    (cherry picked from commit d0e1cb02d87968bdfd6bbedecf41cd5a6ed1c644)
    Signed-off-by: David Tardon <dtar...@redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/24405
    Tested-by: Jenkins <c...@libreoffice.org>

diff --git a/vcl/source/filter/sgvspln.cxx b/vcl/source/filter/sgvspln.cxx
index 762e310..2e9780a 100644
--- a/vcl/source/filter/sgvspln.cxx
+++ b/vcl/source/filter/sgvspln.cxx
@@ -717,8 +717,10 @@ bool Spline2Poly(tools::Polygon& rSpln, bool Periodic, 
tools::Polygon& rPoly)
                 dt1=t-tv[i]; dt2=dt1*dt1; dt3=dt2*dt1;
                 long x=long(ax[i]+bx[i]*dt1+cx[i]*dt2+dx[i]*dt3);
                 long y=long(ay[i]+by[i]*dt1+cy[i]*dt2+dy[i]*dt3);
-                if (x<MinKoord) x=MinKoord; if (x>MaxKoord) x=MaxKoord;
-                if (y<MinKoord) y=MinKoord; if (y>MaxKoord) y=MaxKoord;
+                if (x<MinKoord) x=MinKoord;
+                if (x>MaxKoord) x=MaxKoord;
+                if (y<MinKoord) y=MinKoord;
+                if (y>MaxKoord) y=MaxKoord;
                 if (rPoly.GetSize()<PolyMax) {
                     rPoly.SetSize(rPoly.GetSize()+1);
                     rPoly.SetPoint(Point(short(x),short(y)),rPoly.GetSize()-1);
diff --git a/vcl/source/filter/sgvtext.cxx b/vcl/source/filter/sgvtext.cxx
index 976683b..3686e6ec 100644
--- a/vcl/source/filter/sgvtext.cxx
+++ b/vcl/source/filter/sgvtext.cxx
@@ -963,8 +963,10 @@ void TextType::Draw(OutputDevice& rOut)
                     PointType Pos;
                     xp1=long(Pos1.x)+xPos+long(xLine[i]);
                     yp1=long(Pos1.y)+yPos;
-                    if (xp1>32000) xp1=32000; if (xp1<-12000) xp1=-12000;
-                    if (yp1>32000) yp1=32000; if (yp1<-12000) yp1=-12000;
+                    if (xp1>32000) xp1=32000;
+                    if (xp1<-12000) xp1=-12000;
+                    if (yp1>32000) yp1=32000;
+                    if (yp1<-12000) yp1=-12000;
                     Pos.x=short(xp1);
                     Pos.y=short(yp1);
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits