Kaydet (Commit) b0f0096f authored tarafından Varun Dhall's avatar Varun Dhall Kaydeden (comit) Michael Stahl

EditEngine: Added ODF_TEXT_FLAT paste for sc

Change-Id: I40acd32229faa9a4ec9941592a4a952b7d05ef01
Reviewed-on: https://gerrit.libreoffice.org/38464Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst c8bc5869
......@@ -79,7 +79,8 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable )
{
TransferableDataHelper aDataHelper( rxTransferable );
if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) )
if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
{
HideAllCursors();
......
......@@ -282,9 +282,11 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
{
bRet = PasteLink( rxTransferable );
}
else if ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == SotClipboardFormatId::RTF )
else if ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == SotClipboardFormatId::RTF ||
nFormatId == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT )
{
if ( nFormatId == SotClipboardFormatId::RTF && aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) )
if ( nFormatId == SotClipboardFormatId::RTF && ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ) )
{
// use EditView's PasteSpecial / Drop
PasteRTF( nPosX, nPosY, rxTransferable );
......
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