diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 15:28:57 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-15 10:05:02 +0200 |
| commit | d93915b2aeabbde90b7eb539116b9be49e0d1a5c (patch) | |
| tree | 0d28a83b9c4633b979c46d8ce6b6054748fa8d13 /cui | |
| parent | 4f4cff08aac32db6fa580423b5fde661c8b0743a (diff) | |
conver MENU_FLAG_ constants to scoped enum
Change-Id: I969d99fa8881cc89601696a2d8621905a82b147b
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/customize/cfg.cxx | 8 | ||||
| -rw-r--r-- | cui/source/dialogs/SpellDialog.cxx | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index 1b454fcc9366..7eadd5a16952 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -2231,14 +2231,14 @@ SvxMenuConfigPage::SvxMenuConfigPage(vcl::Window *pParent, const SfxItemSet& rSe PopupMenu* pMenu = m_pModifyTopLevelButton->GetPopupMenu(); pMenu->SetMenuFlags( - pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); + pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries ); m_pModifyTopLevelButton->SetSelectHdl( LINK( this, SvxMenuConfigPage, MenuSelectHdl ) ); PopupMenu* pEntry = m_pModifyCommandButton->GetPopupMenu(); pEntry->SetMenuFlags( - pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); + pEntry->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries ); m_pModifyCommandButton->SetSelectHdl( LINK( this, SvxMenuConfigPage, EntrySelectHdl ) ); @@ -2924,7 +2924,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) ); pMenu->SetMenuFlags( - pMenu->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); + pMenu->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries ); m_pModifyTopLevelButton->SetPopupMenu( pMenu ); m_pModifyTopLevelButton->SetSelectHdl( @@ -2933,7 +2933,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(vcl::Window *pParent, const SfxItemSe PopupMenu* pEntry = new PopupMenu( CUI_RES( MODIFY_TOOLBAR_CONTENT ) ); pEntry->SetMenuFlags( - pEntry->GetMenuFlags() | MENU_FLAG_ALWAYSSHOWDISABLEDENTRIES ); + pEntry->GetMenuFlags() | MenuFlags::AlwaysShowDisabledEntries ); m_pModifyCommandButton->SetPopupMenu( pEntry ); m_pModifyCommandButton->SetSelectHdl( diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx index 1d72e70e172c..f8952df4c2ba 100644 --- a/cui/source/dialogs/SpellDialog.cxx +++ b/cui/source/dialogs/SpellDialog.cxx @@ -866,7 +866,7 @@ int SpellDialog::InitUserDicts() PopupMenu* pMenu = m_pAddToDictMB->GetPopupMenu(); assert(pMenu); pMenu->Clear(); - pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS); + pMenu->SetMenuFlags(MenuFlags::NoAutoMnemonics); sal_uInt16 nItemId = 1; // menu items should be enumerated from 1 and not 0 for (sal_Int32 i = 0; i < nSize; ++i) { |