diff options
author | Zsolt Bölöny <bolony.zsolt@gmail.com> | 2015-06-04 10:45:08 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-06-04 20:08:04 +0000 |
commit | 8854643a0a964f6aa511013c6ab31ed198c74e86 (patch) | |
tree | 9bc923a82196147d5b07d3dc0b53d651df05f56a | |
parent | Resolves: tdf#91637 avoid -1 string index (diff) | |
download | core-8854643a0a964f6aa511013c6ab31ed198c74e86.tar.gz core-8854643a0a964f6aa511013c6ab31ed198c74e86.zip |
Removed getNormal() from polygontools, it just calls B3DPolygon::getNormal()
Change-Id: I5a59ff8e0db1aee52d0b683c9c64e4b18b64e66b
Reviewed-on: https://gerrit.libreoffice.org/16077
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | basegfx/source/polygon/b3dpolygontools.cxx | 5 | ||||
-rw-r--r-- | chart2/source/view/main/Stripe.cxx | 2 | ||||
-rw-r--r-- | include/basegfx/polygon/b3dpolygontools.hxx | 3 | ||||
-rw-r--r-- | svx/source/engine3d/polygn3d.cxx | 4 |
4 files changed, 3 insertions, 11 deletions
diff --git a/basegfx/source/polygon/b3dpolygontools.cxx b/basegfx/source/polygon/b3dpolygontools.cxx index 10e35813fffa..62904d6b4c1d 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 c9455a0e9d53..2373002dd336 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 006851544f07..bcee8be3b90b 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 44ea9816c706..7329aa1df875 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())); |