From fb698d5e81c8b4149c092305506d40e2f7ef7f5d Mon Sep 17 00:00:00 2001 From: Maxim Monastirsky Date: Sun, 23 Apr 2017 15:04:36 +0300 Subject: Replace GetImage with CommandInfoProvider::GetImageForCommand And move ToolBoxButtonSize->ImageType mapping code to a common place. Change-Id: If158f4b6f2750054fcf64491c2941706e7d3a329 --- framework/source/uielement/popuptoolbarcontroller.cxx | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 74ff9da3f400..7227f05bf847 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -56,16 +56,6 @@ using namespace framework; namespace { -vcl::ImageType getImageType(ToolBoxButtonSize eSize) -{ - vcl::ImageType eImageType = vcl::ImageType::Size16; - if (eSize == ToolBoxButtonSize::Large) - eImageType = vcl::ImageType::Size26; - else if (eSize == ToolBoxButtonSize::Size32) - eImageType = vcl::ImageType::Size32; - return eImageType; -} - typedef cppu::ImplInheritanceHelper< svt::ToolboxController, css::lang::XServiceInfo > ToolBarBase; @@ -383,9 +373,7 @@ void GenericPopupToolbarController::functionExecuted( const OUString& rCommand ) pToolBox->SetItemText( nId, vcl::CommandInfoProvider::GetLabelForCommand( rCommand, m_sModuleName ) ); pToolBox->SetQuickHelpText( nId, vcl::CommandInfoProvider::GetTooltipForCommand( rCommand, m_xFrame ) ); - vcl::ImageType eImageType = getImageType(pToolBox->GetToolboxButtonSize()); - - Image aImage = vcl::CommandInfoProvider::GetImageForCommand(rCommand, m_xFrame, eImageType); + Image aImage = vcl::CommandInfoProvider::GetImageForCommand(rCommand, m_xFrame, pToolBox->GetImageSize()); if ( !!aImage ) pToolBox->SetItemImage( nId, aImage ); } @@ -497,7 +485,7 @@ void SaveToolbarController::updateImage() if ( !getToolboxId( nId, &pToolBox ) ) return; - vcl::ImageType eImageType = getImageType(pToolBox->GetToolboxButtonSize()); + vcl::ImageType eImageType = pToolBox->GetImageSize(); Image aImage; -- cgit v1.2.1