[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - svx/source

[Carlos Luque]

 svx/source/xml/xmlgrhlp.cxx |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit be9b36aae83d30ea902ad174a190d8f2463b893f
Author: Carlos Luque <josecarlos.ruizluque at cib.de>
Date:   Thu Jul 16 11:59:37 2015 +0200

    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 at CIB.de>
    Tested-by: Thorsten Behrens <Thorsten.Behrens at 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 at ubuntu.com>

diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx
index dba2a91..fa21c17 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;