mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oox: fix invalid mime type "image/tif"

Browse Source 
(regression from ccfc02f769)

Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea
This commit is contained in:
Michael Stahl
2015-07-16 22:30:34 +02:00
parent f8958ab9ab
commit f18ca153aa
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
oox/source/export/drawingml.cxx
View File

@@ -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:

2
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
View File

@@ -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")