oox/source/export/drawingml.cxx | 2 +- sw/qa/extras/ooxmlexport/ooxmlexport5.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit f18ca153aac53408284062309db513ab73f7dd2c Author: Michael Stahl <mst...@redhat.com> Date: Thu Jul 16 22:30:34 2015 +0200 oox: fix invalid mime type "image/tif" (regression from ccfc02f7691848284403d339ee17054169fbff1d) Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index df535f8..b5ef21f 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -849,7 +849,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia ) pExtension = ".png"; break; case GFX_LINK_TYPE_NATIVE_TIF: - sMediaType = "image/tif"; + sMediaType = "image/tiff"; pExtension = ".tif"; break; case GFX_LINK_TYPE_NATIVE_WMF: diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx index 3df813e..0d45a49 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx @@ -209,7 +209,7 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeTIF, "fdo77476.docx") if (!pXmlDoc) return; - assertXPath(pXmlDoc, "/ContentType:Types/ContentType:Override[@ContentType='image/tif']", "PartName", "/word/media/image1.tif"); + assertXPath(pXmlDoc, "/ContentType:Types/ContentType:Override[@ContentType='image/tiff']", "PartName", "/word/media/image1.tif"); } DECLARE_OOXMLEXPORT_TEST(testFDO77117, "fdo77117.docx") _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits