diff options
| author | susobhang70 <susobhang70@gmail.com> | 2016-01-03 22:38:50 +0530 |
|---|---|---|
| committer | jan iversen <jani@documentfoundation.org> | 2016-01-05 09:52:53 +0000 |
| commit | 5c39b28a87060f80404079ab77604f664addb063 (patch) | |
| tree | 34278a77a62adcc071c9c17bc793a6b565d65b68 /framework/source/uielement/menubarmanager.cxx | |
| parent | 075c7eceb0769b61d11a3857e33af1b2c6341bc5 (diff) | |
tdf#96059 Replaced imageproducer with CommandInfoProvider
Replaced all instances of framework::GetImageFromURL with vcl::CommandInfoProvider::Instance().GetImageForCommand
Change-Id: I895a4a80d0219a6523b62d90ca88ec67a433b01c
Reviewed-on: https://gerrit.libreoffice.org/21101
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: jan iversen <jani@documentfoundation.org>
Diffstat (limited to 'framework/source/uielement/menubarmanager.cxx')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 137737009ba8..5af937157351 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -1297,7 +1297,7 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( bItemShowMenuImages && !pPopup->GetItemImage( ITEMID_ADDONLIST )) { Reference< XFrame > xTemp( rFrame ); - Image aImage = GetImageFromURL( xTemp, aItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( aItemCommand, false, xTemp ); if ( !!aImage ) pPopup->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -1326,12 +1326,12 @@ void MenuBarManager::FillMenuManager( Menu* pMenu, const Reference< XFrame >& rF if ( pMenuAttributes && !pMenuAttributes->aImageId.isEmpty() ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( m_xFrame, aImageId, false ); + aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( aImageId, false, m_xFrame ); } if ( !aImage ) { - aImage = GetImageFromURL( m_xFrame, aItemCommand, false ); + aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand( aItemCommand, false, m_xFrame ); if ( !aImage ) aImage = AddonsOptions().GetImageFromURL( aItemCommand, false ); } |