Kaydet (Commit) 927c320c authored tarafından Michael Stahl's avatar Michael Stahl Kaydeden (comit) Adolfo Jayme Barrientos

oox: fix invalid mime type "image/tif"

(regression from ccfc02f7)

Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea
(cherry picked from commit f18ca153)
Reviewed-on: https://gerrit.libreoffice.org/17144Reviewed-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
Tested-by: 's avatarAdolfo Jayme Barrientos <fitojb@ubuntu.com>
üst 31b9e038
...@@ -849,7 +849,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia ) ...@@ -849,7 +849,7 @@ OUString DrawingML::WriteImage( const Graphic& rGraphic , bool bRelPathToMedia )
pExtension = ".png"; pExtension = ".png";
break; break;
case GFX_LINK_TYPE_NATIVE_TIF: case GFX_LINK_TYPE_NATIVE_TIF:
sMediaType = "image/tif"; sMediaType = "image/tiff";
pExtension = ".tif"; pExtension = ".tif";
break; break;
case GFX_LINK_TYPE_NATIVE_WMF: case GFX_LINK_TYPE_NATIVE_WMF:
......
...@@ -209,7 +209,7 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeTIF, "fdo77476.docx") ...@@ -209,7 +209,7 @@ DECLARE_OOXMLEXPORT_TEST(testContentTypeTIF, "fdo77476.docx")
if (!pXmlDoc) if (!pXmlDoc)
return; 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") DECLARE_OOXMLEXPORT_TEST(testFDO77117, "fdo77117.docx")
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment