summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2021-02-12 12:46:48 +0000
committerCaolán McNamara <caolanm@redhat.com>2021-02-12 17:21:48 +0100
commit1e3198931e6e230791e863272082c1d437975008 (patch)
treeae63c372e8e0e3e4f2a1ce1229293eeea25bb33b /vcl
parent59ae8c36cff087277a74807f112ad6bd9dc297c4 (diff)
avoid auto-hiding disabled menu entries with cut/copy/paste idents too
Change-Id: I549027b496c4c1ee14cd5d9f19f77748600e99db Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110822 Tested-by: Caolán McNamara <caolanm@redhat.com> Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/menu.cxx3
1 files changed, 2 insertions, 1 deletions
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 ) );