diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-24 13:30:27 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-25 08:40:00 +0200 |
| commit | ac32de25069851369b05a4fa4d831077e5df6940 (patch) | |
| tree | 49c3b5faf84d556138e6a7d6b39e3aac592f5058 /chart2/source | |
| parent | 7db7666f01d81c1c345380ff724356224e9e1db6 (diff) | |
convert SvxChartTextOrder to scoped enum
Change-Id: I09094152cdf4a2756a5775d651dab92042386ee3
Diffstat (limited to 'chart2/source')
| -rw-r--r-- | chart2/source/controller/dialogs/tp_AxisLabel.cxx | 18 | ||||
| -rw-r--r-- | chart2/source/view/main/ChartItemPool.cxx | 2 |
2 files changed, 10 insertions, 10 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 ); |