diff options
| author | Noel Grandin <noel@peralex.com> | 2016-08-16 09:22:18 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-08-17 08:45:15 +0200 |
| commit | de47ae4f7e409d2e341829a044d8f721377e2663 (patch) | |
| tree | db41c0b380efa867f22af47facb2f998b16b9c67 /include | |
| parent | d5ad8f9619d463a643ab53447cf3576a9ff1a716 (diff) | |
convert SvxSpecialLineSpace to scoped enum
And move it inside editeng, since it's not really used anywhere else.
And fix a bunch of places that were incorrectly calling the constructor
with the enum.
Change-Id: I74e8ab8bcf315eb5ad0720e74d04a450f0a3e5c9
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/lspcitem.hxx | 12 | ||||
| -rw-r--r-- | include/editeng/svxenum.hxx | 9 |
2 files changed, 6 insertions, 15 deletions
diff --git a/include/editeng/lspcitem.hxx b/include/editeng/lspcitem.hxx index da1fb3df6dc1..da548636c0ef 100644 --- a/include/editeng/lspcitem.hxx +++ b/include/editeng/lspcitem.hxx @@ -34,10 +34,10 @@ class SvXMLUnitConverter; #define LINE_SPACE_DEFAULT_HEIGHT 200 class EDITENG_DLLPUBLIC SvxLineSpacingItem : public SfxEnumItemInterface { - short nInterLineSpace; - sal_uInt16 nLineHeight; - sal_uInt16 nPropLineSpace; - SvxLineSpace eLineSpace; + short nInterLineSpace; + sal_uInt16 nLineHeight; + sal_uInt16 nPropLineSpace; + SvxLineSpace eLineSpace; SvxInterLineSpace eInterLineSpace; public: @@ -48,7 +48,7 @@ public: // writer? => Rather have a crooked vales as the default, but the // programmer sees that there's something special happening. - SvxLineSpacingItem( sal_uInt16 nHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId ); + SvxLineSpacingItem( sal_uInt16 nLineHeight /*= LINE_SPACE_DEFAULT_HEIGHT*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem virtual bool operator==( const SfxPoolItem& ) const override; @@ -95,7 +95,7 @@ public: inline SvxInterLineSpace GetInterLineSpaceRule() const { return eInterLineSpace; } virtual sal_uInt16 GetValueCount() const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetEnumValue() const override; virtual void SetEnumValue( sal_uInt16 nNewVal ) override; }; diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index 6044dbd4718b..617dcecd9bd1 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -84,15 +84,6 @@ enum SvxAdjust SVX_ADJUST_END }; -enum SvxSpecialLineSpace -{ - SVX_LINESPACE_USER, - SVX_LINESPACE_ONE_LINE, - SVX_LINESPACE_ONE_POINT_FIVE_LINES, - SVX_LINESPACE_TWO_LINES, - SVX_LINESPACE_END -}; - enum class SvxBreak { NONE, |