summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-08-13 16:14:34 +0100
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-08-16 11:55:38 -0400
commit9082c45b911ff605622cf67007c79a244a230e7b (patch)
treefed4747e4e0b76eb370d25927c30bef82ac06ed5
parent0484239b2704235fef611820af6780364120fbe4 (diff)
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@gmail.com>
-rw-r--r--framework/source/uielement/menubarmanager.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 4c64446bfd8a..0aedb9c1320f 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