diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-28 14:56:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-30 08:32:06 +0000 |
| commit | a499d1b980be1eb2bd6ccfa07b1d87c02fcb1343 (patch) | |
| tree | 9c81b8f52ee76c9c756209ed1c549eb7a811b9f1 /rsc | |
| parent | 4405180546bce4b4237f1a23c0bc5bcc5d7bb3a7 (diff) | |
Convert WINDOW flags to scoped enum
Change-Id: I952fcc940cfe4daca5a810a406a2b8ecd3bd6f47
Reviewed-on: https://gerrit.libreoffice.org/25582
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 73b58cab67ea..a23761d7157b 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -251,31 +251,29 @@ RscTop * RscTypCont::InitClassWindow( RscTop * pSuper, RscEnum * pMapUnit, InsWinBit( pClassWindow, "DialogControl", nTabControlId ); nId = aNmTb.Put( "HelpID", VARNAME ); - pClassWindow->SetVariable( nId, &aStringLiteral, nullptr, 0, WINDOW_HELPID ); + pClassWindow->SetVariable( nId, &aStringLiteral, nullptr, 0, (sal_uInt32)RscWindowFlags::HelpId ); nRsc_XYMAPMODEId = nId = aNmTb.Put( "_XYMapMode", VARNAME ); - pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, WINDOW_XYMAPMODE ); + pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, (sal_uInt32)RscWindowFlags::XYMapMode ); nRsc_X = nId = aNmTb.Put( "_X", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_X ); + pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::X ); nRsc_Y = nId = aNmTb.Put( "_Y", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_Y ); + pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Y ); nRsc_WHMAPMODEId = nId = aNmTb.Put( "_WHMapMode", VARNAME ); - pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, WINDOW_WHMAPMODE ); + pClassWindow->SetVariable( nId, pMapUnit, nullptr, 0, (sal_uInt32)RscWindowFlags::WHMapMode ); nRsc_WIDTH = nId = aNmTb.Put( "_Width", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_WIDTH ); + pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Width ); nRsc_HEIGHT = nId = aNmTb.Put( "_Height", VARNAME ); - pClassWindow->SetVariable( nId, &aLong, nullptr, 0, WINDOW_HEIGHT ); + pClassWindow->SetVariable( nId, &aLong, nullptr, 0, (sal_uInt32)RscWindowFlags::Height ); nRsc_DELTALANG = nId = aNmTb.Put( "DeltaLang", VARNAME ); pClassWindow->SetVariable( nId, pLangGeo, nullptr, VAR_NORC | VAR_NOENUM); nId = aNmTb.Put( "Text", VARNAME ); - pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_TEXT ); - nId = aNmTb.Put( "HelpText", VARNAME ); - pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_HELPTEXT ); + pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscWindowFlags::Text ); nId = aNmTb.Put( "QuickHelpText", VARNAME ); - pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, WINDOW_QUICKTEXT ); + pClassWindow->SetVariable( nId, &aLangString, nullptr, 0, (sal_uInt32)RscWindowFlags::QuickText ); return pClassWindow; } |