diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 08:49:02 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-17 09:56:19 +0200 |
commit | be021ba04d56b45bcb3c6cf09c193abc7f5e9dc0 (patch) | |
tree | 45b115f291656beae84161a65c71b204f844c44b /chart2/source/model/template/ChartTypeTemplate.cxx | |
parent | drop enum NormalAxis (diff) | |
download | core-be021ba04d56b45bcb3c6cf09c193abc7f5e9dc0.tar.gz core-be021ba04d56b45bcb3c6cf09c193abc7f5e9dc0.zip |
convert StackMode to scoped enum
and drop unused AMBIGUOUS enumerator
Change-Id: I71954d75a64928061c0e520beb47f979c53ee5a8
Diffstat (limited to 'chart2/source/model/template/ChartTypeTemplate.cxx')
-rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 76fc37d00564..d876ae0c4c56 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -389,10 +389,10 @@ void SAL_CALL ChartTypeTemplate::applyStyle( { StackMode eStackMode = getStackMode( nChartTypeIndex ); const uno::Any aPropValue = uno::Any( - ( (eStackMode == StackMode_Y_STACKED) || - (eStackMode == StackMode_Y_STACKED_PERCENT) ) + ( (eStackMode == StackMode::YStacked) || + (eStackMode == StackMode::YStackedPercent) ) ? chart2::StackingDirection_Y_STACKING - : (eStackMode == StackMode_Z_STACKED ) + : (eStackMode == StackMode::ZStacked ) ? chart2::StackingDirection_Z_STACKING : chart2::StackingDirection_NO_STACKING ); xSeriesProp->setPropertyValue( "StackingDirection", aPropValue ); @@ -435,7 +435,7 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) { // reset number format if we had percent stacking on - bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); + bool bPercent = (getStackMode(0) == StackMode::YStackedPercent); if( bPercent ) { Sequence< Reference< chart2::XAxis > > aAxisSeq( AxisHelper::getAllAxesOfDiagram( xDiagram ) ); @@ -523,7 +523,7 @@ sal_Int32 ChartTypeTemplate::getDimension() const StackMode ChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) const { - return StackMode_NONE; + return StackMode::NONE; } bool ChartTypeTemplate::isSwapXAndY() const @@ -652,7 +652,7 @@ void ChartTypeTemplate::adaptScales( Reference< chart2::XAxis > xAxis( xCooSys->getAxisByDimension( 1,nI )); if( xAxis.is()) { - bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); + bool bPercent = (getStackMode(0) == StackMode::YStackedPercent); chart2::ScaleData aScaleData = xAxis->getScaleData(); if( bPercent != (aScaleData.AxisType==AxisType::PERCENT) ) @@ -738,7 +738,7 @@ void ChartTypeTemplate::adaptAxes( if( nAxisIndex == MAIN_AXIS_INDEX || nAxisIndex == SECONDARY_AXIS_INDEX ) { // adapt scales - bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); + bool bPercent = (getStackMode(0) == StackMode::YStackedPercent); if( bPercent && nDim == 1 ) { Reference< beans::XPropertySet > xAxisProp( xAxis, uno::UNO_QUERY ); |