From 3da86d8987db6223b0acc5d8a1b56f7e0c54bbef Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Fri, 12 Jan 2018 17:32:41 +0100 Subject: tdf#114488 Rank multiple images also for flat odf Only the file extension was considered before which is not available in flat odf. Now both internal and external URLs are resolved to their respective mimetype. Change-Id: Id7e290cd9a441a1a6c2ce5e8d764391c50495bea Reviewed-on: https://gerrit.libreoffice.org/47824 Tested-by: Jenkins Reviewed-by: Samuel Mehrbrodt --- comphelper/source/misc/graphicmimetype.cxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'comphelper/source/misc/graphicmimetype.cxx') diff --git a/comphelper/source/misc/graphicmimetype.cxx b/comphelper/source/misc/graphicmimetype.cxx index bf88312304b1..559c3087a2da 100644 --- a/comphelper/source/misc/graphicmimetype.cxx +++ b/comphelper/source/misc/graphicmimetype.cxx @@ -19,12 +19,12 @@ #include -#include #include +#include #include +#include #include #include -#include #include #include @@ -48,8 +48,8 @@ OUString GraphicMimeTypeHelper::GetMimeTypeForExtension(const OString& rExt) static const XMLGraphicMimeTypeMapper aMapper[] = { { "gif", "image/gif" }, { "png", "image/png" }, { "jpg", "image/jpeg" }, { "tif", "image/tiff" }, { "svg", "image/svg+xml" }, { "pdf", "application/pdf" }, - { "wmf", "image/x-wmf" }, { "eps", "image/x-eps" }, { "bmp", "image/bmp" }, - { "pct", "image/x-pict" } }; + { "wmf", "image/x-wmf" }, { "emf", "image/x-emf" }, { "eps", "image/x-eps" }, + { "bmp", "image/bmp" }, { "pct", "image/x-pict" }, { "svm", "image/x-svm" } }; OUString aMimeType; -- cgit /cd-5.3-3.4'>distro/collabora/cd-5.3-3.4 LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2021-11-08make a number of Calc functions return value by actually returning itLuboš Luňák