diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-20 09:10:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-21 09:06:40 +0200 |
| commit | 182fc4f184b77330fdbb32096b64f5fbc5b5f874 (patch) | |
| tree | 1ba73fb9188796ed43976fe32f291f9c64fb1d5b /rsc | |
| parent | 43327878920f424f8bac1114bee51c54609796c5 (diff) | |
fdo#84938: replace WINDOW_BORDER constants with enum
Change-Id: I91ca8e09971aee26f16257a4fd01125cfb2ebcdb
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 1 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 8 |
2 files changed, 5 insertions, 4 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index a200f1ff188d..a3d4befb45db 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -141,6 +141,7 @@ class RscTypCont void SETCONST( RscConst *, const char *, sal_uInt32 ); inline void SETCONST( RscConst *p1, const char * p2, SymbolType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, ToolBoxItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } + inline void SETCONST( RscConst *p1, Atom p2, WindowBorderStyle p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } void SETCONST( RscConst *, Atom, sal_uInt32 ); RscEnum * InitLangType(); RscEnum * InitFieldUnitsType(); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 661aef93ea04..e71c01450a40 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -289,10 +289,10 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, aBaseLst.push_back( pBorderStyleEnum ); // Konstanten in Tabelle stellen - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WINDOW_BORDER_NORMAL ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WINDOW_BORDER_MONO ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WINDOW_BORDER_MENU ); - SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WINDOW_BORDER_NOBORDER ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NORMAL" ), WindowBorderStyle::NORMAL ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MONO" ), WindowBorderStyle::MONO ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_MENU" ), WindowBorderStyle::MENU ); + SETCONST( pBorderStyleEnum, pHS->getID( "WINDOW_BORDER_NOBORDER" ), WindowBorderStyle::NOBORDER ); // Variable einfuegen nId = aNmTb.Put( "BorderStyle", VARNAME ); |