diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-22 15:17:23 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-04-23 13:08:48 +0200 |
commit | 7ab8b08b6c8e7eb05e8ec8dde2afbe0940075f36 (patch) | |
tree | 4d00c315e2ebf6d8fe868dfc4f6b0a72c9c6ff8e /chart2/source/view | |
parent | 0a7b739cc33a56339a2bf0f8f0253f9402cabd35 (diff) |
loplugin:staticmethods
Change-Id: Iab2f10b000ef41fb090e0034785d4ed0bda4cf43
Diffstat (limited to 'chart2/source/view')
22 files changed, 36 insertions, 36 deletions
diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 509709a3bed3..998f0da4e9bc 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -65,7 +65,7 @@ public: void setExtraLinePositionAtOtherAxis( double fCrossingAt ); protected: //methods - size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); + static size_t getIndexOfLongestLabel( const css::uno::Sequence<OUString>& rLabels ); void removeTextShapesFromTicks(); void updateUnscaledValuesAtTicks( TickIter& rIter ); diff --git a/chart2/source/view/axes/VCartesianAxis.cxx b/chart2/source/view/axes/VCartesianAxis.cxx index 747a12044ecc..c8ae9e095be7 100644 --- a/chart2/source/view/axes/VCartesianAxis.cxx +++ b/chart2/source/view/axes/VCartesianAxis.cxx @@ -499,7 +499,7 @@ bool VCartesianAxis::isBreakOfLabelsAllowed( } bool VCartesianAxis::isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) { if( rAxisLabelProperties.eStaggering != STAGGER_AUTO ) return false; diff --git a/chart2/source/view/axes/VCartesianAxis.hxx b/chart2/source/view/axes/VCartesianAxis.hxx index 839d5e817d5e..c1937a48ef6d 100644 --- a/chart2/source/view/axes/VCartesianAxis.hxx +++ b/chart2/source/view/axes/VCartesianAxis.hxx @@ -150,8 +150,8 @@ private: //methods * @return true if we can try to stagger labels in order to avoid * overlaps, otherwise false. */ - bool isAutoStaggeringOfLabelsAllowed( - const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ) const; + static bool isAutoStaggeringOfLabelsAllowed( + const AxisLabelProperties& rAxisLabelProperties, bool bIsHorizontalAxis, bool bIsVerticalAxis ); /** * @return true if we can break a single line label text into multiple diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 4710d5e0a15f..df7d1bcef449 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -79,7 +79,7 @@ void VCartesianCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VCartesianGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VCartesianGrid aGrid(nDimensionIndex,nDimensionCount, getGridListFromAxis( xAxis )); aGrid.setExplicitScaleAndIncrement( this->getExplicitScale(nDimensionIndex,nAxisIndex) , this->getExplicitIncrement(nDimensionIndex,nAxisIndex) ); aGrid.set3DWallPositions( m_eLeftWallPos, m_eBackWallPos, m_eBottomPos ); diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 5bd7329a89f3..9d7ebf2994b9 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -221,7 +221,7 @@ Sequence< Reference< beans::XPropertySet > > VCoordinateSystem::getGridListFromA return ContainerHelper::ContainerToSequence( aRet ); } -void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) const +void VCoordinateSystem::impl_adjustDimension( sal_Int32& rDimensionIndex ) { if( rDimensionIndex<0 ) rDimensionIndex=0; diff --git a/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/chart2/source/view/axes/VPolarCoordinateSystem.cxx index 7ad142175b34..6e34ab242aa3 100644 --- a/chart2/source/view/axes/VPolarCoordinateSystem.cxx +++ b/chart2/source/view/axes/VPolarCoordinateSystem.cxx @@ -173,7 +173,7 @@ void VPolarCoordinateSystem::createGridShapes() if(!xAxis.is() || !AxisHelper::shouldAxisBeDisplayed( xAxis, m_xCooSysModel )) continue; - VPolarGrid aGrid(nDimensionIndex,nDimensionCount,this->getGridListFromAxis( xAxis )); + VPolarGrid aGrid(nDimensionIndex,nDimensionCount,getGridListFromAxis( xAxis )); aGrid.setIncrements( this->getExplicitIncrements( nDimensionIndex, nAxisIndex ) ); aGrid.initPlotter(m_xLogicTargetForGrids,m_xFinalTarget,m_xShapeFactory , this->createCIDForGrid( xAxis, nDimensionIndex, nAxisIndex ) ); diff --git a/chart2/source/view/charttypes/AreaChart.cxx b/chart2/source/view/charttypes/AreaChart.cxx index 911a6258fa36..7763f2cfe9e9 100644 --- a/chart2/source/view/charttypes/AreaChart.cxx +++ b/chart2/source/view/charttypes/AreaChart.cxx @@ -462,7 +462,7 @@ bool AreaChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -538,7 +538,7 @@ bool AreaChart::impl_createArea( VDataSeries* pSeries xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); } - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/AreaChart.hxx b/chart2/source/view/charttypes/AreaChart.hxx index 1c50f79cdcb4..e6c2d080a001 100644 --- a/chart2/source/view/charttypes/AreaChart.hxx +++ b/chart2/source/view/charttypes/AreaChart.hxx @@ -63,7 +63,7 @@ private: //methods bool impl_createLine( VDataSeries* pSeries , ::com::sun::star::drawing::PolyPolygonShape3D* pSeriesPoly , PlottingPositionHelper* pPosHelper ); - bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly + static bool create_stepped_line( ::com::sun::star::drawing::PolyPolygonShape3D aStartPoly , ::com::sun::star::chart2::CurveStyle eCurveStyle , PlottingPositionHelper* pPosHelper , ::com::sun::star::drawing::PolyPolygonShape3D &aPoly ); diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index e5cbbe40915a..6184d01e2470 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -316,7 +316,7 @@ uno::Reference< drawing::XShape > BarChart::createDataPoint3D_Bar( return xShape; } if( nGeometry3D != DataPointGeometry3D::PYRAMID ) - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); return xShape; } @@ -801,7 +801,7 @@ void BarChart::createShapes() AddPointToPoly( aPoly, drawing::Position3D( fLogicX-fLogicBarWidth/2.0,fLowerYValue,fLogicZ) ); pPosHelper->transformScaledLogicToScene( aPoly ); xShape = m_pShapeFactory->createArea2D( xPointGroupShape_Shapes, aPoly ); - this->setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); + setMappedProperties( xShape, xDataPointProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } if(bHasFillColorMapping) @@ -913,7 +913,7 @@ void BarChart::createShapes() getSeriesGroupShape(*aSeriesIter, xSeriesTarget) ); uno::Reference< drawing::XShape > xShape( m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes, PolyToPointSequence( aPoly ) ) ); - this->setMappedProperties( xShape, pSeries->getPropertiesOfSeries() + setMappedProperties( xShape, pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); } } diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index cce9a3349989..2adc03c6fb71 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -317,7 +317,7 @@ void BubbleChart::createShapes() xShape = m_pShapeFactory->createCircle2D( xPointGroupShape_Shapes , aScenePosition, aSymbolSize ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfPoint( nIndex ) , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 50e3d2f5519b..c3621ceaf1cf 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -239,7 +239,7 @@ void CandleStickChart::createShapes() uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xPointGroupShape_Shapes, PolyToPointSequence(aPoly), NULL); - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } //create first-last shape @@ -294,7 +294,7 @@ void CandleStickChart::createShapes() uno::Reference< beans::XPropertySet > xProp( xShape, uno::UNO_QUERY ); if(xProp.is()) { - this->setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); + setMappedProperties( xShape, xPointProp, PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); } } } diff --git a/chart2/source/view/charttypes/GL3DBarChart.cxx b/chart2/source/view/charttypes/GL3DBarChart.cxx index 6b778138309c..09fef837f55f 100644 --- a/chart2/source/view/charttypes/GL3DBarChart.cxx +++ b/chart2/source/view/charttypes/GL3DBarChart.cxx @@ -424,7 +424,7 @@ void RenderBenchMarkThread::ProcessClickFlyBack() if (!mbNeedFlyBack) return; osl_getSystemTime(&maClickFlyBackEndTime); - int nDeltaMs = mpChart->calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); + int nDeltaMs = GL3DBarChart::calcTimeInterval(maClickFlyBackStartTime, maClickFlyBackEndTime); if(nDeltaMs >= 10000) { mpChart->maRenderEvent = EVENT_MOVE_TO_DEFAULT; diff --git a/chart2/source/view/charttypes/NetChart.cxx b/chart2/source/view/charttypes/NetChart.cxx index 854fc073ee71..5bd26237adb4 100644 --- a/chart2/source/view/charttypes/NetChart.cxx +++ b/chart2/source/view/charttypes/NetChart.cxx @@ -170,7 +170,7 @@ bool NetChart::impl_createLine( VDataSeries* pSeries { xShape = m_pShapeFactory->createLine2D( xSeriesGroupShape_Shapes , PolyToPointSequence( aPoly ) ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForLineSeriesProperties() ); //because of this name this line will be used for marking @@ -241,7 +241,7 @@ bool NetChart::impl_createArea( VDataSeries* pSeries uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createArea2D( xSeriesGroupShape_Shapes , aPoly ); - this->setMappedProperties( xShape + setMappedProperties( xShape , pSeries->getPropertiesOfSeries() , PropertyMapper::getPropertyNameMapForFilledSeriesProperties() ); //because of this name this line will be used for marking diff --git a/chart2/source/view/charttypes/PieChart.cxx b/chart2/source/view/charttypes/PieChart.cxx index 58f1b04348f6..21233648dcbc 100644 --- a/chart2/source/view/charttypes/PieChart.cxx +++ b/chart2/source/view/charttypes/PieChart.cxx @@ -263,7 +263,7 @@ uno::Reference< drawing::XShape > PieChart::createDataPoint( , rParam.mfUnitCircleInnerRadius, rParam.mfUnitCircleOuterRadius , aOffset, B3DHomMatrixToHomogenMatrix( m_pPosHelper->getUnitCartesianToScene() ) ); } - this->setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); + setMappedProperties( xShape, xObjectProperties, PropertyMapper::getPropertyNameMapForFilledSeriesProperties(), pOverwritePropertiesMap ); return xShape; } diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 471c6c923575..52e75964b1ff 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -929,7 +929,7 @@ void VSeriesPlotter::createErrorBar( } uno::Reference< drawing::XShape > xShape = m_pShapeFactory->createLine2D( xTarget, PolyToPointSequence( aPoly) ); - this->setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); + setMappedProperties( xShape, xErrorBarProperties, PropertyMapper::getPropertyNameMapForLineProperties() ); } catch( const uno::Exception & e ) { diff --git a/chart2/source/view/inc/GL3DBarChart.hxx b/chart2/source/view/inc/GL3DBarChart.hxx index c68a38510d66..9f8664d73fce 100644 --- a/chart2/source/view/inc/GL3DBarChart.hxx +++ b/chart2/source/view/inc/GL3DBarChart.hxx @@ -103,7 +103,7 @@ private: void updateRenderFPS(); void updateDataUpdateFPS(); DECL_LINK(UpdateTimerHdl, void*); - int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); + static int calcTimeInterval(TimeValue &startTime, TimeValue &endTime); float addScreenTextShape(OUString &nStr, const glm::vec2& rLeftOrRightTop, float nTextHeight, bool bLeftTopFlag = true, const glm::vec4& rColor = glm::vec4(0.0f, 1.0f, 1.0f, 0.0f), const glm::vec3& rPos = glm::vec3(0.0f, 0.0f, 0.0f), @@ -111,10 +111,10 @@ private: void recordBarHistory(sal_uInt32 &nBarID, float &nVal); void updateClickEvent(); void calcDistance(std::vector<sal_uInt32> &vectorNearest); - float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); + static float calcScrollDistance(const glm::mat4 &mvp, const glm::vec3& rPos); void initDistanceHeap(std::vector<sal_uInt32> &vectorNearest); void keepHeap(std::vector<sal_uInt32> &vectorNearest, int index); - void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); + static void swapVector(int i, int j, std::vector<sal_uInt32> &vectorNearest); void getNearestBars(std::vector<sal_uInt32> &vectorNearest); void updateScroll(); void processAutoFly(sal_uInt32 nId, sal_uInt32 nColor); diff --git a/chart2/source/view/inc/GL3DRenderer.hxx b/chart2/source/view/inc/GL3DRenderer.hxx index 69eabae5b78d..afaa0f0e278e 100644 --- a/chart2/source/view/inc/GL3DRenderer.hxx +++ b/chart2/source/view/inc/GL3DRenderer.hxx @@ -228,7 +228,7 @@ public: private: void MoveModelf( const PosVecf3& trans, const PosVecf3& angle, const PosVecf3& scale); - void ClearBuffer(); + static void ClearBuffer(); void RenderPolygon3DObject(); void RenderLine3D(const Polygon3DInfo &polygon); void RenderPolygon3D(const Polygon3DInfo &polygon); @@ -247,17 +247,17 @@ private: void AddNormalData(GLuint normalBuf); void AddIndexData(GLuint indexBuf); void RenderNonRoundedBar(const Extrude3DInfo& extrude3D); - bool GetSimilarVertexIndex(PackedVertex & packed, + static bool GetSimilarVertexIndex(PackedVertex & packed, std::map<PackedVertex,unsigned short> & VertexToOutIndex, unsigned short & result ); - void SetVertex(PackedVertex &packed, + static void SetVertex(PackedVertex &packed, std::map<PackedVertex,unsigned short> &VertexToOutIndex, std::vector<glm::vec3> &vertex, std::vector<glm::vec3> &normal, std::vector<unsigned short> &indeices); void CreateActualRoundedCube(float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); - int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, + static int GenerateRoundCornerBar(std::vector<glm::vec3> &vertices, std::vector<glm::vec3> &normals, float fRadius, int iSubDivY, int iSubDivZ, float width, float height, float depth); void CreateSceneBoxView(); diff --git a/chart2/source/view/inc/Stripe.hxx b/chart2/source/view/inc/Stripe.hxx index 0656cc565291..20ba20f6657c 100644 --- a/chart2/source/view/inc/Stripe.hxx +++ b/chart2/source/view/inc/Stripe.hxx @@ -52,9 +52,9 @@ public: void InvertNormal( bool bInvertNormal ); - ::com::sun::star::uno::Any getPolyPolygonShape3D() const; - ::com::sun::star::uno::Any getNormalsPolygon() const; - ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ) const; //0 to 7 are the different possibilities + ::com::sun::star::uno::Any getPolyPolygonShape3D() const; + ::com::sun::star::uno::Any getNormalsPolygon() const; + static ::com::sun::star::uno::Any getTexturePolygon( short nRotatedTexture ); //0 to 7 are the different possibilities ::com::sun::star::drawing::Position3D GetPosition1() const { return m_aPoint1; } ::com::sun::star::drawing::Position3D GetPosition2() const { return m_aPoint2; } diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index 291c1a2c1c64..ea64683a7e28 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -143,7 +143,7 @@ protected: //methods ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis > getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) const; - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > + static ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > > getGridListFromAxis( const ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XAxis >& xAxis ); VAxisBase* getVAxis( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); @@ -161,7 +161,7 @@ protected: //methods ::com::sun::star::chart2::XChartDocument>& xChartDoc); private: //methods - void impl_adjustDimension( sal_Int32& rDimensionIndex ) const; + static void impl_adjustDimension( sal_Int32& rDimensionIndex ); void impl_adjustDimensionAndIndex( sal_Int32& rDimensionIndex, sal_Int32& rAxisIndex ) const; protected: //member diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 03bbc8083eb2..84d1d3f52fde 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -405,7 +405,7 @@ protected: ::com::sun::star::chart2::XRegressionCurveCalculator > & xRegressionCurveCalculator , ::com::sun::star::awt::Point aDefaultPos ); - void setMappedProperties( + static void setMappedProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xTarget , const ::com::sun::star::uno::Reference< diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index b165b442f895..1251eafbfb49 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -1004,7 +1004,7 @@ uno::Reference< drawing::XShape > //TexturePolygon xProp->setPropertyValue( UNO_NAME_3D_TEXTUREPOLYGON3D - , rStripe.getTexturePolygon( nRotatedTexture ) ); + , Stripe::getTexturePolygon( nRotatedTexture ) ); //Normals Polygon xProp->setPropertyValue( UNO_NAME_3D_NORMALSPOLYGON3D diff --git a/chart2/source/view/main/Stripe.cxx b/chart2/source/view/main/Stripe.cxx index 6d4bb9074f0d..c9455a0e9d53 100644 --- a/chart2/source/view/main/Stripe.cxx +++ b/chart2/source/view/main/Stripe.cxx @@ -175,7 +175,7 @@ uno::Any Stripe::getNormalsPolygon() const return uno::Any( &aPP, cppu::UnoType<drawing::PolyPolygonShape3D>::get()); } -uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) const +uno::Any Stripe::getTexturePolygon( short nRotatedTexture ) { drawing::PolyPolygonShape3D aPP; |