From 44790193a74923d42228277ed46723ba9e225136 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 27 Mar 2015 08:29:36 +0200 Subject: loplugin:staticfunction Change-Id: I982ba552579019e4902ae59fddf14a6b34ba5954 --- basegfx/source/inc/hommatrixtemplate.hxx | 2 +- basegfx/source/matrix/b2dhommatrix.cxx | 5 +++-- basegfx/source/matrix/b3dhommatrix.cxx | 5 +++-- basegfx/source/polygon/b2dpolypolygoncutter.cxx | 2 +- basegfx/source/range/b2drangeclipper.cxx | 2 +- 5 files changed, 9 insertions(+), 7 deletions(-) (limited to 'basegfx') diff --git a/basegfx/source/inc/hommatrixtemplate.hxx b/basegfx/source/inc/hommatrixtemplate.hxx index 2e1be87a8a68..39922685be73 100644 --- a/basegfx/source/inc/hommatrixtemplate.hxx +++ b/basegfx/source/inc/hommatrixtemplate.hxx @@ -141,7 +141,7 @@ namespace basegfx } } - sal_uInt16 getEdgeLength() const { return RowSize; } + static sal_uInt16 getEdgeLength() { return RowSize; } double get(sal_uInt16 nRow, sal_uInt16 nColumn) const { diff --git a/basegfx/source/matrix/b2dhommatrix.cxx b/basegfx/source/matrix/b2dhommatrix.cxx index 88409d586cb0..b1fe9b4b9698 100644 --- a/basegfx/source/matrix/b2dhommatrix.cxx +++ b/basegfx/source/matrix/b2dhommatrix.cxx @@ -27,7 +27,8 @@ namespace basegfx { - class Impl2DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 3 > + typedef ::basegfx::internal::ImplHomMatrixTemplate< 3 > Impl2DHomMatrix_Base; + class Impl2DHomMatrix : public Impl2DHomMatrix_Base { }; @@ -111,7 +112,7 @@ namespace basegfx bool B2DHomMatrix::invert() { Impl2DHomMatrix aWork(*mpImpl); - sal_uInt16* pIndex = new sal_uInt16[mpImpl->getEdgeLength()]; + sal_uInt16* pIndex = new sal_uInt16[Impl2DHomMatrix_Base::getEdgeLength()]; sal_Int16 nParity; if(aWork.ludcmp(pIndex, nParity)) diff --git a/basegfx/source/matrix/b3dhommatrix.cxx b/basegfx/source/matrix/b3dhommatrix.cxx index 75ba78fb8018..dac62a964e79 100644 --- a/basegfx/source/matrix/b3dhommatrix.cxx +++ b/basegfx/source/matrix/b3dhommatrix.cxx @@ -24,7 +24,8 @@ namespace basegfx { - class Impl3DHomMatrix : public ::basegfx::internal::ImplHomMatrixTemplate< 4 > + typedef ::basegfx::internal::ImplHomMatrixTemplate< 4 >Impl3DHomMatrix_Base; + class Impl3DHomMatrix : public Impl3DHomMatrix_Base { }; @@ -82,7 +83,7 @@ namespace basegfx bool B3DHomMatrix::invert() { Impl3DHomMatrix aWork(*mpImpl); - sal_uInt16* pIndex = new sal_uInt16[mpImpl->getEdgeLength()]; + sal_uInt16* pIndex = new sal_uInt16[Impl3DHomMatrix_Base::getEdgeLength()]; sal_Int16 nParity; if(aWork.ludcmp(pIndex, nParity)) diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx b/basegfx/source/polygon/b2dpolypolygoncutter.cxx index d9eea58ff92f..5f1385245fc5 100644 --- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx +++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx @@ -137,7 +137,7 @@ namespace basegfx } } - bool impLeftOfEdges(const B2DVector& rVecA, const B2DVector& rVecB, const B2DVector& rTest) + static bool impLeftOfEdges(const B2DVector& rVecA, const B2DVector& rVecB, const B2DVector& rTest) { // tests if rTest is left of both directed line segments along the line -rVecA, rVecB. Test is // with border. diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index 60100beb2382..edbb12803d45 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -484,7 +484,7 @@ namespace basegfx } /// True when sweep line hits our own active edge - bool metOwnEdge(const SweepLineEvent& rEvent, + static bool metOwnEdge(const SweepLineEvent& rEvent, ActiveEdge& rActiveEdge) { const bool bHitOwnEdge=&rEvent.getRect() == &rActiveEdge.getRect(); -- cgit v1.2.3