From 1e3198931e6e230791e863272082c1d437975008 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 12 Feb 2021 12:46:48 +0000 Subject: avoid auto-hiding disabled menu entries with cut/copy/paste idents too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I549027b496c4c1ee14cd5d9f19f77748600e99db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110822 Tested-by: Caolán McNamara Reviewed-by: Caolán McNamara --- vcl/source/window/menu.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index aa7afb062f15..ea3f8e95ff3d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1264,7 +1264,8 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const else if ( pData->eType != MenuItemType::SEPARATOR ) // separators handled above { // tdf#86850 Always display clipboard functions - if ( pData->aCommandStr == ".uno:Cut" || pData->aCommandStr == ".uno:Copy" || pData->aCommandStr == ".uno:Paste" ) + if ( pData->aCommandStr == ".uno:Cut" || pData->aCommandStr == ".uno:Copy" || pData->aCommandStr == ".uno:Paste" || + pData->sIdent == ".uno:Cut" || pData->sIdent == ".uno:Copy" || pData->sIdent == ".uno:Paste" ) bVisible = true; else // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) ); -- cgit