From d8b5bd541b946de2b3e70e8227baf6eb602ba8e2 Mon Sep 17 00:00:00 2001 From: Vinaya Mandke Date: Mon, 5 May 2014 14:13:31 +0530 Subject: [PATCH] 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 --- sw/qa/extras/ooxmlexport/data/fdo78284.docx | Bin 0 -> 26129 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++++++++++ sw/source/filter/ww8/docxsdrexport.cxx | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 sw/qa/extras/ooxmlexport/data/fdo78284.docx diff --git a/sw/qa/extras/ooxmlexport/data/fdo78284.docx b/sw/qa/extras/ooxmlexport/data/fdo78284.docx new file mode 100644 index 0000000000000000000000000000000000000000..92145eb127c637f7342772cbde69e01485890477 GIT binary patch literal 26129 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

  • i_FsB$p0=?bc1Ar zRp$Ia!V4F{j|%=4m>UEs`%eV?4KeTt_;TYL#4Zo~iTzT143B}YHoU<+5`f3R)gHp5 z;7gQlPztaQtlwSzYrzsc2fpUvh9mLUPtLCu5b)-|Ct7ceVbOsk0Pr7aS9o*y#MliW z{pru6|CT0$w}(%g+}JnE{4@GLB~jox@OvCL99`AlIM*=_yz%cb(TynpV4?eq4}L~S m@Ye7X$&J1J^Ph)?n^qKMZeL4q!9G?A0BW#|Vz&PEZ~q6Hm`e-* literal 0 HcmV?d00001 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 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;