diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-16 09:59:17 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
| commit | a49eeecd2372c620caa66428acaf27ebc7d70e92 (patch) | |
| tree | ce9b6ec88766662272f517710a62a831b02592a8 /include/editeng | |
| parent | de47ae4f7e409d2e341829a044d8f721377e2663 (diff) | |
convert SvxInterLineSpaceRule to scoped enum
and rename it to be more explicit
Change-Id: I3f8bd7928495dba1e94b785cdda06d9819ee66bf
Diffstat (limited to 'include/editeng')
| -rw-r--r-- | include/editeng/lspcitem.hxx | 18 | ||||
| -rw-r--r-- | include/editeng/svxenum.hxx | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index da548636c0ef..5a3addf80c06 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -34,11 +34,11 @@ class SvXMLUnitConverter; #define LINE_SPACE_DEFAULT_HEIGHT 200 class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface { - short nInterLineSpace; - sal_uInt16 nLineHeight; - sal_uInt16 nPropLineSpace; - SvxLineSpace eLineSpace; - SvxInterLineSpace eInterLineSpace; + short nInterLineSpace; + sal_uInt16 nLineHeight; + sal_uInt16 nPropLineSpace; + SvxLineSpace eLineSpace; + SvxInterLineSpaceRule eInterLineSpaceRule; public: static SfxPoolItem* CreateDefault(); @@ -69,7 +69,7 @@ public: inline void SetInterLineSpace( const short nSpace ) { nInterLineSpace = nSpace; - eInterLineSpace = SVX_INTER_LINE_SPACE_FIX; + eInterLineSpaceRule = SvxInterLineSpaceRule::Fix; } // Determines the absolute or minimum row height. @@ -85,14 +85,14 @@ public: inline void SetPropLineSpace( const sal_uInt8 nProp ) { nPropLineSpace = nProp; - eInterLineSpace = SVX_INTER_LINE_SPACE_PROP; + eInterLineSpaceRule = SvxInterLineSpaceRule::Prop; } inline SvxLineSpace &GetLineSpaceRule() { return eLineSpace; } inline SvxLineSpace GetLineSpaceRule() const { return eLineSpace; } - inline SvxInterLineSpace &GetInterLineSpaceRule() { return eInterLineSpace; } - inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } + inline void SetInterLineSpaceRule(SvxInterLineSpaceRule e) { eInterLineSpaceRule = e; } + inline SvxInterLineSpaceRule GetInterLineSpaceRule() const { return eInterLineSpaceRule; } virtual sal_uInt16 GetValueCount() const override; virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index 617dcecd9bd1..f56561bb5233 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -66,12 +66,12 @@ enum SvxLineSpace SVX_LINE_SPACE_END }; -enum SvxInterLineSpace +enum class SvxInterLineSpaceRule { - SVX_INTER_LINE_SPACE_OFF, - SVX_INTER_LINE_SPACE_PROP, - SVX_INTER_LINE_SPACE_FIX, - SVX_INTER_LINE_SPACE_END + Off, + Prop, + Fix, + End }; enum SvxAdjust |