diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2014-08-07 15:18:19 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-17 16:23:05 -0500 |
| commit | 3f26ab24e0bfd27645c97ff7915fba2db409930a (patch) | |
| tree | 1c4bafb1001a041fb0eeacd3a4e7bed38bb8253e | |
| parent | 2579adb13188d276701b1504b4a10bed4d8d4b6f (diff) | |
fdo#76565 Allow pasting into input fields
Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0
Reviewed-on: https://gerrit.libreoffice.org/10835
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/uibase/shells/basesh.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx index 05d2a7508222..49869f4988ae 100644 --- a/sw/source/uibase/shells/basesh.cxx +++ b/sw/source/uibase/shells/basesh.cxx @@ -268,8 +268,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. @@ -417,8 +416,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) break; case SID_PASTE: - if( !GetView().IsPasteAllowed() - || rSh.CrsrInsideInputFld() ) + if( !GetView().IsPasteAllowed() ) { rSet.DisableItem( nWhich ); } |