[Libreoffice-commits] core.git: sw/qa sw/source

[Stephan Bergmann (via logerrit)]

 dev/null                                     |binary
 sw/qa/extras/ooxmlexport/ooxmlexport12.cxx   |    9 ---------
 sw/source/filter/ww8/docxattributeoutput.cxx |    2 --
 3 files changed, 11 deletions(-)

New commits:
commit a2e5c8a0dc9254591711e32245e2e6b9dbd2449f
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Fri Aug 7 15:54:20 2020 +0200
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Fri Aug 7 16:22:13 2020 +0200

    Revert "tdf#131420 DOCX export: fix missing border of frame"
    
    This reverts commit 6f22e4e5f93af27fa41bd1054a817df2409fdc62.
    <https://ci.libreoffice.org/job/gerrit_linux_gcc_release/66787/> failed with
    
    > Test name: testTdf131420::Load_Verify_Reload_Verify
    > equality assertion failed
    > - Expected: 1
    > - Actual  : 0
    > - In <file:///home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/tempdir/lu29117kacyqp.tmp>, XPath '/w:document/w:body/w:p[2]/w:pPr/w:pBdr[2]' number of nodes is incorrect
    
    during CppunitTest_sw_ooxmlexport12 of
    <https://gerrit.libreoffice.org/c/core/+/100328> "Test build"
    
      ...of <https://gerrit.libreoffice.org/c/core/+/99697/2>:
    
        Aug 07 15:11:38 <sberg> does anybody else see CppunitTest_sw_ooxmlexport12
        testTdf131420::Load_Verify_Reload_Verify consistently fail?  It got added
        right now with 6f22e4e5f93af27fa41bd1054a817df2409fdc62, which Jenkins had
        seen build green a week ago, based back then on a parent from July 21, so
        sounds likely that the tested code changed meanwhile
    
    Change-Id: I1eb5caed08dc7be27fab5773dfb23a5c608d1c47
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100229
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/qa/extras/ooxmlexport/data/tdf131420.docx b/sw/qa/extras/ooxmlexport/data/tdf131420.docx
deleted file mode 100644
index fc118345e9e9..000000000000
Binary files a/sw/qa/extras/ooxmlexport/data/tdf131420.docx and /dev/null differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
index 0222088b2c75..739362d71c4c 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport12.cxx
@@ -1084,15 +1084,6 @@ DECLARE_OOXMLEXPORT_TEST(testTdf116883, "tdf116883.docx")
     }
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf131420, "tdf131420.docx")
-{
-    xmlDocUniquePtr pXmlDocument = parseExport("word/document.xml");
-    if (!pXmlDocument)
-        return;
-
-    assertXPath(pXmlDocument, "/w:document/w:body/w:p[2]/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 f1f440abe290..4d59477f9d68 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -1236,12 +1236,10 @@ 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);
         }
     }