strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#145875 don't open Insert section dialog when pasting image

Browse source 
This happens when we "copy image" in Firefox of the resource which
cannot be accessed without logging in on some website.

In that case we used HTML format and that resulted in pasting
login webpage as a section.

This patch detects simple HTML containing only an image while it also
contains BITMAP format in the clipboard which we can use directly.
That way we paste image data from the clipboard.

Change-Id: Ia2ee7e246f8c71e1d0958c6c955ec056a0a96f8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135011
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.timar@collabora.com>
This commit is contained in:
Szymon Kłos 2022-05-27 14:50:21 +02:00 committed by Andras Timar
parent 34eea317c5
commit 0599a73c3c
1 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sw/source/uibase/dochdl/swdtflvr.cxx
View file

@ -1494,6 +1494,11 @@ bool SwTransferable::Paste(SwWrtShell& rSh, TransferableDataHelper& rData, RndSt
&nActionFlags );
}
// when HTML is just an image don't generate new section
if (rData.HasFormat(SotClipboardFormatId::HTML_SIMPLE) && rData.HasFormat(SotClipboardFormatId::HTML_NO_COMMENT)
&& rData.HasFormat(SotClipboardFormatId::BITMAP) && nFormat == SotClipboardFormatId::FILE_LIST)
nFormat = SotClipboardFormatId::BITMAP;
// tdf#37223 avoid non-native insertion of Calc worksheets in the following cases:
// content of 1-cell worksheets are inserted as simple text using RTF format,
// bigger worksheets within native (Writer) table cells are inserted as native tables,