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

[Stephan Bergmann]

 include/svx/svdpntv.hxx        |    6 +++++-
 svx/source/svdraw/svdoedge.cxx |    6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

New commits:
commit 370c0677cae9bd1f640d9cc1f2fa442fd7ed3138
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Jan 13 17:21:35 2016 +0100

    -Werror=misleading-indentation (GCC 6)
    
    Change-Id: I83e38c017600946e4055a5b8ada87a0f64e83222
    (cherry picked from commit 84800b5e65e03c744b01225a1d44f8d54481b5f4)
    Signed-off-by: David Tardon <dtardon at redhat.com>
    Reviewed-on: https://gerrit.libreoffice.org/24410
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 9f94e60..366ead6 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -416,7 +416,11 @@ public:
     void setHideFormControl(bool bNew) { if(bNew != (bool)mbHideFormControl) mbHideFormControl = bNew; }
 
     void SetGridCoarse(const Size& rSiz) { maGridBig=rSiz; }
-    void SetGridFine(const Size& rSiz) { maGridFin=rSiz; if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width(); if (mbGridVisible) InvalidateAllWin(); }
+    void SetGridFine(const Size& rSiz) {
+        maGridFin=rSiz;
+        if (maGridFin.Height()==0) maGridFin.Height()=maGridFin.Width();
+        if (mbGridVisible) InvalidateAllWin();
+    }
     const Size& GetGridCoarse() const { return maGridBig; }
     const Size& GetGridFine() const { return maGridFin; }
 
diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx
index 553ec70..8e7749a 100644
--- a/svx/source/svdraw/svdoedge.cxx
+++ b/svx/source/svdraw/svdoedge.cxx
@@ -1345,9 +1345,11 @@ XPolygon SdrEdgeObj::ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rec
             Point aP1(aXP1[1]); aP1-=aXP1[0];
             Point aP2(aXP1[nPointCount-2]); aP2-=aXP1[nPointCount-1];
             long nAng1=0; if (aP1.X()<0) nAng1=18000; if (aP1.Y()>0) nAng1=27000;
-            if (aP1.Y()<0) nAng1=9000; if (aP1.X()!=0 && aP1.Y()!=0) nAng1=1; // slant?!
+            if (aP1.Y()<0) nAng1=9000;
+            if (aP1.X()!=0 && aP1.Y()!=0) nAng1=1; // slant?!
             long nAng2=0; if (aP2.X()<0) nAng2=18000; if (aP2.Y()>0) nAng2=27000;
-            if (aP2.Y()<0) nAng2=9000; if (aP2.X()!=0 && aP2.Y()!=0) nAng2=1; // slant?!
+            if (aP2.Y()<0) nAng2=9000;
+            if (aP2.X()!=0 && aP2.Y()!=0) nAng2=1; // slant?!
             if (nAng1!=nAngle1) nIntersections++;
             if (nAng2!=nAngle2) nIntersections++;
         }