diff options
| author | Oliver Specht <oliver.specht@cib.de> | 2016-04-11 11:32:52 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-04-12 08:52:17 +0000 |
| commit | 3bef546c29257ccabdca30baebbd69254c859f16 (patch) | |
| tree | 7ea1a58a092606fddaff42974b5e2d74c9889dc4 /framework | |
| parent | 8e65e1f91f23ff8ea34617c7fdacd933de0fad18 (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>
(cherry picked from commit daf209b64d36ee5261ee18e91548d02ce374fbe3)
Reviewed-on: https://gerrit.libreoffice.org/23992
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
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 6bb58db7d1bf..dd307cc14b10 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() ) { |