diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-29 20:23:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 06:41:53 +0000 |
| commit | 990082f37c31380d9fedd62c5dac1b5bff4c9636 (patch) | |
| tree | 8f567bbc9814fd8a5b610529d82610422da59910 /include | |
| parent | 446d0887ff5421822e0296e20cbb36f08f1e6445 (diff) | |
Convert FontRelief to scoped enum
Change-Id: I545c83d742db27f1a004b66e5eb1ef768f62e011
Reviewed-on: https://gerrit.libreoffice.org/25626
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/charreliefitem.hxx | 6 | ||||
| -rw-r--r-- | include/vcl/fntstyle.hxx | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/include/editeng/charreliefitem.hxx b/include/editeng/charreliefitem.hxx index 6a01f71326bb..113678855c4b 100644 --- a/include/editeng/charreliefitem.hxx +++ b/include/editeng/charreliefitem.hxx @@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxCharReliefItem : public SfxEnumItem public: static SfxPoolItem* CreateDefault(); - SvxCharReliefItem( FontRelief eValue /*= RELIEF_NONE*/, + SvxCharReliefItem( FontRelief eValue /*= FontRelief::NONE*/, const sal_uInt16 nId ); virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const override; @@ -44,8 +44,10 @@ public: virtual SvStream& Store(SvStream & rStrm, sal_uInt16 nIVer) const override; virtual sal_uInt16 GetVersion( sal_uInt16 nFileVersion ) const override; - virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; + virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const override; virtual sal_uInt16 GetValueCount() const override; + FontRelief GetValue() const { return (FontRelief)SfxEnumItem::GetValue(); } + void SetValue(FontRelief f) { SfxEnumItem::SetValue((sal_uInt16)f); } virtual bool GetPresentation( SfxItemPresentation ePres, SfxMapUnit eCoreMetric, diff --git a/include/vcl/fntstyle.hxx b/include/vcl/fntstyle.hxx index 481d0a2ff9cf..03814c2621fd 100644 --- a/include/vcl/fntstyle.hxx +++ b/include/vcl/fntstyle.hxx @@ -23,7 +23,7 @@ #include <sal/types.h> #include <o3tl/typed_flags_set.hxx> -enum FontRelief { RELIEF_NONE, RELIEF_EMBOSSED, RELIEF_ENGRAVED, FontRelief_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; +enum class FontRelief { NONE, Embossed, Engraved, FontRelief_FORCE_EQUAL_SIZE=SAL_MAX_ENUM }; enum class FontKerning { |