diff options
| author | Vinaya Mandke <vinaya.mandke@synerzip.com> | 2014-05-05 14:13:31 +0530 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-05-08 09:26:58 +0200 |
| commit | d8b5bd541b946de2b3e70e8227baf6eb602ba8e2 (patch) | |
| tree | 51d644c2e040df3468c9e5c7a4606bd6e7200dcf | |
| parent | 9beda5ab8feaeb6d5e1c64e094065b02551532a4 (diff) | |
fdo#78284 Content-type of ".png" images in Smart Art
Content-type for 'png' images was not getting added in
[Content_Types].xml. This was as only 'jpeg' and 'wmf'
extensions were handled. Modified DocxSdrExport::writeDiagramRels
to handle all types of extensions.
Added UT for the same.
Reviewed on:
https://gerrit.libreoffice.org/9252
Change-Id: I5e068d4db14f3a43be08a4b7c9bf265f388bf356
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/fdo78284.docx | bin | 0 -> 26129 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 6 |
3 files changed, 14 insertions, 3 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/fdo78284.docx b/sw/qa/extras/ooxmlexport/data/fdo78284.docx Binary files differnew file mode 100644 index 000000000000..92145eb127c6 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/fdo78284.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index acd3d0648c3b..bea603d886df 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -3260,6 +3260,17 @@ DECLARE_OOXMLEXPORT_TEST(testPageBreakInFirstPara,"fdo77727.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[2]/w:br","type","page"); } +DECLARE_OOXMLEXPORT_TEST(testFDO78284, "fdo78284.docx") +{ + xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"); + + if (!pXmlDoc) + return; + assertXPath(pXmlDoc,"/ContentType:Types/ContentType:Override[@PartName='/word/media/OOXDiagramDataRels1_0.png']", + "ContentType", + "image/png"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 563e124a9b23..f47a61514330 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -828,10 +828,10 @@ void DocxSdrExport::writeDiagramRels(uno::Reference<xml::dom::XDocument> xDom, diagramDataRelTuple[0] >>= sRelId; diagramDataRelTuple[2] >>= sExtension; OUString sContentType; - if (sExtension == ".jpeg") - sContentType = "image/jpeg"; - else if (sExtension == ".WMF") + if (sExtension.equalsIgnoreAsciiCase(".WMF")) sContentType = "image/x-wmf"; + else + sContentType = OUString("image/") + sExtension.copy(1); sRelId = sRelId.copy(3); StreamDataSequence dataSeq; |