diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-09-20 16:41:39 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-05 06:51:20 +0000 |
| commit | 954f752cf10fc6a8777af2a6a93e496688464687 (patch) | |
| tree | 0fc776cdcb6ad9b1d2b9673ac044bb5b4f496972 /rsc | |
| parent | c1e18e05a53c1d55afe36a887ca25f74f3f1d32d (diff) | |
convert MapUnit to scoped enum
I left a prefix on the names "Map" so that I would not have to re-arrange
each name too much, since I can't start identifiers with digits like "100thMM"
And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore.
Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224
Reviewed-on: https://gerrit.libreoffice.org/29096
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 27 |
2 files changed, 15 insertions, 14 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 4a31d1421a7c..4edcf4adf6f9 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -46,6 +46,7 @@ enum class ButtonType; enum class WindowAlign; enum class SfxStyleFamily; enum class RSWND; +enum class MapUnit; struct WriteRcContext { @@ -154,6 +155,7 @@ class RscTypCont inline void SETCONST( RscConst *p1, const char * p2, ButtonType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, WindowAlign p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, const char * p2, SfxStyleFamily p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } + inline void SETCONST( RscConst *p1, const char * p2, MapUnit p3 ) { SETCONST(p1, p2, static_cast<sal_uInt16>(p3)); } void InitLangType(); RscEnum * InitFieldUnitsType(); RscEnum * InitColor(); diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index c397ae4ff823..e035ea97405d 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -228,20 +228,19 @@ RscEnum * RscTypCont::InitMapUnit() RscEnum * pMapUnit; pMapUnit = new RscEnum( pHS->getID( "EnumMapUnit" ), RSC_NOTYPE ); - SETCONST( pMapUnit, "MAP_PIXEL", MAP_PIXEL ); - SETCONST( pMapUnit, "MAP_SYSFONT", MAP_SYSFONT ); - SETCONST( pMapUnit, "MAP_100TH_MM", MAP_100TH_MM ); - SETCONST( pMapUnit, "MAP_10TH_MM", MAP_10TH_MM ); - SETCONST( pMapUnit, "MAP_MM", MAP_MM ); - SETCONST( pMapUnit, "MAP_CM", MAP_CM ); - SETCONST( pMapUnit, "MAP_1000TH_INCH", MAP_1000TH_INCH ); - SETCONST( pMapUnit, "MAP_100TH_INCH", MAP_100TH_INCH ); - SETCONST( pMapUnit, "MAP_10TH_INCH", MAP_10TH_INCH ); - SETCONST( pMapUnit, "MAP_INCH", MAP_INCH ); - SETCONST( pMapUnit, "MAP_POINT", MAP_POINT ); - SETCONST( pMapUnit, "MAP_TWIP", MAP_TWIP ); - SETCONST( pMapUnit, "MAP_APPFONT", MAP_APPFONT ); - SETCONST( pMapUnit, "MAP_SV", RSC_EXTRAMAPUNIT ); + SETCONST( pMapUnit, "MAP_PIXEL", MapUnit::MapPixel ); + SETCONST( pMapUnit, "MAP_SYSFONT", MapUnit::MapSysFont ); + SETCONST( pMapUnit, "MAP_100TH_MM", MapUnit::Map100thMM ); + SETCONST( pMapUnit, "MAP_10TH_MM", MapUnit::Map10thMM ); + SETCONST( pMapUnit, "MAP_MM", MapUnit::MapMM ); + SETCONST( pMapUnit, "MAP_CM", MapUnit::MapCM ); + SETCONST( pMapUnit, "MAP_1000TH_INCH", MapUnit::Map1000thInch ); + SETCONST( pMapUnit, "MAP_100TH_INCH", MapUnit::Map100thInch ); + SETCONST( pMapUnit, "MAP_10TH_INCH", MapUnit::Map10thInch ); + SETCONST( pMapUnit, "MAP_INCH", MapUnit::MapInch ); + SETCONST( pMapUnit, "MAP_POINT", MapUnit::MapPoint ); + SETCONST( pMapUnit, "MAP_TWIP", MapUnit::MapTwip ); + SETCONST( pMapUnit, "MAP_APPFONT", MapUnit::MapAppFont ); return pMapUnit; } |