diff options
Diffstat (limited to 'framework/source/uielement')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 6 |
2 files changed, 1 insertions, 7 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index d24da8c2b673..4c64446bfd8a 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -831,7 +831,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES; else nFlag |= MENU_FLAG_HIDEDISABLEDENTRIES; - pMenu->SetMenuFlags( nFlag | MENU_FLAG_SHOWCHECKIMAGES ); + pMenu->SetMenuFlags( nFlag ); if ( m_bActive ) return 0; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index f30f07ec80fe..63e24f7fb6b8 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1780,9 +1780,6 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) ) aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, sal_False); - pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () | - MENU_FLAG_SHOWCHECKIMAGES); - for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos ) { if ( m_pToolBar->GetItemType(nPos) == TOOLBOXITEM_BUTTON ) @@ -1827,9 +1824,6 @@ PopupMenu * ToolBarManager::GetToolBarCustomMenu(ToolBox* pToolBar) // create an own submenu to avoid auto-delete when resource menu is deleted PopupMenu *pItemMenu = new PopupMenu(); - pItemMenu->SetMenuFlags (pItemMenu->GetMenuFlags () | - MENU_FLAG_SHOWCHECKIMAGES); - for( i=0; i< aPopupMenu.GetPopupMenu( 1 )->GetItemCount(); i++) pItemMenu->CopyItem( *aPopupMenu.GetPopupMenu( 1 ), i, MENU_APPEND ); |