From dfde5b967b27d9a44f35ce96cf99554722985bc5 Mon Sep 17 00:00:00 2001 From: Jan-Marek Glogowski Date: Thu, 7 Aug 2014 15:18:19 +0200 Subject: fdo#76565 Allow pasting into input fields MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-on: https://gerrit.libreoffice.org/10835 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara (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 Tested-by: Caolán McNamara --- sw/source/core/uibase/shells/basesh.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/sw/source/core/uibase/shells/basesh.cxx b/sw/source/core/uibase/shells/basesh.cxx index e7dba76b343e..0ec0312932e5 100644 --- a/sw/source/core/uibase/shells/basesh.cxx +++ b/sw/source/core/uibase/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. @@ -416,8 +415,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) break; case SID_PASTE: - if( !GetView().IsPasteAllowed() - || rSh.CrsrInsideInputFld() ) + if( !GetView().IsPasteAllowed() ) { rSet.DisableItem( nWhich ); } -- cgit v1.2.3