diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2020-06-14 16:23:54 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2020-06-19 14:17:14 +0200 |
| commit | 9bbc60c0d5e60eacecd624f343aecc94e4219c84 (patch) | |
| tree | 96325237e9c500f5ad57ab9407ab67851e7debb4 | |
| parent | a2113f5f46921c38a0c4929bb564183009a838e9 (diff) | |
tdf#133924 DOCX export: fix text wraps around frame
Co-authored-by: Attila Bakos (NISZ)
Change-Id: I08f0c8a8f4f554178548ca5fc8d072998a379b32
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96290
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf133924.docx | bin | 0 -> 12612 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport6.cxx | 12 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 11 |
3 files changed, 15 insertions, 8 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf133924.docx b/sw/qa/extras/ooxmlexport/data/tdf133924.docx Binary files differnew file mode 100644 index 000000000000..3bdbe8d6f1e0 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf133924.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx index df0ee671c9c1..123a339c6232 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport6.cxx @@ -977,7 +977,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf133457, "tdf133457.docx") if (!pXmlDocument) return; - assertXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:pPr/w:framePr","vAnchor","text"); + assertXPath(pXmlDocument, "/w:document/w:body/w:p[4]/w:pPr/w:framePr", "vAnchor", "text"); +} + +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf133924, "tdf133924.docx") +{ + xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); + if (!pXmlDocument) + return; + + assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/w:pPr/w:framePr", "wrap", "around"); + assertXPath(pXmlDocument, "/w:document/w:body/w:p[3]/w:pPr/w:framePr", "wrap", "notBeside"); } CPPUNIT_PLUGIN_IMPLEMENT(); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 0ebda68eed20..3bd7ae8fbf43 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -583,17 +583,14 @@ void DocxAttributeOutput::PopulateFrameProperties(const SwFrameFormat* pFrameFor switch (pFrameFormat->GetSurround().GetValue()) { case css::text::WrapTextMode_NONE: - attrList->add( FSNS( XML_w, XML_wrap), "none"); - break; - case css::text::WrapTextMode_THROUGH: - attrList->add( FSNS( XML_w, XML_wrap), "through"); - break; - case css::text::WrapTextMode_PARALLEL: attrList->add( FSNS( XML_w, XML_wrap), "notBeside"); break; case css::text::WrapTextMode_DYNAMIC: + attrList->add(FSNS(XML_w, XML_wrap), "auto"); + break; + case css::text::WrapTextMode_PARALLEL: default: - attrList->add( FSNS( XML_w, XML_wrap), "auto"); + attrList->add(FSNS(XML_w, XML_wrap), "around"); break; } attrList->add( FSNS( XML_w, XML_vAnchor), relativeFromV ); |