From daf209b64d36ee5261ee18e91548d02ce374fbe3 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Mon, 11 Apr 2016 11:32:52 +0200 Subject: allow disabling recent files menu entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Tested-by: Caolán McNamara --- framework/source/uielement/menubarmanager.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'framework/source') diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9b4b334189e7..0e32ae1d0093 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -861,7 +861,8 @@ IMPL_LINK_TYPED( MenuBarManager, Activate, Menu *, pMenu, bool ) if ( !pMenuItemHandler->xPopupMenuController.is() && m_xPopupMenuControllerFactory->hasController( pMenuItemHandler->aMenuItemURL, m_aModuleIdentifier ) ) { - bPopupMenu = CreatePopupMenuController( pMenuItemHandler ); + if( xMenuItemDispatch.is() || !pMenuItemHandler->aMenuItemURL.equalsAscii( ".uno:RecentFileList") ) + bPopupMenu = CreatePopupMenuController( pMenuItemHandler ); } else if ( pMenuItemHandler->xPopupMenuController.is() ) { -- cgit