From be021ba04d56b45bcb3c6cf09c193abc7f5e9dc0 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 17 Feb 2017 08:49:02 +0200
Subject: convert StackMode to scoped enum

and drop unused AMBIGUOUS enumerator

Change-Id: I71954d75a64928061c0e520beb47f979c53ee5a8
---
 chart2/source/tools/ChartTypeHelper.cxx  |  6 +++---
 chart2/source/tools/DataSeriesHelper.cxx | 11 ++++-------
 chart2/source/tools/DiagramHelper.cxx    | 27 ++++++++++++---------------
 3 files changed, 19 insertions(+), 25 deletions(-)

(limited to 'chart2/source/tools')

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 )
     {
-- 
cgit