summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuigi Iucci <luigi.iucci@collabora.com>2023-06-21 10:16:16 +0200
committerAron Budea <aron.budea@collabora.com>2023-07-04 12:52:47 +0200
commit0d38ec8443312398f81aa1eac57e97211018022d (patch)
treed7d85d4b13ba689691a24f745066af2c5b0b97e9
parentBump version to 7.4.7.2.M1 (diff)
downloadcore-0d38ec8443312398f81aa1eac57e97211018022d.tar.gz
core-0d38ec8443312398f81aa1eac57e97211018022d.zip
problem pasting to calc an image copied from firefox (windows)
Calc tries to paste the image as html. In case both HTML_SIMPLE and BITMAP flavors are present in the clipboard, we paste as BITMAP Change-Id: I2527bedf11eb6986b58329acaf360a397af03101 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153614 Tested-by: Jenkins Reviewed-by: Henry Castro <hcastro@collabora.com> (cherry picked from commit 46fa17b70db0d543518dde52908f46c85838ac12) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153668 Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> (cherry picked from commit adaae622b67f525e0fb58af848a7cece8ac65f45)
-rw-r--r--sc/source/ui/view/viewfun3.cxx2
1 files changed, 2 insertions, 0 deletions
diff --git a/sc/source/ui/view/viewfun3.cxx b/sc/source/ui/view/viewfun3.cxx
index 6f9807755d0a..f2edeb4667f0 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -599,6 +599,8 @@ void ScViewFunc::PasteFromSystem()
PasteFromSystem(SotClipboardFormatId::RICHTEXT);
else if (aDataHelper.HasFormat(SotClipboardFormatId::HTML))
PasteFromSystem(SotClipboardFormatId::HTML);
+ else if (aDataHelper.HasFormat(SotClipboardFormatId::BITMAP))
+ PasteFromSystem(SotClipboardFormatId::BITMAP);
else if (aDataHelper.HasFormat(SotClipboardFormatId::HTML_SIMPLE))
PasteFromSystem(SotClipboardFormatId::HTML_SIMPLE);
else if (aDataHelper.HasFormat(SotClipboardFormatId::SYLK))