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

EditEngine: Removing BIN format from sc

Change-Id: I4d6b796439b90cab6a480f0bb8dc2c931e36cbe9
Reviewed-on: https://gerrit.libreoffice.org/40329Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 959ace58
......@@ -194,7 +194,6 @@ void ScSelectionTransferObj::AddSupportedFormats()
AddFormat( SotClipboardFormatId::RICHTEXT );
if ( eMode == SC_SELTRANS_CELL )
{
AddFormat( SotClipboardFormatId::EDITENGINE );
AddFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT );
}
break;
......
......@@ -243,7 +243,6 @@ void ScTransferObj::AddSupportedFormats()
AddFormat( SotClipboardFormatId::RICHTEXT );
if ( aBlock.aStart == aBlock.aEnd )
{
AddFormat( SotClipboardFormatId::EDITENGINE );
AddFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT );
}
}
......@@ -260,8 +259,7 @@ bool ScTransferObj::GetData( const datatransfer::DataFlavor& rFlavor, const OUSt
bOK = SetTransferableObjectDescriptor( aObjDesc );
}
else if ( ( nFormat == SotClipboardFormatId::RTF || nFormat == SotClipboardFormatId::RICHTEXT ||
nFormat == SotClipboardFormatId::EDITENGINE || nFormat == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT )
&& aBlock.aStart == aBlock.aEnd )
nFormat == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) && aBlock.aStart == aBlock.aEnd )
{
// RTF from a single cell is handled by EditEngine
......
......@@ -79,8 +79,7 @@ void ScViewFunc::PasteRTF( SCCOL nStartCol, SCROW nStartRow,
const css::uno::Reference< css::datatransfer::XTransferable >& rxTransferable )
{
TransferableDataHelper aDataHelper( rxTransferable );
if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
if ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) )
{
HideAllCursors();
......
......@@ -285,8 +285,7 @@ bool ScViewFunc::PasteDataFormat( SotClipboardFormatId nFormatId,
else if ( ScImportExport::IsFormatSupported( nFormatId ) || nFormatId == SotClipboardFormatId::RTF ||
nFormatId == SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT )
{
if ( nFormatId == SotClipboardFormatId::RTF && ( aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE ) ||
aDataHelper.HasFormat( SotClipboardFormatId::EDITENGINE_ODF_TEXT_FLAT ) ) )
if ( nFormatId == SotClipboardFormatId::RTF && ( 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