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/classes | |
| 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/classes')
| -rw-r--r-- | framework/source/classes/menumanager.cxx | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 56ae8e47d55b..8f354c6d5498 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -51,6 +51,7 @@ #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/settings.hxx> +#include <vcl/commandinfoprovider.hxx> #include <osl/mutex.hxx> #include <osl/file.hxx> @@ -165,7 +166,7 @@ MenuManager::MenuManager( // Set image for the addon popup menu item if ( bShowMenuImages && !pPopupMenu->GetItemImage( ITEMID_ADDONLIST )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aItemCommand, false, rFrame ); if ( !!aImage ) pPopupMenu->SetItemImage( ITEMID_ADDONLIST, aImage ); } @@ -186,7 +187,7 @@ MenuManager::MenuManager( AddMenu(pSubMenu,OUString(),nItemId,true,false); if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aItemCommand, false, rFrame ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -201,7 +202,7 @@ MenuManager::MenuManager( if ( bShowMenuImages && !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aItemCommand, false, rFrame ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -222,12 +223,12 @@ MenuManager::MenuManager( if ( pMenuAttributes && !pMenuAttributes->aImageId.isEmpty() ) { // Retrieve image id from menu attributes - aImage = GetImageFromURL( rFrame, aImageId, false ); + aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aImageId, false, rFrame ); } if ( !aImage ) { - aImage = GetImageFromURL( rFrame, aItemCommand, false ); + aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aItemCommand, false, rFrame ); if ( !aImage ) aImage = AddonsOptions().GetImageFromURL( aItemCommand, false ); } @@ -237,7 +238,7 @@ MenuManager::MenuManager( } else if ( !pMenu->GetItemImage( nItemId )) { - Image aImage = GetImageFromURL( rFrame, aItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aItemCommand, false, rFrame ); if ( !!aImage ) pMenu->SetItemImage( nItemId, aImage ); } @@ -948,7 +949,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,bool if ( !aImageId.isEmpty() ) { - Image aImage = GetImageFromURL( _xFrame, aImageId, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aImageId, false, _xFrame ); if ( !!aImage ) { bImageSet = true; @@ -959,7 +960,7 @@ void MenuManager::FillMenuImages(Reference< XFrame >& _xFrame, Menu* _pMenu,bool if ( !bImageSet ) { OUString aMenuItemCommand = _pMenu->GetItemCommand( nId ); - Image aImage = GetImageFromURL( _xFrame, aMenuItemCommand, false ); + Image aImage = vcl::CommandInfoProvider::Instance().GetImageForCommand(aMenuItemCommand, false, _xFrame ); if ( !aImage ) aImage = aAddonOptions.GetImageFromURL( aMenuItemCommand, false ); |