diff options
| author | Trent MacAlpine <tmacalp@gmail.com> | 2015-04-26 18:31:17 -0400 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2015-05-14 16:56:33 +0000 |
| commit | fa4a87bc539865962dabf00aea465479d34faf92 (patch) | |
| tree | 4d08dc5b460397b80e02f88882344e8a65a86a5c | |
| parent | 135755ed9e64d4208ef5b578c9b43ad23bb4ed66 (diff) | |
tdf#86850 Always display clipboard functions in context menu
Change-Id: I6e8b750662894050453932dd60830e7ae4ae27f4
Reviewed-on: https://gerrit.libreoffice.org/15546
Tested-by: Jenkins <ci@libreoffice.org>
Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
| -rw-r--r-- | vcl/source/window/menu.cxx | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 0731254ff6c9..98f95310478d 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -64,6 +64,8 @@ #include "vcl/lazydelete.hxx" +#include <sfx2/sfxsids.hrc> + #include <map> #include <vector> @@ -1326,8 +1328,12 @@ bool Menu::ImplIsVisible( sal_uInt16 nPos ) const bVisible = false; else if ( pData->eType != MenuItemType::SEPARATOR ) // separators handled above { - // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) ); - bVisible = pData->bEnabled; // do not check submenus as they might be filled at Activate(). + // tdf#86850 Always display clipboard functions + if ( pData->nId == SID_CUT || pData->nId == SID_COPY || pData->nId == SID_PASTE || pData->nId == SID_MENU_PASTE_SPECIAL ) + bVisible = true; + else + // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) ); + bVisible = pData->bEnabled; // do not check submenus as they might be filled at Activate(). } } |