diff options
| author | Tibor Nagy <nagy.tibor2@nisz.hu> | 2020-08-10 10:51:20 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2020-09-15 16:54:41 +0200 |
| commit | 589ae9b70346e3fae768c4e7aafbc7c504861987 (patch) | |
| tree | 8a61941f9a65ece76ce0892ea6387762c5363864 | |
| parent | a2d2822bb55c9ff5c48898062a0e66f9251631d3 (diff) | |
tdf#131420 DOCX export: fix missing border of frame
Co-authored-by: Attila Szűcs (NISZ)
Change-Id: If6ce28aab938eaf22fe578f8880e139b7b4eb22c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100418
Tested-by: Jenkins
Tested-by: László Németh <nemeth@numbertext.org>
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 49e2bd6103669ca94d4e308fc08beed57f85c7e2)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102754
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/tdf131420.docx | bin | 0 -> 11981 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 2 |
3 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/tdf131420.docx b/sw/qa/extras/ooxmlexport/data/tdf131420.docx Binary files differnew file mode 100644 index 000000000000..3600735245af --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/tdf131420.docx diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 15ae1de673ce..1ae45cb04183 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -1069,6 +1069,12 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116883, "tdf116883.docx") } } +DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf131420, "tdf131420.docx") +{ + xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml"); + assertXPath(pXmlDocument, "/w:document/w:body/w:p/w:pPr/w:pBdr[2]"); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 9dc7a4122ec2..329dc349431c 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1240,10 +1240,12 @@ void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMar if (!m_bWritingHeaderFooter && m_pCurrentFrame) { const SwFrameFormat& rFrameFormat = m_pCurrentFrame->GetFrameFormat(); + const SvxBoxItem& rBox = rFrameFormat.GetBox(); if (TextBoxIsFramePr(rFrameFormat)) { const Size aSize = m_pCurrentFrame->GetSize(); PopulateFrameProperties(&rFrameFormat, aSize); + FormatBox(rBox); } } |