diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-16 11:56:52 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
| commit | 42ab2cfbd92bc30a62a2c126d4ad6d5726846d8b (patch) | |
| tree | 07cfc005093e203c93c633da24eb5bdcf00314b6 /include/editeng | |
| parent | a49eeecd2372c620caa66428acaf27ebc7d70e92 (diff) | |
convert SvxLineSpace to scoped enum
and rename to be more explicit
Change-Id: Id06e6b68ef30e1d0d0daf19c37a390060e8bcb01
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/lspcitem.hxx | 8 | ||||
| -rw-r--r-- | include/editeng/svxenum.hxx | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index 5a3addf80c06..f63daf5fba81 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface short nInterLineSpace; sal_uInt16 nLineHeight; sal_uInt16 nPropLineSpace; - SvxLineSpace eLineSpace; + SvxLineSpaceRule eLineSpaceRule; SvxInterLineSpaceRule eInterLineSpaceRule; public: @@ -77,7 +77,7 @@ public: inline void SetLineHeight( const sal_uInt16 nHeight ) { nLineHeight = nHeight; - eLineSpace = SVX_LINE_SPACE_MIN; + eLineSpaceRule = SvxLineSpaceRule::Min; } // To increase or decrease the row height. @@ -88,8 +88,8 @@ public: eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } - inline SvxLineSpace &GetLineSpaceRule() { return eLineSpace; } - inline SvxLineSpace GetLineSpaceRule() const { return eLineSpace; } + inline void SetLineSpaceRule(SvxLineSpaceRule e) { eLineSpaceRule = e; } + inline SvxLineSpaceRule GetLineSpaceRule() const { return eLineSpaceRule; } inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index f56561bb5233..0ce5a69aeea2 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -58,12 +58,12 @@ enum SvxTabAdjust SVX_TAB_ADJUST_END }; -enum SvxLineSpace +enum class SvxLineSpaceRule { - SVX_LINE_SPACE_AUTO, - SVX_LINE_SPACE_FIX, - SVX_LINE_SPACE_MIN, - SVX_LINE_SPACE_END + Auto, + Fix, + Min, + End }; enum class SvxInterLineSpaceRule |