diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2016-05-14 19:52:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 06:42:47 +0000 |
| commit | 743cdf36d128bc1d0ea3315675b0bb5f85388099 (patch) | |
| tree | e606586a0d8e0a38edf51912f2142c1a52bc18b4 /vcl | |
| parent | 1938fd869b8226af00925caa7ac991618d35ee0c (diff) | |
convert RSC_MENU to scoped enum
Change-Id: Ice3784b4168738550d2c0f5ee6da1bd49d15becf
Reviewed-on: https://gerrit.libreoffice.org/24997
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menu.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 096faeeb54f9..075c53b8fb16 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -2805,9 +2805,9 @@ PopupMenu::PopupMenu( const ResId& rResId ) rResId.SetRT( RSC_MENU ); GetRes( rResId ); - sal_uLong nObjMask = ReadLongRes(); + RscMenu nObjMask = (RscMenu)ReadLongRes(); - if( nObjMask & RSC_MENU_ITEMS ) + if( nObjMask & RscMenu::Items ) { sal_uLong nObjFollows = ReadLongRes(); // insert menu items @@ -2818,11 +2818,11 @@ PopupMenu::PopupMenu( const ResId& rResId ) } } - if( nObjMask & RSC_MENU_TEXT ) + if( nObjMask & RscMenu::Text ) { aTitleText = ReadStringRes(); } - if( nObjMask & RSC_MENU_DEFAULTITEMID ) + if( nObjMask & RscMenu::DefaultItemId ) SetDefaultItem( sal::static_int_cast<sal_uInt16>(ReadLongRes()) ); } |