diff options
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx | 14 | ||||
| -rw-r--r-- | chart2/source/inc/StackMode.hxx | 11 | ||||
| -rw-r--r-- | chart2/source/model/template/BubbleChartTypeTemplate.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/ChartTypeManager.cxx | 94 | ||||
| -rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.cxx | 14 | ||||
| -rw-r--r-- | chart2/source/model/template/ChartTypeTemplate.hxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/ColumnLineChartTypeTemplate.cxx | 2 | ||||
| -rw-r--r-- | chart2/source/model/template/ScatterChartTypeTemplate.cxx | 4 | ||||
| -rw-r--r-- | chart2/source/tools/ChartTypeHelper.cxx | 6 | ||||
| -rw-r--r-- | chart2/source/tools/DataSeriesHelper.cxx | 11 | ||||
| -rw-r--r-- | chart2/source/tools/DiagramHelper.cxx | 27 | ||||
| -rwxr-xr-x | compilerplugins/clang/unusedenumconstants.py | 1 |
13 files changed, 94 insertions, 100 deletions
diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 705f9fc2eb1e..4493a48c647d 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -671,11 +671,11 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) //correct stacking mode if( bStacked || bPercent || bDeep ) { - StackMode eStackMode = StackMode_Y_STACKED; + StackMode eStackMode = StackMode::YStacked; if( bDeep ) - eStackMode = StackMode_Z_STACKED; + eStackMode = StackMode::ZStacked; else if( bPercent ) - eStackMode = StackMode_Y_STACKED_PERCENT; + eStackMode = StackMode::YStackedPercent; DiagramHelper::setStackMode( xDia, eStackMode ); } diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index e18882add0da..1d67914e2431 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -1273,13 +1273,13 @@ WrappedStackingProperty::WrappedStackingProperty(StackMode eStackMode, const std { switch( m_eStackMode ) { - case StackMode_Y_STACKED: + case StackMode::YStacked: m_aOuterName = "Stacked"; break; - case StackMode_Y_STACKED_PERCENT: + case StackMode::YStackedPercent: m_aOuterName = "Percent"; break; - case StackMode_Z_STACKED: + case StackMode::ZStacked: m_aOuterName = "Deep"; break; default: @@ -1320,7 +1320,7 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) { - StackMode eNewStackMode = bNewValue ? m_eStackMode : StackMode_NONE; + StackMode eNewStackMode = bNewValue ? m_eStackMode : StackMode::NONE; DiagramHelper::setStackMode( xDiagram, eNewStackMode ); } } @@ -1913,9 +1913,9 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() WrappedGL3DProperties::addWrappedProperties(aWrappedProperties, m_spChart2ModelContact); aWrappedProperties.push_back( new WrappedDataRowSourceProperty( m_spChart2ModelContact ) ); - aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED,m_spChart2ModelContact ) ); - aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Y_STACKED_PERCENT, m_spChart2ModelContact ) ); - aWrappedProperties.push_back( new WrappedStackingProperty( StackMode_Z_STACKED, m_spChart2ModelContact ) ); + aWrappedProperties.push_back( new WrappedStackingProperty( StackMode::YStacked,m_spChart2ModelContact ) ); + aWrappedProperties.push_back( new WrappedStackingProperty( StackMode::YStackedPercent, m_spChart2ModelContact ) ); + aWrappedProperties.push_back( new WrappedStackingProperty( StackMode::ZStacked, m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedDim3DProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedVerticalProperty( m_spChart2ModelContact ) ); aWrappedProperties.push_back( new WrappedNumberOfLinesProperty( m_spChart2ModelContact ) ); diff --git a/chart2/source/inc/StackMode.hxx b/chart2/source/inc/StackMode.hxx index 43b8f1f9ad0d..dd6fceeabb95 100644 --- a/chart2/source/inc/StackMode.hxx +++ b/chart2/source/inc/StackMode.hxx @@ -24,13 +24,12 @@ namespace chart // needed for chart type templates -enum StackMode +enum class StackMode { - StackMode_NONE = 0, - StackMode_Y_STACKED, - StackMode_Y_STACKED_PERCENT, - StackMode_Z_STACKED, - StackMode_AMBIGUOUS + NONE, + YStacked, + YStackedPercent, + ZStacked }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index 1ee18079f5fb..71c77ff75c37 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -137,7 +137,7 @@ sal_Int32 BubbleChartTypeTemplate::getDimension() const StackMode BubbleChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) const { - return StackMode_NONE; + return StackMode::NONE; } void SAL_CALL BubbleChartTypeTemplate::applyStyle( diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index a746bf29fdd3..c98d79760cf9 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -267,114 +267,114 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // Point (category x axis) case TEMPLATE_SYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, true, false )); + StackMode::NONE, true, false )); break; case TEMPLATE_STACKEDSYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, true, false )); + StackMode::YStacked, true, false )); break; case TEMPLATE_PERCENTSTACKEDSYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, true, false )); + StackMode::YStackedPercent, true, false )); break; // Line (category x axis) case TEMPLATE_LINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, false )); + StackMode::NONE, false )); break; case TEMPLATE_STACKEDLINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, false )); + StackMode::YStacked, false )); break; case TEMPLATE_PERCENTSTACKEDLINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, false )); + StackMode::YStackedPercent, false )); break; case TEMPLATE_LINESYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, true )); + StackMode::NONE, true )); break; case TEMPLATE_STACKEDLINESYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, true )); + StackMode::YStacked, true )); break; case TEMPLATE_PERCENTSTACKEDLINESYMBOL: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, true )); + StackMode::YStackedPercent, true )); break; case TEMPLATE_THREEDLINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, false, true, 3 )); + StackMode::NONE, false, true, 3 )); break; case TEMPLATE_STACKEDTHREEDLINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, false, true, 3 )); + StackMode::YStacked, false, true, 3 )); break; case TEMPLATE_PERCENTSTACKEDTHREEDLINE: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, false, true, 3 )); + StackMode::YStackedPercent, false, true, 3 )); break; case TEMPLATE_THREEDLINEDEEP: xTemplate.set( new LineChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Z_STACKED, false, true, 3 )); + StackMode::ZStacked, false, true, 3 )); break; // Bar/Column case TEMPLATE_COLUMN: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, BarChartTypeTemplate::VERTICAL )); + StackMode::NONE, BarChartTypeTemplate::VERTICAL )); break; case TEMPLATE_STACKEDCOLUMN: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, BarChartTypeTemplate::VERTICAL )); + StackMode::YStacked, BarChartTypeTemplate::VERTICAL )); break; case TEMPLATE_PERCENTSTACKEDCOLUMN: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, BarChartTypeTemplate::VERTICAL )); + StackMode::YStackedPercent, BarChartTypeTemplate::VERTICAL )); break; case TEMPLATE_BAR: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, BarChartTypeTemplate::HORIZONTAL )); + StackMode::NONE, BarChartTypeTemplate::HORIZONTAL )); break; case TEMPLATE_STACKEDBAR: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, BarChartTypeTemplate::HORIZONTAL )); + StackMode::YStacked, BarChartTypeTemplate::HORIZONTAL )); break; case TEMPLATE_PERCENTSTACKEDBAR: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, BarChartTypeTemplate::HORIZONTAL )); + StackMode::YStackedPercent, BarChartTypeTemplate::HORIZONTAL )); break; case TEMPLATE_THREEDCOLUMNDEEP: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Z_STACKED, BarChartTypeTemplate::VERTICAL, 3 )); + StackMode::ZStacked, BarChartTypeTemplate::VERTICAL, 3 )); break; case TEMPLATE_THREEDCOLUMNFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, BarChartTypeTemplate::VERTICAL, 3 )); + StackMode::NONE, BarChartTypeTemplate::VERTICAL, 3 )); break; case TEMPLATE_STACKEDTHREEDCOLUMNFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, BarChartTypeTemplate::VERTICAL, 3 )); + StackMode::YStacked, BarChartTypeTemplate::VERTICAL, 3 )); break; case TEMPLATE_PERCENTSTACKEDTHREEDCOLUMNFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, BarChartTypeTemplate::VERTICAL, 3 )); + StackMode::YStackedPercent, BarChartTypeTemplate::VERTICAL, 3 )); break; case TEMPLATE_THREEDBARDEEP: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Z_STACKED, BarChartTypeTemplate::HORIZONTAL, 3 )); + StackMode::ZStacked, BarChartTypeTemplate::HORIZONTAL, 3 )); break; case TEMPLATE_THREEDBARFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, BarChartTypeTemplate::HORIZONTAL, 3 )); + StackMode::NONE, BarChartTypeTemplate::HORIZONTAL, 3 )); break; case TEMPLATE_STACKEDTHREEDBARFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, BarChartTypeTemplate::HORIZONTAL, 3 )); + StackMode::YStacked, BarChartTypeTemplate::HORIZONTAL, 3 )); break; case TEMPLATE_PERCENTSTACKEDTHREEDBARFLAT: xTemplate.set( new BarChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, BarChartTypeTemplate::HORIZONTAL, 3 )); + StackMode::YStackedPercent, BarChartTypeTemplate::HORIZONTAL, 3 )); break; // Combi-Chart Line/Column @@ -382,8 +382,8 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( case TEMPLATE_STACKEDCOLUMNWITHLINE: { StackMode eMode = ( nId == TEMPLATE_COLUMNWITHLINE ) - ? StackMode_NONE - : StackMode_Y_STACKED; + ? StackMode::NONE + : StackMode::YStacked; xTemplate.set( new ColumnLineChartTypeTemplate( m_xContext, aServiceSpecifier, eMode, 1 )); } @@ -391,22 +391,22 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // Area case TEMPLATE_AREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_NONE )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::NONE )); break; case TEMPLATE_STACKEDAREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_Y_STACKED )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::YStacked )); break; case TEMPLATE_PERCENTSTACKEDAREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_Y_STACKED_PERCENT )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::YStackedPercent )); break; case TEMPLATE_THREEDAREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_Z_STACKED, 3 )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::ZStacked, 3 )); break; case TEMPLATE_STACKEDTHREEDAREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_Y_STACKED, 3 )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::YStacked, 3 )); break; case TEMPLATE_PERCENTSTACKEDTHREEDAREA: - xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode_Y_STACKED_PERCENT, 3 )); + xTemplate.set( new AreaChartTypeTemplate( m_xContext, aServiceSpecifier, StackMode::YStackedPercent, 3 )); break; case TEMPLATE_PIE: @@ -458,54 +458,54 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( // NetChart case TEMPLATE_NET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, true )); + StackMode::NONE, true )); break; case TEMPLATE_NETSYMBOL: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, true, false )); + StackMode::NONE, true, false )); break; case TEMPLATE_NETLINE: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, false )); + StackMode::NONE, false )); break; case TEMPLATE_STACKEDNET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, true )); + StackMode::YStacked, true )); break; case TEMPLATE_STACKEDNETSYMBOL: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, true, false )); + StackMode::YStacked, true, false )); break; case TEMPLATE_STACKEDNETLINE: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, false, true )); + StackMode::YStacked, false, true )); break; case TEMPLATE_PERCENTSTACKEDNET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, true )); + StackMode::YStackedPercent, true )); break; case TEMPLATE_PERCENTSTACKEDNETSYMBOL: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, true, false )); + StackMode::YStackedPercent, true, false )); break; case TEMPLATE_PERCENTSTACKEDNETLINE: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, false, true )); + StackMode::YStackedPercent, false, true )); break; case TEMPLATE_FILLEDNET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_NONE, false, false, true )); + StackMode::NONE, false, false, true )); break; case TEMPLATE_STACKEDFILLEDNET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED, false, false, true )); + StackMode::YStacked, false, false, true )); break; case TEMPLATE_PERCENTSTACKEDFILLEDNET: xTemplate.set( new NetChartTypeTemplate( m_xContext, aServiceSpecifier, - StackMode_Y_STACKED_PERCENT, false, false, true )); + StackMode::YStackedPercent, false, false, true )); break; case TEMPLATE_STOCKLOWHIGHCLOSE: 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 ); diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index c32fcbd7934a..4cf11ca6cdae 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -118,7 +118,7 @@ protected: /// returns 2 by default. Supported are 2 and 3 virtual sal_Int32 getDimension() const; - /** returns StackMode_NONE by default. This is a global flag used for all + /** returns StackMode::NONE by default. This is a global flag used for all series of a specific chart type. If percent stacking is supported, the percent stacking mode is retrieved from the first chart type (index 0) diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 33bac477aaf7..f6dd85178eec 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -260,7 +260,7 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) { if( nChartTypeIndex == 0 ) return m_eStackMode; - return StackMode_NONE; + return StackMode::NONE; } // ____ XChartTypeTemplate ____ diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index e510280b215f..fe216ea59b9a 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -192,8 +192,8 @@ sal_Int32 ScatterChartTypeTemplate::getDimension() const StackMode ScatterChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) const { if( m_nDim == 3 ) - return StackMode_Z_STACKED; - return StackMode_NONE; + return StackMode::ZStacked; + return StackMode::NONE; } void SAL_CALL ScatterChartTypeTemplate::applyStyle( diff --git a/chart2/source/tools/ChartTypeHelper.cxx b/chart2/source/tools/ChartTypeHelper.cxx index a1cf6222c88b..f822e29ba0e7 100644 --- a/chart2/source/tools/ChartTypeHelper.cxx +++ b/chart2/source/tools/ChartTypeHelper.cxx @@ -45,7 +45,7 @@ bool ChartTypeHelper::isSupportingAxisSideBySide( bool bFound=false; bool bAmbiguous=false; StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); - if( eStackMode == StackMode_NONE && !bAmbiguous ) + if( eStackMode == StackMode::NONE && !bAmbiguous ) { OUString aChartTypeName = xChartType->getChartType(); bResult = ( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || @@ -223,7 +223,7 @@ bool ChartTypeHelper::isSupportingBarConnectors( bool bFound=false; bool bAmbiguous=false; StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); - if( eStackMode != StackMode_Y_STACKED || bAmbiguous ) + if( eStackMode != StackMode::YStacked || bAmbiguous ) return false; OUString aChartTypeName = xChartType->getChartType(); @@ -574,7 +574,7 @@ uno::Sequence < sal_Int32 > ChartTypeHelper::getSupportedMissingValueTreatments( bool bFound=false; bool bAmbiguous=false; StackMode eStackMode = DiagramHelper::getStackModeFromChartType( xChartType, bFound, bAmbiguous, nullptr ); - bool bStacked = bFound && (StackMode_Y_STACKED == eStackMode); + bool bStacked = bFound && (StackMode::YStacked == eStackMode); OUString aChartTypeName = xChartType->getChartType(); if( aChartTypeName.match(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN) || diff --git a/chart2/source/tools/DataSeriesHelper.cxx b/chart2/source/tools/DataSeriesHelper.cxx index 2ca3a1d823b1..5837ea28f872 100644 --- a/chart2/source/tools/DataSeriesHelper.cxx +++ b/chart2/source/tools/DataSeriesHelper.cxx @@ -387,14 +387,11 @@ void setStackModeAtSeries( const Reference< chart2::XCoordinateSystem > & xCorrespondingCoordinateSystem, StackMode eStackMode ) { - if( eStackMode == StackMode_AMBIGUOUS ) - return; - const uno::Any aPropValue( - ( (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 ); @@ -435,7 +432,7 @@ void setStackModeAtSeries( xCorrespondingCoordinateSystem->getAxisByDimension( 1, nAxisIndex )); if( xAxis.is()) { - bool bPercent = (eStackMode == StackMode_Y_STACKED_PERCENT); + bool bPercent = (eStackMode == StackMode::YStackedPercent); chart2::ScaleData aScaleData = xAxis->getScaleData(); if( bPercent != (aScaleData.AxisType==chart2::AxisType::PERCENT) ) diff --git a/chart2/source/tools/DiagramHelper.cxx b/chart2/source/tools/DiagramHelper.cxx index c70f7e19c6f4..1866bf1788ee 100644 --- a/chart2/source/tools/DiagramHelper.cxx +++ b/chart2/source/tools/DiagramHelper.cxx @@ -232,9 +232,6 @@ void DiagramHelper::setStackMode( { try { - if( eStackMode == StackMode_AMBIGUOUS ) - return; - bool bValueFound = false; bool bIsAmbiguous = false; StackMode eOldStackMode = DiagramHelper::getStackMode( xDiagram, bValueFound, bIsAmbiguous ); @@ -243,15 +240,15 @@ void DiagramHelper::setStackMode( return; StackingDirection eNewDirection = StackingDirection_NO_STACKING; - if( eStackMode == StackMode_Y_STACKED || eStackMode == StackMode_Y_STACKED_PERCENT ) + if( eStackMode == StackMode::YStacked || eStackMode == StackMode::YStackedPercent ) eNewDirection = StackingDirection_Y_STACKING; - else if( eStackMode == StackMode_Z_STACKED ) + else if( eStackMode == StackMode::ZStacked ) eNewDirection = StackingDirection_Z_STACKING; uno::Any aNewDirection( eNewDirection ); bool bPercent = false; - if( eStackMode == StackMode_Y_STACKED_PERCENT ) + if( eStackMode == StackMode::YStackedPercent ) bPercent = true; //iterate through all coordinate systems @@ -319,7 +316,7 @@ StackMode DiagramHelper::getStackMode( const Reference< XDiagram > & xDiagram, b rbFound=false; rbAmbiguous=false; - StackMode eGlobalStackMode = StackMode_NONE; + StackMode eGlobalStackMode = StackMode::NONE; //iterate through all coordinate systems uno::Reference< XCoordinateSystemContainer > xCooSysContainer( xDiagram, uno::UNO_QUERY ); @@ -360,7 +357,7 @@ StackMode DiagramHelper::getStackModeFromChartType( bool& rbFound, bool& rbAmbiguous, const Reference< XCoordinateSystem > & xCorrespondingCoordinateSystem ) { - StackMode eStackMode = StackMode_NONE; + StackMode eStackMode = StackMode::NONE; rbFound = false; rbAmbiguous = false; @@ -403,10 +400,10 @@ StackMode DiagramHelper::getStackModeFromChartType( if( rbFound ) { if( eCommonDirection == chart2::StackingDirection_Z_STACKING ) - eStackMode = StackMode_Z_STACKED; + eStackMode = StackMode::ZStacked; else if( eCommonDirection == chart2::StackingDirection_Y_STACKING ) { - eStackMode = StackMode_Y_STACKED; + eStackMode = StackMode::YStacked; // percent stacking if( xCorrespondingCoordinateSystem.is() ) @@ -423,7 +420,7 @@ StackMode DiagramHelper::getStackModeFromChartType( { chart2::ScaleData aScaleData = xAxis->getScaleData(); if( aScaleData.AxisType==chart2::AxisType::PERCENT ) - eStackMode = StackMode_Y_STACKED_PERCENT; + eStackMode = StackMode::YStackedPercent; } } } @@ -519,10 +516,10 @@ void DiagramHelper::setDimension( } //correct stack mode if necessary - if( nNewDimensionCount==3 && eStackMode != StackMode_Z_STACKED && bIsSupportingOnlyDeepStackingFor3D ) - DiagramHelper::setStackMode( xDiagram, StackMode_Z_STACKED ); - else if( nNewDimensionCount==2 && eStackMode == StackMode_Z_STACKED ) - DiagramHelper::setStackMode( xDiagram, StackMode_NONE ); + if( nNewDimensionCount==3 && eStackMode != StackMode::ZStacked && bIsSupportingOnlyDeepStackingFor3D ) + DiagramHelper::setStackMode( xDiagram, StackMode::ZStacked ); + else if( nNewDimensionCount==2 && eStackMode == StackMode::ZStacked ) + DiagramHelper::setStackMode( xDiagram, StackMode::NONE ); } catch( const uno::Exception & ex ) { diff --git a/compilerplugins/clang/unusedenumconstants.py b/compilerplugins/clang/unusedenumconstants.py index f409a5eaa7f0..cb45db759554 100755 --- a/compilerplugins/clang/unusedenumconstants.py +++ b/compilerplugins/clang/unusedenumconstants.py @@ -180,6 +180,7 @@ for d in definitionSet: "include/editeng/bulletitem.hxx", # css::style::NumberingType "basic/source/sbx/sbxdec.hxx", # SbxDecimal::CmpResult, must match some Windows API "codemaker/source/javamaker/javatype.cxx", # TypeInfo::Flags, from UNO + "chart2/source/view/inc/AbstractShapeFactory.hxx", # chart::SymbolEnum, called via int UNO param # represents constants from an external API "opencl/inc/opencl_device_selection.h", "vcl/inc/sft.hxx", |