summaryrefslogtreecommitdiff
path: root/framework
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-08-13 16:14:34 +0100
committerNoel Power <noel.power@suse.com>2012-08-14 09:55:11 +0100
commit7bfb229230a439c2edb3e8452fe0d3430f9931ce (patch)
tree4983fd44425969433fa4fb901472b8fe806762f2 /framework
parentd3bec41a1b92cc8ca9f4750c5f9740da52879085 (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
Diffstat (limited to 'framework')
-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 29385281684e..d3ea1b1f3e7d 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -505,7 +505,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