From 9e6960c74dee374e2c9d1af25cb2b678366b19b4 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 18 Feb 2014 14:29:11 +0100 Subject: [PATCH] DOCX drawingML export: fix paragraph margins Without the EndParagraphProperties() call, w:spacing wasn't ever written as a paragraph property. Change-Id: Iff4ca2a9e0725ac38d7b528c220c8ea58fc89cab --- .../data/dml-groupshape-paraspacing.docx | Bin 0 -> 13586 bytes sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 12 ++++++++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 6 ++++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100755 sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx diff --git a/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx b/sw/qa/extras/ooxmlexport/data/dml-groupshape-paraspacing.docx new file mode 100755 index 0000000000000000000000000000000000000000..1cb48d3c2d610a3bd830e86e8e8c5c0b7decaefc GIT binary patch literal 13586 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 G?Ee52ts>w6 literal 0 HcmV?d00001 diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index a7ea17518159..60e0f4f22014 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -2317,6 +2317,18 @@ DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeRelsize, "dml-groupshape-relsize.docx" assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/wp14:sizeRelH", "relativeFrom", "page"); } +DECLARE_OOXMLEXPORT_TEST(testDmlGroupshapeParaspacing, "dml-groupshape-paraspacing.docx") +{ + xmlDocPtr pXmlDoc = parseExport("word/document.xml"); + if (!pXmlDoc) + return; + // Paragraph spacing of shape text in groupshapes was left, the w:spacing element was missing in pPr. + assertXPath(pXmlDoc, + "/w:document/w:body/w:p/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:anchor/a:graphic/a:graphicData/wpg:wgp/wps:wsp[1]/wps:txbx/w:txbxContent/w:p/w:pPr/w:spacing", + "before", + "240"); +} + DECLARE_OOXMLEXPORT_TEST(testTrackChangesDeletedParagraphMark, "testTrackChangesDeletedParagraphMark.docx") { xmlDocPtr pXmlDoc = parseExport("word/document.xml"); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index f376d529a2f6..d30840fb54c1 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -3466,11 +3466,13 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj) sal_Int32 nAktPos = 0; sal_Int32 nEnd = aStr.getLength(); - m_pSerializer->startElementNS( XML_w, XML_p, FSEND ); + StartParagraph(ww8::WW8TableNodeInfo::Pointer_t()); // Write paragraph properties. m_pSerializer->startElementNS(XML_w, XML_pPr, FSEND); + StartParagraphProperties(); aAttrIter.OutParaAttr(false); + EndParagraphProperties(0, 0, 0, 0); m_pSerializer->endElementNS(XML_w, XML_pPr); do { @@ -3497,7 +3499,7 @@ void DocxAttributeOutput::WriteOutliner(const OutlinerParaObject& rParaObj) aAttrIter.NextPos(); } while( nAktPos < nEnd ); - m_pSerializer->endElementNS( XML_w, XML_p ); + EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t()); } m_pSerializer->endElementNS( XML_w, XML_txbxContent ); }