Skip to content

C
core
Kaydet (Commit) 9b8dc2ad authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

loplugin:simplifybool 

Change-Id: I1865fd9c73e83d8305135b67ece3d45997e309f3
üst bfef606e
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
framework/source/uielement/menubarmanager.cxx
Dosyayı görüntüle @ 9b8dc2ad
...@@ -688,7 +688,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu ) ...@@ -688,7 +688,7 @@ void MenuBarManager::CheckAndAddMenuExtension( Menu* pMenu )
static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId) static void lcl_CheckForChildren(Menu* pMenu, sal_uInt16 nItemId)
{ {
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId )) if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( nItemId ))
pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() ? true : false ); pMenu->EnableItem( nItemId, pThisPopup->GetItemCount() != 0 );
} }
// vcl handler // vcl handler
...@@ -866,7 +866,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu ) ...@@ -866,7 +866,7 @@ IMPL_LINK( MenuBarManager, Activate, Menu *, pMenu )
pMenuItemHandler->xPopupMenuController->updatePopupMenu(); pMenuItemHandler->xPopupMenuController->updatePopupMenu();
bPopupMenu = true; bPopupMenu = true;
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId )) if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() ? true : false ); pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() != 0 );
} }
lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId); lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
...@@ -1906,7 +1906,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo ...@@ -1906,7 +1906,7 @@ void MenuBarManager::Init(const Reference< XFrame >& rFrame,Menu* pAddonMenu,boo
if ( pPopupMenu ) if ( pPopupMenu )
{ {
Reference< XDispatchProvider > xDispatchProvider; Reference< XDispatchProvider > xDispatchProvider;
MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, _bHandlePopUp ? false : bDeleteChildren, _bHandlePopUp ? false : bDeleteChildren ); MenuBarManager* pSubMenuManager = new MenuBarManager( m_xContext, rFrame, m_xURLTransformer,xDispatchProvider, aModuleIdentifier, pPopupMenu, !_bHandlePopUp && bDeleteChildren, !_bHandlePopUp && bDeleteChildren );
Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY ); Reference< XStatusListener > xSubMenuManager( static_cast< OWeakObject *>( pSubMenuManager ), UNO_QUERY );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment