diff options
author | Noel Grandin <noel@peralex.com> | 2016-03-01 20:38:22 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2016-03-02 07:57:38 +0200 |
commit | f69585c35411ca74e17bb6cd1cf535489472a4c2 (patch) | |
tree | b5a8f3df94dea50d1f6bf498041e8f0bc7cb3fbd /chart2/source/view | |
parent | 33265f52dfa6a4612156288a170a8e41cff2cfd8 (diff) |
loplugin:unuseddefaultparams in chart2
Change-Id: I03a3580fdbd1f6cf08af329b07edcfe09ecbb9aa
Diffstat (limited to 'chart2/source/view')
-rw-r--r-- | chart2/source/view/charttypes/VSeriesPlotter.cxx | 5 | ||||
-rw-r--r-- | chart2/source/view/inc/PlottingPositionHelper.hxx | 13 | ||||
-rw-r--r-- | chart2/source/view/inc/VLineProperties.hxx | 6 | ||||
-rw-r--r-- | chart2/source/view/inc/VSeriesPlotter.hxx | 3 | ||||
-rw-r--r-- | chart2/source/view/main/VLineProperties.cxx | 16 |
5 files changed, 11 insertions, 32 deletions
diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 6c789cd8146b..380a84dde736 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -1025,8 +1025,7 @@ void VSeriesPlotter::createErrorBar( void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex - , const uno::Reference< drawing::XShapes >& xTarget - , double* pfScaledLogicX ) + , const uno::Reference< drawing::XShapes >& xTarget ) { if(m_nDimension!=2) return; @@ -1041,7 +1040,7 @@ void VSeriesPlotter::createErrorBar_X( const drawing::Position3D& rUnscaledLogic , rUnscaledLogicPosition, xErrorBarProp , rVDataSeries, nPointIndex , false /* bYError */ - , pfScaledLogicX ); + , nullptr ); } } diff --git a/chart2/source/view/inc/PlottingPositionHelper.hxx b/chart2/source/view/inc/PlottingPositionHelper.hxx index 9a568f1db10b..c4ddffe93968 100644 --- a/chart2/source/view/inc/PlottingPositionHelper.hxx +++ b/chart2/source/view/inc/PlottingPositionHelper.hxx @@ -60,12 +60,12 @@ public: inline bool isStrongLowerRequested( sal_Int32 nDimensionIndex ) const; inline bool isLogicVisible( double fX, double fY, double fZ ) const; inline void doLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const; - inline void doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip=false ) const; + inline void doUnshiftedLogicScaling( double* pX, double* pY, double* pZ ) const; inline void clipLogicValues( double* pX, double* pY, double* pZ ) const; void clipScaledLogicValues( double* pX, double* pY, double* pZ ) const; inline bool clipYRange( double& rMin, double& rMax ) const; - inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip=false ) const; + inline void doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const; virtual ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XTransformation > getTransformationScaledLogicToScene() const; @@ -323,11 +323,8 @@ void PlottingPositionHelper::doLogicScaling( double* pX, double* pY, double* pZ, } } -void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, double* pZ, bool bClip ) const +void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, double* pZ ) const { - if(bClip) - this->clipLogicValues( pX,pY,pZ ); - if(pX && m_aScales[0].Scaling.is()) *pX = m_aScales[0].Scaling->doScaling(*pX); if(pY && m_aScales[1].Scaling.is()) @@ -336,9 +333,9 @@ void PlottingPositionHelper::doUnshiftedLogicScaling( double* pX, double* pY, do *pZ = m_aScales[2].Scaling->doScaling(*pZ); } -void PlottingPositionHelper::doLogicScaling( ::com::sun::star::drawing::Position3D& rPos, bool bClip ) const +void PlottingPositionHelper::doLogicScaling( ::com::sun::star::drawing::Position3D& rPos ) const { - doLogicScaling( &rPos.PositionX, &rPos.PositionY, &rPos.PositionZ, bClip ); + doLogicScaling( &rPos.PositionX, &rPos.PositionY, &rPos.PositionZ ); } void PlottingPositionHelper::clipLogicValues( double* pX, double* pY, double* pZ ) const diff --git a/chart2/source/view/inc/VLineProperties.hxx b/chart2/source/view/inc/VLineProperties.hxx index 23de24c0cc61..51a9ea73f2ab 100644 --- a/chart2/source/view/inc/VLineProperties.hxx +++ b/chart2/source/view/inc/VLineProperties.hxx @@ -25,9 +25,6 @@ namespace chart { -/** -*/ - struct VLineProperties { com::sun::star::uno::Any Color; //type sal_Int32 UNO_NAME_LINECOLOR @@ -38,8 +35,7 @@ struct VLineProperties VLineProperties(); void initFromPropertySet( const ::com::sun::star::uno::Reference< - ::com::sun::star::beans::XPropertySet >& xProp - , bool bUseSeriesPropertyNames=false ); + ::com::sun::star::beans::XPropertySet >& xProp ); bool isLineVisible() const; }; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index dec486aa3b1d..c6873bdf2098 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -382,8 +382,7 @@ protected: void createErrorBar_X( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex , const ::com::sun::star::uno::Reference< - ::com::sun::star::drawing::XShapes >& xTarget - , double* pfScaledLogicX=nullptr ); + ::com::sun::star::drawing::XShapes >& xTarget ); void createErrorBar_Y( const ::com::sun::star::drawing::Position3D& rUnscaledLogicPosition , VDataSeries& rVDataSeries, sal_Int32 nPointIndex diff --git a/chart2/source/view/main/VLineProperties.cxx b/chart2/source/view/main/VLineProperties.cxx index 8cf06e6913bf..e3486ce84cf3 100644 --- a/chart2/source/view/main/VLineProperties.cxx +++ b/chart2/source/view/main/VLineProperties.cxx @@ -35,23 +35,11 @@ VLineProperties::VLineProperties() this->Width = uno::makeAny( sal_Int32(0) );//type sal_Int32 for property UNO_NAME_LINEWIDTH } -void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp, bool bUseSeriesPropertyNames ) +void VLineProperties::initFromPropertySet( const uno::Reference< beans::XPropertySet >& xProp ) { if(xProp.is()) { - if( bUseSeriesPropertyNames ) try - { - this->Color = xProp->getPropertyValue( "BorderColor" ); - this->LineStyle = xProp->getPropertyValue( "BorderStyle" ); - this->Transparence = xProp->getPropertyValue( "BorderTransparency" ); - this->Width = xProp->getPropertyValue( "BorderWidth" ); - this->DashName = xProp->getPropertyValue( "BorderDashName" ); - } - catch( const uno::Exception& e ) - { - ASSERT_EXCEPTION( e ); - } - else try + try { this->Color = xProp->getPropertyValue( "LineColor" ); this->LineStyle = xProp->getPropertyValue( "LineStyle" ); |