convert SvxChartIndicate to scoped enum

Change-Id: I65183bd4ce21544608397164fc2660830378d975

5 files changed, 31 insertions, 31 deletions

diff --git a/chart2/source/controller/dialogs/res_ErrorBar.cxx b/chart2/source/controller/dialogs/res_ErrorBar.cxx
index 1ed9bb5e8933..8e354871768e 100644
--- a/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -82,7 +82,7 @@ ErrorBarResources::ErrorBarResources( VclBuilderContainer* pParent, Dialog * pPa
                                       const SfxItemSet& rInAttrs, bool bNoneAvailable,
                                       tErrorBarType eType /* = ERROR_BAR_Y */ ) :
         m_eErrorKind( CHERROR_NONE ),
-        m_eIndicate( CHINDICATE_BOTH ),
+        m_eIndicate( SvxChartIndicate::Both ),
         m_bErrorKindUnique( true ),
         m_bIndicatorUnique( true ),
         m_bPlusUnique( true ),
@@ -427,11 +427,11 @@ IMPL_LINK_NOARG_TYPED(ErrorBarResources, IndicatorChanged, Button*, void)
 {
     m_bIndicatorUnique = true;
     if( m_pRbBoth->IsChecked())
-        m_eIndicate = CHINDICATE_BOTH;
+        m_eIndicate = SvxChartIndicate::Both;
     else if( m_pRbPositive->IsChecked())
-        m_eIndicate = CHINDICATE_UP;
+        m_eIndicate = SvxChartIndicate::Up;
     else if( m_pRbNegative->IsChecked())
-        m_eIndicate = CHINDICATE_DOWN;
+        m_eIndicate = SvxChartIndicate::Down;
     else
         m_bIndicatorUnique = false;
 
@@ -560,15 +560,15 @@ void ErrorBarResources::Reset(const SfxItemSet& rInAttrs)
     {
         switch( m_eIndicate )
         {
-            case CHINDICATE_NONE :
+            case SvxChartIndicate::NONE :
                 // no longer used, use both as default
-                m_eIndicate = CHINDICATE_BOTH;
+                m_eIndicate = SvxChartIndicate::Both;
                 SAL_FALLTHROUGH; // to BOTH
-            case CHINDICATE_BOTH :
+            case SvxChartIndicate::Both :
                 m_pRbBoth->Check(); break;
-            case CHINDICATE_UP :
+            case SvxChartIndicate::Up :
                 m_pRbPositive->Check(); break;
-            case CHINDICATE_DOWN :
+            case SvxChartIndicate::Down :
                 m_pRbNegative->Check(); break;
         }
     }
diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index e609ac9c9975..ff6a1b9dd645 100644
--- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -253,8 +253,8 @@ bool ErrorBarItemConverter::ApplySpecialItem(
                 static_cast< const SvxChartIndicateItem & >(
                     rItemSet.Get( nWhichId )).GetValue();
 
-            bool bNewIndPos = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_UP );
-            bool bNewIndNeg = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_DOWN );
+            bool bNewIndPos = (eIndicate == SvxChartIndicate::Both || eIndicate == SvxChartIndicate::Up );
+            bool bNewIndNeg = (eIndicate == SvxChartIndicate::Both || eIndicate == SvxChartIndicate::Down );
 
             bool bShowPos(false), bShowNeg(false);
             lcl_getErrorIndicatorValues( xErrorBarProp, bShowPos, bShowNeg );
