summaryrefslogtreecommitdiff
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-07 00:25:00 +0200
commit0718ea2655a414887338a9ef7028e764db5bad4d (patch)
tree46ab7d59f693ea315486dd873667653fe5f30e0b
parent7e6fcd23ff11e5f60f890cc5873cff1cb555c44d (diff)
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) (cherry picked from commit 0d38ec8443312398f81aa1eac57e97211018022d) (cherry picked from commit c7c41372a5fe0743042a3664ec52fe2d41c39244)
-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 b4e8744cfe0d..49f14af06c7a 100644
--- a/sc/source/ui/view/viewfun3.cxx
+++ b/sc/source/ui/view/viewfun3.cxx
@@ -597,6 +597,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))