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

[Caolán McNamara (via logerrit)]

 framework/source/uielement/popuptoolbarcontroller.cxx |   11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

New commits:
commit 843f140289f46bb702674a3875311ef6189d22cb
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sun Dec 12 20:39:53 2021 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Mon Dec 13 10:02:14 2021 +0100

    prefer css::awt::XPopupMenu api
    
    Change-Id: Ib52e4091d6a4e0d01aece3eb5f541cd29187a983
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126707
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx 
b/framework/source/uielement/popuptoolbarcontroller.cxx
index a061d6d60754..0e1811f8bcd7 100644
--- a/framework/source/uielement/popuptoolbarcontroller.cxx
+++ b/framework/source/uielement/popuptoolbarcontroller.cxx
@@ -352,22 +352,21 @@ void GenericPopupToolbarController::statusChanged( const 
css::frame::FeatureStat
 
     if ( m_bReplaceWithLast && !rEvent.IsEnabled && m_xPopupMenu.is() )
     {
-        Menu* pVclMenu = comphelper::getFromUnoTunnel<VCLXMenu>( m_xPopupMenu 
)->GetMenu();
-
         ToolBox* pToolBox = nullptr;
         ToolBoxItemId nId;
         if ( getToolboxId( nId, &pToolBox ) && pToolBox->IsItemEnabled( nId ) )
         {
+            Menu* pVclMenu = comphelper::getFromUnoTunnel<VCLXMenu>( 
m_xPopupMenu )->GetMenu();
             pVclMenu->Activate();
             pVclMenu->Deactivate();
         }
 
-        for ( sal_uInt16 i = 0; i < pVclMenu->GetItemCount(); ++i )
+        for (sal_uInt16 i = 0, nCount = m_xPopupMenu->getItemCount(); i < 
nCount; ++i )
         {
-            sal_uInt16 nItemId = pVclMenu->GetItemId( i );
-            if ( nItemId && pVclMenu->IsItemEnabled( nItemId ) && 
!pVclMenu->GetPopupMenu( nItemId ) )
+            sal_uInt16 nItemId = m_xPopupMenu->getItemId(i);
+            if (nItemId && m_xPopupMenu->isItemEnabled(nItemId) && 
!m_xPopupMenu->getPopupMenu(nItemId).is())
             {
-                functionExecuted( pVclMenu->GetItemCommand( nItemId ) );
+                functionExecuted(m_xPopupMenu->getCommand(nItemId));
                 return;
             }
         }