[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - framework/source

[Oliver Specht]

 framework/source/uielement/menubarmanager.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 3bef546c29257ccabdca30baebbd69254c859f16
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Mon Apr 11 11:32:52 2016 +0200

    allow disabling recent files menu entry
    
    patch 85071c6c7b120935b03926228916393a94aa5ef0 fixed the problem of submenus
    in tools/language but broke the disabling of the recent files menu entry
    This patch makes it possible to disable and the recent files entry without
    breaking other menu entries
    
    Change-Id: Ia1ba7c0a75cdf82faacead4f92902f65f05186ba
    Reviewed-on: https://gerrit.libreoffice.org/23988
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit daf209b64d36ee5261ee18e91548d02ce374fbe3)
    Reviewed-on: https://gerrit.libreoffice.org/23992
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 6bb58db..dd307cc 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -872,7 +872,8 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool )
                             if ( !pMenuItemHandler->xPopupMenuController.is() &&
                                  m_xPopupMenuControllerFactory->hasController( aItemCommand, m_aModuleIdentifier ) )
                             {
-                                bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
+                                if( xMenuItemDispatch.is() || !pMenuItemHandler->aMenuItemURL.equalsAscii( ".uno:RecentFileList") )
+                                    bPopupMenu = CreatePopupMenuController( pMenuItemHandler );
                             }
                             else if ( pMenuItemHandler->xPopupMenuController.is() )
                             {