mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

-Werror=misleading-indentation (GCC 6)

Browse Source 
Change-Id: I50b57b3e78758271411bdb4c3d58a2413578db1c
This commit is contained in:
Stephan Bergmann
2016-01-13 17:23:41 +01:00
parent 84800b5e65
commit d0e1cb02d8
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vcl/source/filter/sgvspln.cxx
View File

@@ -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);

6
vcl/source/filter/sgvtext.cxx
View File

@@ -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);