@@ -401,23 +401,23 @@ void ErrorBarItemConverter::FillSpecialItem(
 
         case SCHATTR_STAT_INDICATE:
         {
-            SvxChartIndicate eIndicate = CHINDICATE_BOTH;
+            SvxChartIndicate eIndicate = SvxChartIndicate::Both;
             bool bShowPos(false), bShowNeg(false);
             lcl_getErrorIndicatorValues( GetPropertySet(), bShowPos, bShowNeg );
 
             if( bShowPos )
             {
                 if( bShowNeg )
-                    eIndicate = CHINDICATE_BOTH;
+                    eIndicate = SvxChartIndicate::Both;
                 else
-                    eIndicate = CHINDICATE_UP;
+                    eIndicate = SvxChartIndicate::Up;
             }
             else
             {
                 if( bShowNeg )
-                    eIndicate = CHINDICATE_DOWN;
+                    eIndicate = SvxChartIndicate::Down;
                 else
-                    eIndicate = CHINDICATE_NONE;
+                    eIndicate = SvxChartIndicate::NONE;
             }
             rOutItemSet.Put( SvxChartIndicateItem( eIndicate, SCHATTR_STAT_INDICATE ));
         }
diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index cdea9738f74c..20c9ce2dea59 100644
--- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -540,8 +540,8 @@ bool StatisticsItemConverter::ApplySpecialItem(
                 static_cast< const SvxChartIndicateItem & >(
                     rItemSet.Get( nWhichId )).GetValue();
 
-            bool bNewIndPos = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_UP );
-            bool bNewIndNeg = (eIndicate == CHINDICATE_BOTH || eIndicate == CHINDICATE_DOWN );
+            bool bNewIndPos = (eIndicate == SvxChartIndicate::Both || eIndicate == SvxChartIndicate::Up );
+            bool bNewIndNeg = (eIndicate == SvxChartIndicate::Both || eIndicate == SvxChartIndicate::Down );
 
             bool bShowPos(false), bShowNeg(false);
             lcl_getErrorIndicatorValues( xErrorBarProp, bShowPos, bShowNeg );
@@ -816,7 +816,7 @@ void StatisticsItemConverter::FillSpecialItem(
             bool bYError =
                 static_cast<const SfxBoolItem&>(rOutItemSet.Get(SCHATTR_STAT_ERRORBAR_TYPE)).GetValue();
             uno::Reference< beans::XPropertySet > xErrorBarProp( lcl_GetErrorBar( GetPropertySet(),bYError));
-            SvxChartIndicate eIndicate = CHINDICATE_BOTH;
+            SvxChartIndicate eIndicate = SvxChartIndicate::Both;
             if( xErrorBarProp.is())
             {
                 bool bShowPos(false), bShowNeg(false);
@@ -825,16 +825,16 @@ void StatisticsItemConverter::FillSpecialItem(
                 if( bShowPos )
                 {
                     if( bShowNeg )
-                        eIndicate = CHINDICATE_BOTH;
+                        eIndicate = SvxChartIndicate::Both;
                     else
-                        eIndicate = CHINDICATE_UP;
+                        eIndicate = SvxChartIndicate::Up;
                 }
                 else
                 {
                     if( bShowNeg )
-                        eIndicate = CHINDICATE_DOWN;
+                        eIndicate = SvxChartIndicate::Down;
                     else
-                        eIndicate = CHINDICATE_NONE;
+                        eIndicate = SvxChartIndicate::NONE;
                 }
             }
             rOutItemSet.Put( SvxChartIndicateItem( eIndicate, SCHATTR_STAT_INDICATE ));
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 0601bacc3d96..ac0c8fc16514 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -71,7 +71,7 @@ ChartItemPool::ChartItemPool():
     ppPoolDefaults[SCHATTR_STAT_BIGERROR            - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_BIGERROR);
     ppPoolDefaults[SCHATTR_STAT_CONSTPLUS           - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTPLUS);
     ppPoolDefaults[SCHATTR_STAT_CONSTMINUS          - SCHATTR_START] = new SvxDoubleItem (0.0, SCHATTR_STAT_CONSTMINUS);
-    ppPoolDefaults[SCHATTR_STAT_INDICATE            - SCHATTR_START] = new SvxChartIndicateItem (CHINDICATE_NONE, SCHATTR_STAT_INDICATE);
+    ppPoolDefaults[SCHATTR_STAT_INDICATE            - SCHATTR_START] = new SvxChartIndicateItem (SvxChartIndicate::NONE, SCHATTR_STAT_INDICATE);
     ppPoolDefaults[SCHATTR_STAT_RANGE_POS           - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_POS, OUString());
     ppPoolDefaults[SCHATTR_STAT_RANGE_NEG           - SCHATTR_START] = new SfxStringItem (SCHATTR_STAT_RANGE_NEG, OUString());
     ppPoolDefaults[SCHATTR_STAT_ERRORBAR_TYPE       - SCHATTR_START] = new SfxBoolItem(SCHATTR_STAT_ERRORBAR_TYPE, true);
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index 3d8365825840..71310c4b6e6f 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -65,15 +65,15 @@ enum SvxChartKindError
 
 #define CHERROR_COUNT   (CHERROR_RANGE + 1)
 
-enum SvxChartIndicate
+enum class SvxChartIndicate
 {
-    CHINDICATE_NONE,
-    CHINDICATE_BOTH,
-    CHINDICATE_UP,
-    CHINDICATE_DOWN
+    NONE,
+    Both,
+    Up,
+    Down
 };
 
-#define CHINDICATE_COUNT    (CHINDICATE_DOWN + 1)
+#define CHINDICATE_COUNT    ((sal_uInt16)SvxChartIndicate::Down + 1)
 
 enum class SvxChartRegress
 {
@@ -184,7 +184,7 @@ public:
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartIndicateItem : public SfxEnumItem
 {
 public:
-    SvxChartIndicateItem(SvxChartIndicate eOrient /*= CHINDICATE_NONE*/,
+    SvxChartIndicateItem(SvxChartIndicate eOrient /*= SvxChartIndicate::NONE*/,
                            sal_uInt16 nId );
     SvxChartIndicateItem(SvStream& rIn,
                            sal_uInt16 nId );