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

[Noel Power]

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

New commits:
commit 6719ef77c4068c8d02eb0f690dfd3bc0c61cb58d
Author: Noel Power <noel.power at suse.com>
Date:   Thu Aug 16 18:54:14 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: Iaa4b3713f55bff9e129f8f9ee7105650122b7145
    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 5e80d0e..5b9cfb3 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;