sw/source/uibase/dochdl/swdtflvr.cxx |    5 +++++
 1 file changed, 5 insertions(+)

New commits:
commit 7f9fd86e01f2d4a70c2ce5a2c69994f2eeb05f65
Author:     Szymon Kłos <szymon.k...@collabora.com>
AuthorDate: Fri May 27 14:50:21 2022 +0200
Commit:     Andras Timar <andras.ti...@collabora.com>
CommitDate: Fri May 27 20:34:18 2022 +0200

    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/+/135040
    Tested-by: Andras Timar <andras.ti...@collabora.com>
    Reviewed-by: Andras Timar <andras.ti...@collabora.com>

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index fadba4319510..f131f6e8091e 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1487,6 +1487,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,

Reply via email to