diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-14 16:17:25 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 06:42:38 +0000 |
| commit | 1938fd869b8226af00925caa7ac991618d35ee0c (patch) | |
| tree | 9d71af70e2dc9082dcc04e3bbc7f23127085ff39 /rsc | |
| parent | c2fc91664f71c447209d2cd29c0df1d7faba4927 (diff) | |
Convert RSWND to scoped enum
Change-Id: If6e5753ade8b096a4ba1c10b47c2360ff26d181f
Reviewed-on: https://gerrit.libreoffice.org/24993
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/inc/rscdb.hxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index ea4cdd029923..07db8596fd24 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -45,6 +45,7 @@ enum class ToolBoxItemType; enum class ButtonType; enum class WindowAlign; enum class SfxStyleFamily; +enum class RSWND; struct WriteRcContext { @@ -146,6 +147,7 @@ class RscTypCont void SETCONST( RscConst *, Atom, 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, RSWND 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)); } inline void SETCONST( RscConst *p1, const char * p2, KeyFuncType p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } inline void SETCONST( RscConst *p1, Atom p2, MenuItemBits p3 ) { SETCONST(p1, p2, static_cast<sal_uInt32>(p3)); } diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 2060798e9cfd..4b4862410db8 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -219,9 +219,9 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, // set the constants in table nDisableId = pHS->getID( "RSWND_DISABLE" ); - SETCONST( pFlag, nDisableId, RSWND_DISABLED ); + SETCONST( pFlag, nDisableId, RSWND::DISABLED ); nOutputSizeId = pHS->getID( "RSWND_OUTPUTSIZE" ); - SETCONST( pFlag, nOutputSizeId, RSWND_CLIENTSIZE ); + SETCONST( pFlag, nOutputSizeId, RSWND::CLIENTSIZE ); // add variable nVarId = aNmTb.Put( "_RscExtraFlags", VARNAME ); |