diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-06 22:30:35 +0200 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2015-12-07 00:46:27 +0200 |
| commit | 8ca76fc12e088a95247cb8e47ba8252db59e7ea6 (patch) | |
| tree | d642ad31f1936c54a6e892fdddb973388750f0a5 | |
| parent | 9e9703389e015d0f3520344715df6719559362e4 (diff) | |
tdf#93837 Never hide clipboard functions in context menus
This updates the hack made for tdf#86850 for the new
implementation. We're going to use .uno command names,
instead of sfx2 SIDs.
While touching this, I removed the check for the Paste
Special menu. It's not backed by a real sfx2 slot, so
never disabled.
Change-Id: I1e2078e98987ad1f5f46e3964d878cb967ac00ef
| -rw-r--r-- | vcl/source/window/menu.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 3a6e54c67f03..a06962d2d24c 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -1346,7 +1346,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->nId == SID_CUT || pData->nId == SID_COPY || pData->nId == SID_PASTE || pData->nId == SID_MENU_PASTE_SPECIAL ) + if ( pData->nId == SID_CUT || pData->nId == SID_COPY || pData->nId == SID_PASTE || + pData->aCommandStr == ".uno:Cut" || pData->aCommandStr == ".uno:Copy" || pData->aCommandStr == ".uno:Paste" ) bVisible = true; else // bVisible = pData->bEnabled && ( !pData->pSubMenu || pData->pSubMenu->HasValidEntries( true ) ); |