From 0fc0acb52529a3cc8e2ff2c17e074cf6ac8ba1a7 Mon Sep 17 00:00:00 2001 From: Pallavi Jadhav Date: Tue, 21 Jan 2014 19:49:45 +0530 Subject: [PATCH] Fix for :DOCX-Preservation of Line style Dash type of "Shape with text inside" Issue : File containing Shape with text inside it having Line style as Dash type is not getting preserved after RT. Implementation : 1] Added XML element with attribute val="dash". 2] Written Export Unit test case. Conflicts: sw/qa/extras/ooxmlexport/ooxmlexport.cxx Reviewed on: https://gerrit.libreoffice.org/7572 Change-Id: I27ca9f8786426a224b32dbd2aeabc40be244c9db --- .../ooxmlexport/data/LineStyle_DashType.docx | Bin 0 -> 15661 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 11 +++++++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 2 ++ 3 files changed, 13 insertions(+) create mode 100644 sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx diff --git a/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx b/sw/qa/extras/ooxmlexport/data/LineStyle_DashType.docx new file mode 100644 index 0000000000000000000000000000000000000000..9256c3ec7a4e87f18da93ba4f2c8739bd0df2b72 GIT binary patch literal 15661 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 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 771c2c5ac8a2..746422e368e4 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2687,6 +2687,17 @@ DECLARE_OOXMLEXPORT_TEST(testAlignForShape,"Shape.docx") assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:r[1]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp:positionH/wp:align","1"); } +DECLARE_OOXMLEXPORT_TEST(testLineStyle_DashType, "LineStyle_DashType.docx") +{ + /* DOCX contatining Shape with LineStyle as Dash Type should get preserved inside + * an XMl tag with value "dash". + */ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r[2]/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wps:wsp/wps:spPr/a:ln/a:prstDash", "val", "dash"); +} + #endif CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 7c15a2244712..caf2635800e6 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5810,6 +5810,8 @@ void DocxAttributeOutput::FormatBox( const SvxBoxItem& rBox ) XML_val, sColor, FSEND); m_pSerializer->endElementNS(XML_a, XML_solidFill); + if( LineStyle_DASH == pTop->GetBorderLineStyle() ) // Line Style is Dash type + m_pSerializer->singleElementNS(XML_a, XML_prstDash, XML_val, "dash", FSEND); m_pSerializer->endElementNS(XML_a, XML_ln); } }