diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-07 14:39:38 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-03-08 09:04:30 +0000 |
| commit | 9cacb6ad9f5a012bc892cf9893cd8d37a2a5f304 (patch) | |
| tree | 2823ae9c68c743ed658cae8b064fa91f9772007d /include | |
| parent | tdf#106283: Registry settings are not read properly on Windows (diff) | |
| download | core-9cacb6ad9f5a012bc892cf9893cd8d37a2a5f304.tar.gz core-9cacb6ad9f5a012bc892cf9893cd8d37a2a5f304.zip | |
convert SvxCaseMap to scoped enum
Change-Id: Iea77ddc21e9b2d5a021c08e323da9ccabf9d46bd
Reviewed-on: https://gerrit.libreoffice.org/34963
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
| -rw-r--r-- | include/editeng/cmapitem.hxx | 2 | ||||
| -rw-r--r-- | include/editeng/svxenum.hxx | 14 | ||||
| -rw-r--r-- | include/editeng/svxfont.hxx | 4 |
3 files changed, 10 insertions, 10 deletions
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx index 4977b11694a0..e651a1e4222e 100644 --- a/include/editeng/cmapitem.hxx +++ b/include/editeng/cmapitem.hxx @@ -37,7 +37,7 @@ class EDITENG_DLLPUBLIC SvxCaseMapItem : public SfxEnumItem<SvxCaseMap> public: static SfxPoolItem* CreateDefault(); - SvxCaseMapItem( const SvxCaseMap eMap /*= SVX_CASEMAP_NOT_MAPPED*/, + SvxCaseMapItem( const SvxCaseMap eMap /*= SvxCaseMap::NotMapped*/, const sal_uInt16 nId ); // "pure virtual Methods" from SfxPoolItem + SfxEnumItem diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx index 12b1f4ba5901..1735267a0bf3 100644 --- a/include/editeng/svxenum.hxx +++ b/include/editeng/svxenum.hxx @@ -21,14 +21,14 @@ #include <com/sun/star/style/NumberingType.hpp> -enum SvxCaseMap +enum class SvxCaseMap { - SVX_CASEMAP_NOT_MAPPED, - SVX_CASEMAP_VERSALIEN, - SVX_CASEMAP_GEMEINE, - SVX_CASEMAP_TITEL, - SVX_CASEMAP_KAPITAELCHEN, - SVX_CASEMAP_END + NotMapped, + Uppercase, + Lowercase, + Capitalize, + SmallCaps, + End }; enum class SvxEscapement diff --git a/include/editeng/svxfont.hxx b/include/editeng/svxfont.hxx index 80dcf3744a23..2034bd6363df 100644 --- a/include/editeng/svxfont.hxx +++ b/include/editeng/svxfont.hxx @@ -65,8 +65,8 @@ public: void SetCaseMap( const SvxCaseMap eNew ) { eCaseMap = eNew; } // Is-Methods: - bool IsCaseMap() const { return SVX_CASEMAP_NOT_MAPPED != eCaseMap; } - bool IsCapital() const { return SVX_CASEMAP_KAPITAELCHEN == eCaseMap; } + bool IsCaseMap() const { return SvxCaseMap::NotMapped != eCaseMap; } + bool IsCapital() const { return SvxCaseMap::SmallCaps == eCaseMap; } bool IsKern() const { return 0 != nKern; } bool IsEsc() const { return 0 != nEsc; } |