summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Power <noel.power@suse.com>2012-08-16 18:54:14 +0100
committerNoel Power <noel.power@suse.com>2012-08-16 18:56:43 +0100
commit6719ef77c4068c8d02eb0f690dfd3bc0c61cb58d (patch)
tree81224f4317797cfd57d1b9dfab5723f469da38a5
parente7f9b7642c7a2f7723871e72de9f8ed6b3a07e26 (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: Iaa4b3713f55bff9e129f8f9ee7105650122b7145 Signed-off-by: Kohei Yoshida <kohei.yoshida@gmail.com>
-rw-r--r--framework/source/uielement/menubarmanager.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 5e80d0e20936..5b9cfb338720 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -522,7 +522,8 @@ throw ( RuntimeException )
// Can be removed if follow up task will be fixed directly within applications.
if (
( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:Paste"))) ||
- ( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteSpecial"))) ||
+ // Note: PasteSpecial is handled specifically by calc
+ ( !m_aModuleIdentifier.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")) && pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteSpecial"))) ||
( pMenuItemHandler->aMenuItemURL.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(".uno:PasteClipboard"))) // special for draw/impress
)
bEnabledItem = sal_True;