Kaydet (Commit) 85071c6c authored tarafından Caolán McNamara's avatar Caolán McNamara

language submenu from tools->language->for selection->"languages"...

is always disabled/empty since...

commit a6e8910a
Date:   Wed Feb 17 12:07:59 2016 +0100

    allow disabling file/new, wizards, recent documents menu entries

    disabling the dispatches '.uno:AutoPilotMenu' and '.uno:AddDirect' and
    .uno:RecentFileList via UNO API now results in disabled
    menu entries as expected

    Change-Id: Id99be9374306ff8c0cea919ea94ed96f715a8058
    Reviewed-on: https://gerrit.libreoffice.org/22422

reverting this hunk restores them again

Change-Id: I029c9c3f25fb593127ee8371b278cee102c65882
Reviewed-on: https://gerrit.libreoffice.org/22749Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst ee74e401
......@@ -860,21 +860,18 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
xMenuItemDispatch = xDispatchProvider->queryDispatch( aTargetURL, OUString(), 0 );
bool bPopupMenu( false );
if(xMenuItemDispatch != nullptr)
if ( !pMenuItemHandler->xPopupMenuController.is() &&
m_xPopupMenuControllerFactory->hasController( pMenuItemHandler->aMenuItemURL, m_aModuleIdentifier ) )
{
if ( !pMenuItemHandler->xPopupMenuController.is() &&
m_xPopupMenuControllerFactory->hasController( pMenuItemHandler->aMenuItemURL, m_aModuleIdentifier ) )
{
bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
}
else if ( pMenuItemHandler->xPopupMenuController.is() )
{
// Force update of popup menu
pMenuItemHandler->xPopupMenuController->updatePopupMenu();
bPopupMenu = true;
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() != 0 );
}
bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
}
else if ( pMenuItemHandler->xPopupMenuController.is() )
{
// Force update of popup menu
pMenuItemHandler->xPopupMenuController->updatePopupMenu();
bPopupMenu = true;
if (PopupMenu* pThisPopup = pMenu->GetPopupMenu( pMenuItemHandler->nItemId ))
pMenu->EnableItem( pMenuItemHandler->nItemId, pThisPopup->GetItemCount() != 0 );
}
lcl_CheckForChildren(pMenu, pMenuItemHandler->nItemId);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment