summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-03-27 08:29:36 +0200
committerNoel Grandin <noel@peralex.com>2015-03-27 10:51:08 +0200
commit44790193a74923d42228277ed46723ba9e225136 (patch)
tree625f721df9135f36dc8101ad964a6b2331780d82
parentc4a9241f72e3b7bf84eaadc51dbaa2accc7b920c (diff)
loplugin:staticfunction
Change-Id: I982ba552579019e4902ae59fddf14a6b34ba5954
-rw-r--r--UnoControls/source/inc/progressmonitor.hxx4
-rw-r--r--basebmp/source/bitmapdevice.cxx4
-rw-r--r--basegfx/source/inc/hommatrixtemplate.hxx2
-rw-r--r--basegfx/source/matrix/b2dhommatrix.cxx5
-rw-r--r--basegfx/source/matrix/b3dhommatrix.cxx5
-rw-r--r--basegfx/source/polygon/b2dpolypolygoncutter.cxx2
-rw-r--r--basegfx/source/range/b2drangeclipper.cxx2
-rw-r--r--include/basebmp/accessoradapters.hxx8
8 files changed, 17 insertions, 15 deletions
diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx
index 4ac928d73954..e31492ad35a3 100644
--- a/UnoControls/source/inc/progressmonitor.hxx
+++ b/UnoControls/source/inc/progressmonitor.hxx
@@ -403,8 +403,8 @@ private:
#ifdef DBG_UTIL
- bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress ); // addText, updateText
- bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress ); // removeText
+ static bool impl_debug_checkParameter( const OUString& sTopic, const OUString& sText, bool bbeforeProgress ); // addText, updateText
+ static bool impl_debug_checkParameter( const OUString& rTopic, bool bbeforeProgress ); // removeText
#endif
diff --git a/basebmp/source/bitmapdevice.cxx b/basebmp/source/bitmapdevice.cxx
index 117d8146b804..71a2e85bdeef 100644
--- a/basebmp/source/bitmapdevice.cxx
+++ b/basebmp/source/bitmapdevice.cxx
@@ -373,7 +373,7 @@ namespace
damaged( basegfx::B2IBox( rDamagePoint, aEnd ) );
}
- boost::shared_ptr<BitmapRenderer> getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp ) const
+ static boost::shared_ptr<BitmapRenderer> getCompatibleBitmap( const BitmapDeviceSharedPtr& bmp )
{
return boost::dynamic_pointer_cast< BitmapRenderer >( bmp );
}
@@ -405,7 +405,7 @@ namespace
return boost::dynamic_pointer_cast<mask_bitmap_type>( bmp ).get() != NULL;
}
- boost::shared_ptr<alphamask_bitmap_type> getCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp ) const
+ static boost::shared_ptr<alphamask_bitmap_type> getCompatibleAlphaMask( const BitmapDeviceSharedPtr& bmp )
{
return boost::dynamic_pointer_cast<alphamask_bitmap_type>( bmp );
}
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();
diff --git a/include/basebmp/accessoradapters.hxx b/include/basebmp/accessoradapters.hxx
index e32533973ea8..0d0122e5c7d2 100644
--- a/include/basebmp/accessoradapters.hxx
+++ b/include/basebmp/accessoradapters.hxx
@@ -208,9 +208,9 @@ public:
- typename SetterFunctor::result_type setter(
+ static typename SetterFunctor::result_type setter(
typename SetterFunctor::first_argument_type v1,
- argument_type v2 ) const
+ argument_type v2 )
{
return maSetterFunctor(v1,v2);
}
@@ -343,10 +343,10 @@ public:
- typename Functor::result_type setter(
+ static typename Functor::result_type setter(
typename Functor::first_argument_type v1,
typename Functor::second_argument_type v2,
- argument_type v3 ) const
+ argument_type v3 )
{
return maSetterFunctor(v1,v2,v3);
}