[Libreoffice-commits] core.git: vcl/source

[Trent MacAlpine]

 vcl/source/window/menu.cxx |   10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit fa4a87bc539865962dabf00aea465479d34faf92
Author: Trent MacAlpine <tmacalp at gmail.com>
Date:   Sun Apr 26 18:31:17 2015 -0400

    tdf#86850 Always display clipboard functions in context menu
    
    Change-Id: I6e8b750662894050453932dd60830e7ae4ae27f4
    Reviewed-on: https://gerrit.libreoffice.org/15546
    Tested-by: Jenkins <ci at libreoffice.org>
    Tested-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 0731254..98f9531 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().
         }
     }