4 files changed, 25 insertions, 27 deletions

diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index 7aa4a181a3bf..8746615917b3 100644
--- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -123,17 +123,17 @@ bool SchAxisLabelTabPage::FillItemSet( SfxItemSet* rOutAttrs )
 
     if( m_bShowStaggeringControls )
     {
-        SvxChartTextOrder eOrder = CHTXTORDER_SIDEBYSIDE;
+        SvxChartTextOrder eOrder = SvxChartTextOrder::SideBySide;
         bool bRadioButtonChecked = true;
 
         if( m_pRbUpDown->IsChecked())
-            eOrder = CHTXTORDER_UPDOWN;
+            eOrder = SvxChartTextOrder::UpDown;
         else if( m_pRbDownUp->IsChecked())
-            eOrder = CHTXTORDER_DOWNUP;
+            eOrder = SvxChartTextOrder::DownUp;
         else if( m_pRbAuto->IsChecked())
-            eOrder = CHTXTORDER_AUTO;
+            eOrder = SvxChartTextOrder::Auto;
         else if( m_pRbSideBySide->IsChecked())
-            eOrder = CHTXTORDER_SIDEBYSIDE;
+            eOrder = SvxChartTextOrder::SideBySide;
         else
             bRadioButtonChecked = false;
 
@@ -258,16 +258,16 @@ void SchAxisLabelTabPage::Reset( const SfxItemSet* rInAttrs )
 
             switch( eOrder )
             {
-                case CHTXTORDER_SIDEBYSIDE:
+                case SvxChartTextOrder::SideBySide:
                     m_pRbSideBySide->Check();
                     break;
-                case CHTXTORDER_UPDOWN:
+                case SvxChartTextOrder::UpDown:
                     m_pRbUpDown->Check();
                     break;
-                case CHTXTORDER_DOWNUP:
+                case SvxChartTextOrder::DownUp:
                     m_pRbDownUp->Check();
                     break;
-                case CHTXTORDER_AUTO:
+                case SvxChartTextOrder::Auto:
                     m_pRbAuto->Check();
                     break;
             }
diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx
index 04707984d8d2..e77ffd6c346c 100644
--- a/chart2/source/view/main/ChartItemPool.cxx
+++ b/chart2/source/view/main/ChartItemPool.cxx
@@ -121,7 +121,7 @@ ChartItemPool::ChartItemPool():
 
     //axis label
     ppPoolDefaults[SCHATTR_AXIS_SHOWDESCR       - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_SHOWDESCR,false);
-    ppPoolDefaults[SCHATTR_AXIS_LABEL_ORDER     - SCHATTR_START] = new SvxChartTextOrderItem(CHTXTORDER_SIDEBYSIDE, SCHATTR_AXIS_LABEL_ORDER);
+    ppPoolDefaults[SCHATTR_AXIS_LABEL_ORDER     - SCHATTR_START] = new SvxChartTextOrderItem(SvxChartTextOrder::SideBySide, SCHATTR_AXIS_LABEL_ORDER);
     ppPoolDefaults[SCHATTR_AXIS_LABEL_OVERLAP   - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_OVERLAP,false);
     ppPoolDefaults[SCHATTR_AXIS_LABEL_BREAK     - SCHATTR_START] = new SfxBoolItem(SCHATTR_AXIS_LABEL_BREAK, false );
 
diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx
index db12acc03abb..1fea249053a4 100644
--- a/include/svx/chrtitem.hxx
+++ b/include/svx/chrtitem.hxx
@@ -39,17 +39,15 @@ enum SvxChartDataDescr
 
 #define CHDESCR_COUNT   (CHDESCR_TEXTANDVALUE + 1)
 
-enum SvxChartTextOrder
+enum class SvxChartTextOrder
 {
-    CHTXTORDER_SIDEBYSIDE,
-    CHTXTORDER_UPDOWN,
-    CHTXTORDER_DOWNUP,
-    CHTXTORDER_AUTO
+    SideBySide,
+    UpDown,
+    DownUp,
+    Auto
 };
 
-#define CHTXTORDER_COUNT    (CHTXTORDER_AUTO + 1)
-
-#define CHTXTORIENT_COUNT   (CHTXTORIENT_TOPBOTTOM + 1)
+#define CHTXTORDER_COUNT    ((sal_uInt16)SvxChartTextOrder::Auto + 1)
 
 enum class SvxChartKindError
 {
@@ -135,7 +133,7 @@ public:
 class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxChartTextOrderItem : public SfxEnumItem
 {
 public:
-    SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= CHTXTORDER_SIDEBYSIDE*/,
+    SvxChartTextOrderItem(SvxChartTextOrder eOrder /*= SvxChartTextOrder::SideBySide*/,
                           sal_uInt16 nId );
     SvxChartTextOrderItem(SvStream& rIn,
                           sal_uInt16 nId );
diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx
index de1e7327cd48..9d3de391d79c 100644
--- a/svx/source/items/chrtitem.cxx
+++ b/svx/source/items/chrtitem.cxx
@@ -105,13 +105,13 @@ bool SvxChartTextOrderItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMember
 
     switch( eOrder )
     {
-        case CHTXTORDER_SIDEBYSIDE:
+        case SvxChartTextOrder::SideBySide:
             eAO = css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE; break;
-        case CHTXTORDER_UPDOWN:
+        case SvxChartTextOrder::UpDown:
             eAO = css::chart::ChartAxisArrangeOrderType_STAGGER_ODD; break;
-        case CHTXTORDER_DOWNUP:
+        case SvxChartTextOrder::DownUp:
             eAO = css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN; break;
-        case CHTXTORDER_AUTO:
+        case SvxChartTextOrder::Auto:
             eAO = css::chart::ChartAxisArrangeOrderType_AUTO; break;
     }
 
@@ -139,13 +139,13 @@ bool SvxChartTextOrderItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMe
     switch( eAO )
     {
         case css::chart::ChartAxisArrangeOrderType_SIDE_BY_SIDE:
-            eOrder = CHTXTORDER_SIDEBYSIDE; break;
+            eOrder = SvxChartTextOrder::SideBySide; break;
         case css::chart::ChartAxisArrangeOrderType_STAGGER_ODD:
-            eOrder = CHTXTORDER_UPDOWN; break;
+            eOrder = SvxChartTextOrder::UpDown; break;
         case css::chart::ChartAxisArrangeOrderType_STAGGER_EVEN:
-            eOrder = CHTXTORDER_DOWNUP; break;
+            eOrder = SvxChartTextOrder::DownUp; break;
         case css::chart::ChartAxisArrangeOrderType_AUTO:
-            eOrder = CHTXTORDER_AUTO; break;
+            eOrder = SvxChartTextOrder::Auto; break;
         default:
             return false;
     }