[Libreoffice-commits] .: Branch 'libreoffice-3-6' - framework/source

[Kohei Yoshida]

 framework/source/uielement/menubarmanager.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9082c45b911ff605622cf67007c79a244a230e7b
Author: Noel Power <noel.power at suse.com>
Date:   Mon Aug 13 16:14:34 2012 +0100

    sync cell context menu & edit menu 'PasteSpecial' entries for calc fdo#46250
    
    calc application specifically handles PasteSpecial so no need to set the state of the menu entry to enabled always ( for calc at least )
    
    Change-Id: Iaf13dd825f0cbdcf9f455db07d727753fae90868
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 4c64446..0aedb9c 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -518,7 +518,9 @@ throw ( RuntimeException )
                 #ifdef UNIX
                 //enable some slots hardly, because UNIX clipboard does not notify all changes
                 // Can be removed if follow up task will be fixed directly within applications.
-                if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" || pMenuItemHandler->aMenuItemURL == ".uno:PasteSpecial"
+                // Note: PasteSpecial is handled specifically by calc
+                if ( pMenuItemHandler->aMenuItemURL == ".uno:Paste" ||
+                    ( m_aModuleIdentifier != "com.sun.star.sheet.SpreadsheetDocument" && pMenuItemHandler->aMenuItemURL == ".uno:PasteSpecial" )
                     || pMenuItemHandler->aMenuItemURL == ".uno:PasteClipboard" )      // special for draw/impress
                     bEnabledItem = sal_True;
                 #endif