summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorSerge Krot <Serge.Krot@cib.de>2018-03-19 22:19:38 +0100
committerAndras Timar <andras.timar@collabora.com>2018-03-26 08:29:23 +0200
commit4e136b5d0d8fb5bf4712cffbda71979b8c02c3a4 (patch)
treed1483f9ab975c02522a500b9c5b6548b42a3e361 /xmloff
parent2564d17e117b2489cd06c476dbdc61360cc512c7 (diff)
tdf#115005 Do not remove original vector images from slides
During calculation of the quality index of the image, we should take into account also SVM vector image type. Its mime type is image/x-vclgraphic. Reviewed-on: https://gerrit.libreoffice.org/51599 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Conflicts: sd/qa/unit/export-tests-ooxml2.cxx xmloff/source/core/xmlmultiimagehelper.cxx Reviewed-on: https://gerrit.libreoffice.org/51655 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> (cherry picked from commit 070f3db51da48c70cde12050c18fb03de2192c0f) Change-Id: I7c723e99995f73258bb59d976a6c7670c51f7a25
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/source/core/xmlmultiimagehelper.cxx4
1 files changed, 4 insertions, 0 deletions
diff --git a/xmloff/source/core/xmlmultiimagehelper.cxx b/xmloff/source/core/xmlmultiimagehelper.cxx
index 3d7725a3b24f..c0e437c1f370 100644
--- a/xmloff/source/core/xmlmultiimagehelper.cxx
+++ b/xmloff/source/core/xmlmultiimagehelper.cxx
@@ -64,6 +64,10 @@ namespace
}
// vector formats, prefer always
+ if(sMimeType == "image/x-vclgraphic") // MIMETYPE_VCLGRAPHIC
+ {
+ return 990;
+ }
if(sMimeType == "image/x-svm")
{
return 1000;