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

[Zsolt Bölöny]

 basegfx/source/polygon/b3dpolygontools.cxx  |    5 -----
 chart2/source/view/main/Stripe.cxx          |    2 +-
 include/basegfx/polygon/b3dpolygontools.hxx |    3 ---
 svx/source/engine3d/polygn3d.cxx            |    4 ++--
 4 files changed, 3 insertions(+), 11 deletions(-)

New commits:
commit 8854643a0a964f6aa511013c6ab31ed198c74e86
Author: Zsolt Bölöny <bolony.zsolt at gmail.com>
Date:   Thu Jun 4 10:45:08 2015 +0200

    Removed getNormal() from polygontools, it just calls B3DPolygon::getNormal()
    
    Change-Id: I5a59ff8e0db1aee52d0b683c9c64e4b18b64e66b
    Reviewed-on: https://gerrit.libreoffice.org/16077
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx
index 10e3581..62904d6 100644
--- a/basegfx/source/polygon/b3dpolygontools.cxx
+++ b/basegfx/source/polygon/b3dpolygontools.cxx
@@ -72,11 +72,6 @@ namespace basegfx
             return aRetval;
         }
 
-        B3DVector getNormal(const B3DPolygon& rCandidate)
-        {
-            return rCandidate.getNormal();
-        }
-
         double getLength(const B3DPolygon& rCandidate)
         {
             double fRetval(0.0);
diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx
index c9455a0..2373002 100644
--- a/chart2/source/view/main/Stripe.cxx
+++ b/chart2/source/view/main/Stripe.cxx
@@ -131,7 +131,7 @@ drawing::Direction3D Stripe::getNormal() const
         aPolygon3D.append(Position3DToB3DPoint( m_aPoint2 ));
         aPolygon3D.append(Position3DToB3DPoint( m_aPoint3 ));
         aPolygon3D.append(Position3DToB3DPoint( m_aPoint4 ));
-        ::basegfx::B3DVector aNormal(::basegfx::tools::getNormal(aPolygon3D));
+        ::basegfx::B3DVector aNormal(aPolygon3D.getNormal());
         aRet = B3DVectorToDirection3D(aNormal);
     }
 
diff --git a/include/basegfx/polygon/b3dpolygontools.hxx b/include/basegfx/polygon/b3dpolygontools.hxx
index 0068515..bcee8be 100644
--- a/include/basegfx/polygon/b3dpolygontools.hxx
+++ b/include/basegfx/polygon/b3dpolygontools.hxx
@@ -55,9 +55,6 @@ namespace basegfx
         // get size of polygon. Control vectors are included in that ranges.
         BASEGFX_DLLPUBLIC B3DRange getRange(const B3DPolygon& rCandidate);
 
-        // get normal vector of polygon
-        BASEGFX_DLLPUBLIC B3DVector getNormal(const B3DPolygon& rCandidate);
-
         // get area of polygon
         BASEGFX_DLLPUBLIC double getArea(const ::basegfx::B3DPolygon& rCandidate);
 
diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx
index 44ea981..7329aa1 100644
--- a/svx/source/engine3d/polygn3d.cxx
+++ b/svx/source/engine3d/polygn3d.cxx
@@ -73,7 +73,7 @@ void E3dPolygonObj::CreateDefaultNormals()
         basegfx::B3DPolygon aNormals;
 
         // Get normal (and invert)
-        basegfx::B3DVector aNormal(-basegfx::tools::getNormal(aPolygon));
+        basegfx::B3DVector aNormal(-aPolygon.getNormal());
 
         // Fill new polygon
         for(sal_uInt32 b(0L); b < aPolygon.count(); b++)
@@ -104,7 +104,7 @@ void E3dPolygonObj::CreateDefaultTexture()
         basegfx::B3DRange aVolume(basegfx::tools::getRange(aPolygon));
 
         // Get normal
-        basegfx::B3DVector aNormal(basegfx::tools::getNormal(aPolygon));
+        basegfx::B3DVector aNormal(aPolygon.getNormal());
         aNormal.setX(fabs(aNormal.getX()));
         aNormal.setY(fabs(aNormal.getY()));
         aNormal.setZ(fabs(aNormal.getZ()));