diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-17 18:21:04 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2017-05-18 00:27:45 +0300 |
| commit | 33900a71ab7955d9d2d6009e58c5b5b149c1ce0f (patch) | |
| tree | d513332385e99f23fc3ef54e861ad2e47de68d2b /framework | |
| parent | 598d033c1f345b0f84e43ec7ff2b21fe8c4ce062 (diff) | |
Addon items will get their icons in Activate anyway
(This piece of code is about the "OfficeHelp" feature
of Addons.xcu. "AddonMenu" and "OfficeMenuBar" use a
different MenuBarManager ctor, which never calls
FillMenuManager.)
Change-Id: Iab9ac5c606dd23a208de7f99d2883168fd2b588a
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 895a5392a80b..092a1db76ac6 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1254,36 +1254,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF else if ( pMenu->GetItemType( i ) != MenuItemType::SEPARATOR ) { if ( bItemShowMenuImages ) - { - if ( AddonMenuManager::IsAddonMenuId( nItemId )) - { - // Add-Ons uses images from different places - Image aImage; - OUString aImageId; - - MenuAttributes* pMenuAttributes = - reinterpret_cast<MenuAttributes*>(pMenu->GetUserValue( nItemId )); - - if ( pMenuAttributes && !pMenuAttributes->aImageId.isEmpty() ) - { - // Retrieve image id from menu attributes - aImage = vcl::CommandInfoProvider::GetImageForCommand(aImageId, m_xFrame); - } - - if ( !aImage ) - { - aImage = vcl::CommandInfoProvider::GetImageForCommand(aItemCommand, m_xFrame); - if ( !aImage ) - aImage = AddonsOptions().GetImageFromURL( aItemCommand, false ); - } - - if ( !!aImage ) - pMenu->SetItemImage( nItemId, aImage ); - else - m_bRetrieveImages = true; - } m_bRetrieveImages = true; - } MenuItemHandler* pItemHandler = new MenuItemHandler( nItemId, xStatusListener, xDispatch ); pItemHandler->aMenuItemURL = aItemCommand; |