[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.2' - sw/source

[Jan-Marek Glogowski]

 sw/source/ui/shells/basesh.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 074b76e612e45d5a6e1c08847d834b4143dcf96c
Author: Jan-Marek Glogowski <glogow at fbihome.de>
Date:   Thu Aug 7 15:18:19 2014 +0200

    fdo#76565 Allow pasting into input fields
    
    Reviewed-on: https://gerrit.libreoffice.org/10835
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 3f26ab24e0bfd27645c97ff7915fba2db409930a)
    
    Conflicts:
    
    	sw/source/uibase/shells/basesh.cxx
    
    Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0
    Reviewed-on: https://gerrit.libreoffice.org/11780
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx
index b5de5fe..e88731d 100644
--- a/sw/source/ui/shells/basesh.cxx
+++ b/sw/source/ui/shells/basesh.cxx
@@ -267,8 +267,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
                 TransferableDataHelper aDataHelper(
                     TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin() ) );
                 if( aDataHelper.GetXTransferable().is()
-                    && SwTransferable::IsPaste( rSh, aDataHelper )
-                    && !rSh.CrsrInsideInputFld() )
+                    && SwTransferable::IsPaste( rSh, aDataHelper ) )
                 {
                     // Temporary variables, because the shell could already be
                     // destroyed after the paste.
@@ -418,8 +417,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
             break;
 
         case SID_PASTE:
-            if( !GetView().IsPasteAllowed()
-                || rSh.CrsrInsideInputFld() )
+            if( !GetView().IsPasteAllowed() )
             {
                 rSet.DisableItem( nWhich );
             }