summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2015-07-16 22:30:34 +0200
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-07-17 01:20:58 +0000
commit927c320c2e8b5c8670e94f989b9fc09a5aa73437 (patch)
tree0f0d189e55885088f861d7019045b18ac3b0e75c /sw
parent31b9e0386dfc17d659fc19f7b94fd53fcdae1ab5 (diff)
oox: fix invalid mime type "image/tif"
(regression from ccfc02f7691848284403d339ee17054169fbff1d) Change-Id: I29a366228bf08f29edfa4a8e963889e34aa3d2ea (cherry picked from commit f18ca153aac53408284062309db513ab73f7dd2c) Reviewed-on: https://gerrit.libreoffice.org/17144 Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com> Tested-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport5.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
index dd3a11f15950..50545cc42ecd 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")