diff options
author | Noel Grandin <noel@peralex.com> | 2014-11-01 14:50:30 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-11-01 14:53:39 +0000 |
commit | a7542d38ddeebd37ddea233fa1e4cf15b2e03c49 (patch) | |
tree | 07ec3f89a4487b42c8b8203fab9e4dbb6f394a9c /sfx2 | |
parent | b812374174144e077bc3b08fe347626cb1a33eee (diff) |
fdo#84938: replace MIB_ constants with enum
Change-Id: I58c1b4c9e4c4b3751b233d2fe10b9c953b945c4a
Reviewed-on: https://gerrit.libreoffice.org/12179
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
-rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 6 | ||||
-rw-r--r-- | sfx2/source/menu/mnuitem.cxx | 4 | ||||
-rw-r--r-- | sfx2/source/menu/mnumgr.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/menu/virtmenu.cxx | 2 | ||||
-rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 8 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index be6f0ace6be2..b290c7373f6f 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -1205,7 +1205,7 @@ namespace sfx2 for ( size_t i=0; i<m_aPanelRepository.size(); ++i, ++nIndex ) { const PanelDescriptor& rPanelDesc( m_aPanelRepository[i] ); - pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MIB_CHECKABLE ); + pMenu->InsertItem( nIndex, rPanelDesc.pPanel->GetDisplayName(), MenuItemBits::CHECKABLE ); pMenu->CheckItem( nIndex, !rPanelDesc.bHidden ); } pMenu->InsertSeparator(); @@ -1213,9 +1213,9 @@ namespace sfx2 #if OSL_DEBUG_LEVEL > 0 if (SvtMiscOptions().IsExperimentalMode()) { - pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_TABS, OUString("Tab-Layout (exp.)"), MenuItemBits::CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_TABS, impl_getLayout() != LAYOUT_DRAWERS ); - pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MIB_CHECKABLE ); + pMenu->InsertItem( MID_LAYOUT_DRAWERS, OUString("Drawer-Layout"), MenuItemBits::CHECKABLE ); pMenu->CheckItem( MID_LAYOUT_DRAWERS, impl_getLayout() == LAYOUT_DRAWERS ); pMenu->InsertSeparator(); diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index 3bf7e24d5ca7..c92de8a4b43d 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -201,7 +201,7 @@ void SfxMenuControl::StateChanged "SfxBoolItem not allowed for SID_OBJECTMENUx" ); bCheck = static_cast<const SfxBoolItem*>(pState)->GetValue(); Menu* pMenu = pOwnMenu->GetSVMenu(); - pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE); + pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MenuItemBits::CHECKABLE); } else if ( pState->ISA(SfxEnumItemInterface) && static_cast<const SfxEnumItemInterface *>(pState)->HasBoolValue() ) @@ -211,7 +211,7 @@ void SfxMenuControl::StateChanged "SfxEnumItem not allowed for SID_OBJECTMENUx" ); bCheck = static_cast<const SfxEnumItemInterface *>(pState)->GetBoolValue(); Menu* pMenu = pOwnMenu->GetSVMenu(); - pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MIB_CHECKABLE); + pMenu->SetItemBits( GetId() , pMenu->GetItemBits( GetId() ) | MenuItemBits::CHECKABLE); } else if ( ( b_ShowStrings || bIsObjMenu ) && pState->ISA(SfxStringItem) ) { diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index 6ff82a83a061..cbe6f09ab13b 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -187,7 +187,7 @@ PopupMenu* InsertThesaurusSubmenu_Impl( SfxBindings* pBindings, Menu* pSVMenu ) else // nNumSynonyms == 0 { const OUString aItemText( SfxResId(STR_MENU_NO_SYNONYM_FOUND).toString() ); - pThesSubMenu->InsertItem( 1, aItemText, MIB_NOSELECT ); + pThesSubMenu->InsertItem( 1, aItemText, MenuItemBits::NOSELECT ); } pThesSubMenu->InsertSeparator(); const OUString sThesaurus( SfxResId(STR_MENU_THESAURUS).toString() ); diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 7be7d806fb78..2fa97069ff54 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -862,7 +862,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) nItemId = START_ITEMID_WINDOWLIST; for ( sal_uInt32 i = 0; i < aNewWindowListVector.size(); i++ ) { - pMenu->InsertItem( nItemId, aNewWindowListVector.at( i ), MIB_RADIOCHECK ); + pMenu->InsertItem( nItemId, aNewWindowListVector.at( i ), MenuItemBits::RADIOCHECK ); if ( nItemId == nActiveItemId ) pMenu->CheckItem( nItemId ); ++nItemId; diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index d8668186fcf3..6b6bd0d11aa0 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -888,7 +888,7 @@ void SidebarController::ShowPopupMenu ( ++iItem,++nIndex) { const sal_Int32 nMenuIndex (nIndex+MID_FIRST_PANEL); - pMenu->InsertItem(nMenuIndex, iItem->msDisplayName, MIB_RADIOCHECK); + pMenu->InsertItem(nMenuIndex, iItem->msDisplayName, MenuItemBits::RADIOCHECK); pMenu->CheckItem(nMenuIndex, iItem->mbIsCurrentDeck ? sal_True : sal_False); pMenu->EnableItem(nMenuIndex, (iItem->mbIsEnabled&&iItem->mbIsActive) ? sal_True : sal_False); @@ -896,12 +896,12 @@ void SidebarController::ShowPopupMenu ( if (iItem->mbIsCurrentDeck) { // Don't allow the currently visible deck to be disabled. - pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MIB_RADIOCHECK); + pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MenuItemBits::RADIOCHECK); pCustomizationMenu->CheckItem(nSubMenuIndex, true); } else { - pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MIB_CHECKABLE); + pCustomizationMenu->InsertItem(nSubMenuIndex, iItem->msDisplayName, MenuItemBits::CHECKABLE); pCustomizationMenu->CheckItem(nSubMenuIndex, iItem->mbIsActive ? sal_True : sal_False); } } @@ -962,7 +962,7 @@ IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu) SwitchToDeck(mpTabBar->GetDeckIdForIndex(nIndex - MID_FIRST_PANEL)); } else if (nIndex >=MID_FIRST_HIDE) - if (pMenu->GetItemBits(nIndex) == MIB_CHECKABLE) + if (pMenu->GetItemBits(nIndex) == MenuItemBits::CHECKABLE) mpTabBar->ToggleHideFlag(nIndex-MID_FIRST_HIDE); } catch (RuntimeException&) |