diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-16 13:39:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
| commit | 430b93f7f3c9f5aeb89db634447cb554acd125aa (patch) | |
| tree | a38e466a9f8cacfe753ac7373016ce01191bbfa9 /include | |
| parent | convert SvxTabAdjust to scoped enum (diff) | |
| download | core-430b93f7f3c9f5aeb89db634447cb554acd125aa.tar.gz core-430b93f7f3c9f5aeb89db634447cb554acd125aa.zip | |
convert SvxEscapement to scoped enum
and fix a potential bug with footnotes and superscripts in writer in
ndtxt.cxx, where it was passing bad args to the SvxEscapementItem
constructor
Change-Id: I0d2de34c056e7824f3b456a86d502e10ac93a1c1
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/escapementitem.hxx | 4 | ||||
| -rw-r--r-- | include/editeng/svxenum.hxx | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/editeng/escapementitem.hxx b/include/editeng/escapementitem.hxx index 516fd8a8290a..e7aab1305f9f 100644 --- a/include/editeng/escapementitem.hxx +++ b/include/editeng/escapementitem.hxx @@ -67,13 +67,13 @@ public: inline void SetEscapement( const SvxEscapement eNew ) { - if( SVX_ESCAPEMENT_OFF == eNew ) + if( SvxEscapement::Off == eNew ) { nEsc = 0; nProp = 100; } else - if( SVX_ESCAPEMENT_SUPERSCRIPT == eNew ) + if( SvxEscapement::Superscript == eNew ) { nEsc = DFLT_ESC_SUPER; nProp = DFLT_ESC_PROP; diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index e624f574100e..7c8530ce9899 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -30,12 +30,12 @@ enum SvxCaseMap SVX_CASEMAP_END }; -enum SvxEscapement +enum class SvxEscapement { - SVX_ESCAPEMENT_OFF, - SVX_ESCAPEMENT_SUPERSCRIPT, - SVX_ESCAPEMENT_SUBSCRIPT, - SVX_ESCAPEMENT_END + Off, + Superscript, + Subscript, + End }; enum SvxShadowLocation |