diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-11-29 11:26:02 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-11-29 21:20:32 +0100 |
| commit | 99eb1ede7d68091cc35ad2473d7d3f9893833448 (patch) | |
| tree | 9113c4d296b39cfc9f14d85745ff3969de6fd80a /framework | |
| parent | 484fe977fd5d0aea1ba5a99e69e6225e2629502c (diff) | |
use css::awt::XPopupMenu::setItemImage instead of PopupMenu::SetItemImage
Change-Id: I414a98a2d8a9e9a2995811e95b2db1f66ac87d5e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126043
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 734c5f18dfd5..fe0c684c51b6 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -185,19 +185,14 @@ void ToolbarsMenuController::addCommand( SolarMutexGuard aSolarMutexGuard; - Image aImage; + css::uno::Reference<css::graphic::XGraphic> xGraphic; const StyleSettings& rSettings = Application::GetSettings().GetStyleSettings(); if ( rSettings.GetUseImagesInMenus() ) - aImage = vcl::CommandInfoProvider::GetImageForCommand(rCommandURL, m_xFrame); + xGraphic = vcl::CommandInfoProvider::GetXGraphicForCommand(rCommandURL, m_xFrame); - VCLXPopupMenu* pPopupMenu = static_cast<VCLXPopupMenu *>(comphelper::getFromUnoTunnel<VCLXMenu>( rPopupMenu )); - if ( pPopupMenu ) - { - PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu()); - if ( !!aImage ) - pVCLPopupMenu->SetItemImage( nItemId, aImage ); - } + if (xGraphic.is()) + rPopupMenu->setItemImage(nItemId, xGraphic, false); m_aCommandVector.push_back( rCommandURL ); } |