[Libreoffice-commits] core.git: framework/source

[Caolán McNamara (via logerrit)]

 framework/source/uielement/toolbarsmenucontroller.cxx |   13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

New commits:
commit 99eb1ede7d68091cc35ad2473d7d3f9893833448
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Mon Nov 29 11:26:02 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Nov 29 21:20:32 2021 +0100

    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 <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

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 );
 }