convert StackMode to scoped enum

and drop unused AMBIGUOUS enumerator

Change-Id: I71954d75a64928061c0e520beb47f979c53ee5a8

6 files changed, 59 insertions, 59 deletions

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(