[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sw/qa sw/source

[Tibor Nagy (via logerrit)]

 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 589ae9b70346e3fae768c4e7aafbc7c504861987
Author:     Tibor Nagy <nagy.tibor2 at nisz.hu>
AuthorDate: Mon Aug 10 10:51:20 2020 +0200
Commit:     Xisco Fauli <xiscofauli at libreoffice.org>
CommitDate: Tue Sep 15 16:54:41 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 <nemeth at numbertext.org>
    Reviewed-by: László Németh <nemeth at numbertext.org>
    (cherry picked from commit 49e2bd6103669ca94d4e308fc08beed57f85c7e2)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102754
    Reviewed-by: Xisco Fauli <xiscofauli at libreoffice.org>

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 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);
         }
     }