summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSzymon Kłos <szymon.klos@collabora.com>2022-05-27 14:50:21 +0200
committerAndras Timar <andras.timar@collabora.com>2022-05-27 20:32:34 +0200
commit0599a73c3c2bffdbfa4e695e2d694f1947215a07 (patch)
treef57258934c68ab8c1ce75cdf59b58087e008d4d7
parent34eea317c5929d640aa43477c737d26d6b700bdb (diff)
tdf#145875 don't open Insert section dialog when pasting image
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>
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 7768414cb4ba..5c3988e458b7 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -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,