Kaydet (Commit) 3f26ab24 authored tarafından Jan-Marek Glogowski's avatar Jan-Marek Glogowski Kaydeden (comit) Caolán McNamara

fdo#76565 Allow pasting into input fields

Change-Id: If996284aeea4b430cceaaf264035aa9e4ec0f2f0
Reviewed-on: https://gerrit.libreoffice.org/10835Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 2579adb1
...@@ -268,8 +268,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq) ...@@ -268,8 +268,7 @@ void SwBaseShell::ExecClpbrd(SfxRequest &rReq)
TransferableDataHelper aDataHelper( TransferableDataHelper aDataHelper(
TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin() ) ); TransferableDataHelper::CreateFromSystemClipboard( &rSh.GetView().GetEditWin() ) );
if( aDataHelper.GetXTransferable().is() if( aDataHelper.GetXTransferable().is()
&& SwTransferable::IsPaste( rSh, aDataHelper ) && SwTransferable::IsPaste( rSh, aDataHelper ) )
&& !rSh.CrsrInsideInputFld() )
{ {
// Temporary variables, because the shell could already be // Temporary variables, because the shell could already be
// destroyed after the paste. // destroyed after the paste.
...@@ -417,8 +416,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet) ...@@ -417,8 +416,7 @@ void SwBaseShell::StateClpbrd(SfxItemSet &rSet)
break; break;
case SID_PASTE: case SID_PASTE:
if( !GetView().IsPasteAllowed() if( !GetView().IsPasteAllowed() )
|| rSh.CrsrInsideInputFld() )
{ {
rSet.DisableItem( nWhich ); rSet.DisableItem( nWhich );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment