From ac32de25069851369b05a4fa4d831077e5df6940 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 24 Aug 2016 13:30:27 +0200 Subject: convert SvxChartTextOrder to scoped enum Change-Id: I09094152cdf4a2756a5775d651dab92042386ee3 --- include/svx/chrtitem.hxx | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) (limited to 'include/svx') 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 ); -- cgit