diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-04-11 11:32:52 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-11 10:37:17 +0000 |
| commit | daf209b64d36ee5261ee18e91548d02ce374fbe3 (patch) | |
| tree | 465ff2c9be06af5ff85b10f07dcdef33e87fc95d /framework | |
| parent | 58bcea744ac4d9f73f055527369ef54cbc8f1a97 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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() ) { |