diff options
| author | Carlos Luque <josecarlos.ruizluque@cib.de> | 2015-07-16 11:59:37 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-08-06 12:56:32 +0200 |
| commit | 70201d62e968da6d60a8e0f2fdefd9995f70333e (patch) | |
| tree | 125b34911e6d58eb10b8499b1f429eb26b39c6e0 /svx | |
| parent | b40ba3f8c5e69408e3250fadd8ac0b79d5b98187 (diff) | |
tdf#92571: add mime types for several image file formats
The new mime types were added the followings:
- eps -> image/x-eps
- wmf -> image/x-wmf
- bmp -> image/bmp
- pct -> image/x-pct
These new mime types are written in the attribute "media-type"
of each image in the file "manifest.xml"
Change-Id: I16edb625e331d3f917c6e8929df004191e317acc
Reviewed-on: https://gerrit.libreoffice.org/17123
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
(cherry picked from commit 4d84153e22bdda33b23deb4c32afcace4c1264f7)
svx: this was supposed to be "image/x-eps"
Change-Id: Ieb9d7f23a0ef1e4546c488a678dbfde085156216
(cherry picked from commit 5351f621d5eb599757af95213c4b391c0f34df2e)
Signed-off-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/xml/xmlgrhlp.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index dba2a919ce3d..fa21c1728fba 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -471,7 +471,11 @@ OUString SvXMLGraphicHelper::ImplGetGraphicMimeType( const OUString& rFileName ) { "png", "image/png" }, { "jpg", "image/jpeg" }, { "tif", "image/tiff" }, - { "svg", "image/svg+xml" } + { "svg", "image/svg+xml" }, + { "wmf", "image/x-wmf" }, + { "eps", "image/x-eps" }, + { "bmp", "image/bmp" }, + { "pct", "image/x-pict" } }; OUString aMimeType; |