diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2021-12-12 20:39:53 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2021-12-13 10:02:14 +0100 |
| commit | 843f140289f46bb702674a3875311ef6189d22cb (patch) | |
| tree | 2e31513530654211e48fc0eedc07bdb33392c43e /framework | |
| parent | cf3bbe3a753ae9246f0ac98f5a8554aa76216eaf (diff) | |
prefer css::awt::XPopupMenu api
Change-Id: Ib52e4091d6a4e0d01aece3eb5f541cd29187a983
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126707
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/popuptoolbarcontroller.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
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; } } |