diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-01-12 17:32:41 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2018-01-15 13:50:10 +0100 |
| commit | 3da86d8987db6223b0acc5d8a1b56f7e0c54bbef (patch) | |
| tree | 0afdf8c0a0497ebfd8ef1303bfc51c5a3177a4a5 /comphelper | |
| parent | 0623f3a8f5d6fbc5e9b933cb034184084e8ac666 (diff) | |
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 <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/graphicmimetype.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
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 <comphelper/graphicmimetype.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/graphic/GraphicProvider.hpp> +#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/uno/Reference.hxx> #include <comphelper/processfactory.hxx> @@ -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; |