diff options
| author | Noel Grandin <noel@peralex.com> | 2015-07-23 13:19:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-07-24 09:52:08 +0200 |
| commit | 9e28cc8ca79b5c42955867a62e89faf8facc5e80 (patch) | |
| tree | d882dd9776f44748debac32c65b80194387cffe5 /rsc | |
| parent | dc7fc2074dd81f0960e6c112ead1cfe5bfd1bf4c (diff) | |
convert WindowAlign to scoped enum
Change-Id: I028d108b3a83bd5541d873c4d03b87339cd3be52
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 7428785fca7b..bbaa74dbb014 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -43,6 +43,7 @@ enum class KeyFuncType : sal_Int32; enum class MenuItemBits : sal_Int16; enum class ToolBoxItemType; enum class ButtonType; +enum class WindowAlign; struct WriteRcContext { @@ -155,6 +156,7 @@ class RscTypCont inline void SETCONST( RscConst *p1, const char * p2, ToolBoxItemType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, ButtonType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } 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)); } RscEnum * InitLangType(); RscEnum * InitFieldUnitsType(); RscEnum * InitColor(); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 0d23d0b05b58..03fe7be6a9f6 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -1251,10 +1251,10 @@ RscTop * RscTypCont::InitClassToolBox( RscTop * pSuper, RscEnum * pEnum; aBaseLst.push_back( pEnum = new RscEnum( pHS->getID( "EnumToolBoxAlign" ), RSC_NOTYPE ) ); - SETCONST( pEnum, "BOXALIGN_TOP", WINDOWALIGN_TOP ); - SETCONST( pEnum, "BOXALIGN_LEFT", WINDOWALIGN_LEFT ); - SETCONST( pEnum, "BOXALIGN_RIGHT", WINDOWALIGN_RIGHT ); - SETCONST( pEnum, "BOXALIGN_BOTTOM", WINDOWALIGN_BOTTOM ); + SETCONST( pEnum, "BOXALIGN_TOP", WindowAlign::Top ); + SETCONST( pEnum, "BOXALIGN_LEFT", WindowAlign::Left ); + SETCONST( pEnum, "BOXALIGN_RIGHT", WindowAlign::Right ); + SETCONST( pEnum, "BOXALIGN_BOTTOM", WindowAlign::Bottom ); // Variable einfuegen nId = aNmTb.Put( "Align", VARNAME ); |