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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx   |    2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx    |    3 ---
 sw/source/filter/ww8/docxattributeoutput.cxx |    4 ++--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 63b32bff885169ef77f86b205257fb573da7b70c
Author:     Justin Luth <justin_luth at sil.org>
AuthorDate: Sat Dec 29 11:39:13 2018 +0300
Commit:     Justin Luth <justin_luth at sil.org>
CommitDate: Mon Dec 31 02:11:12 2018 +0100

    Revert "tdf#70195 docx export: default header/footer at 720"
    
    This reverts LO6.2 commit 7413216e02be9b2f8eb39d550c297021e92ef299
    which thought it was only affecting MSWord, but as this
    unit test shows, it also can affect LO.
    
    When we manufacture an empty footnote,
    then we want the original default of 0.
    
    Change-Id: Ibba0d48ee24997c51b81b37c2750960e7a0ab5b5
    Reviewed-on: https://gerrit.libreoffice.org/65700
    Tested-by: Jenkins
    Reviewed-by: Justin Luth <justin_luth at sil.org>

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 4b0d7bd8d1d7..b36fe833dcc3 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -217,7 +217,7 @@ DECLARE_OOXMLEXPORT_TEST(testTdf113849_evenAndOddHeaders, "tdf113849_evenAndOddH
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer5 text", OUString(""), parseDump("/root/page[5]/footer/txt"));
     CPPUNIT_ASSERT_EQUAL_MESSAGE("Footer6 text", OUString(""), parseDump("/root/page[6]/footer/txt"));
 
-    //CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of pages", 6, getPages() );
+    CPPUNIT_ASSERT_EQUAL_MESSAGE("Number of pages", 6, getPages() );
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTdf118361_RTLfootnoteSeparator, "tdf118361_RTLfootnoteSeparator.docx")
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index 592249d2a49f..2c2facc2716a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -987,9 +987,6 @@ DECLARE_OOXMLEXPORT_TEST(test76108, "test76108.docx")
     if (!pXmlDoc) return;
     //docx file after RT is getting corrupted.
     assertXPath(pXmlDoc, "/w:document[1]/w:body[1]/w:p[1]/w:r[1]/w:fldChar[1]", "fldCharType", "begin");
-
-    // tdf#70195 the default header should start at 720, not 0
-    assertXPath(pXmlDoc, "//w:pgMar", "header", "720");
 }
 
 DECLARE_OOXMLEXPORT_TEST(testTCTagMisMatch, "TCTagMisMatch.docx")
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 0a71d47edc58..c655d991c7aa 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8026,14 +8026,14 @@ void DocxAttributeOutput::FormatULSpace( const SvxULSpaceItem& rULSpace )
 
         HdFtDistanceGlue aDistances( *m_rExport.GetCurItemSet() );
 
-        sal_Int32 nHeader = 720;
+        sal_Int32 nHeader = 0;
         if ( aDistances.HasHeader() )
             nHeader = sal_Int32( aDistances.dyaHdrTop );
 
         // Page top
         m_pageMargins.nTop = aDistances.dyaTop;
 
-        sal_Int32 nFooter = 720;
+        sal_Int32 nFooter = 0;
         if ( aDistances.HasFooter() )
             nFooter = sal_Int32( aDistances.dyaHdrBottom );