sw/qa/extras/ooxmlexport/data/tdf131420.docx |binary sw/qa/extras/ooxmlexport/ooxmlexport12.cxx | 6 ++++++ sw/source/filter/ww8/docxattributeoutput.cxx | 2 ++ 3 files changed, 8 insertions(+)
New commits: commit 49e2bd6103669ca94d4e308fc08beed57f85c7e2 Author: Tibor Nagy <[email protected]> AuthorDate: Mon Aug 10 10:51:20 2020 +0200 Commit: László Németh <[email protected]> CommitDate: Thu Aug 13 17:45:48 2020 +0200 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 <[email protected]> Reviewed-by: László Németh <[email protected]> diff --git a/sw/qa/extras/ooxmlexport/data/tdf131420.docx b/sw/qa/extras/ooxmlexport/data/tdf131420.docx new file mode 100644 index 000000000000..3600735245af Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf131420.docx differ diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx index 739362d71c4c..9766e160e63a 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx @@ -1084,6 +1084,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 7c15faf5e424..09bbad7e6e8b 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -1237,10 +1237,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); } } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
