commit 7a527a9e61bccf7a8b02ed80a9a3075261be81f9
author Justin Luth <justin_luth@sil.org> Sat Dec 29 11:39:13 2018 +0300
committer Miklos Vajna <vmiklos@collabora.com> Thu Jan 31 10:27:58 2019 +0100
tree 1460addb9c7332b231e76b18ef8964fcd83f254f
parent dd5743f18ba9a32695bbc92c21dee2ff87d41308

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@sil.org>
(cherry picked from commit 63b32bff885169ef77f86b205257fb573da7b70c)
Reviewed-on: https://gerrit.libreoffice.org/67020
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

sw/qa/extras/ooxmlexport/ooxmlexport11.cxx

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index d9dd00a..7874762 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -243,7 +243,7 @@
    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")

sw/qa/extras/ooxmlexport/ooxmlexport4.cxx

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
index ba02516..beaa1b9 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport4.cxx
@@ -971,9 +971,6 @@
    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")

sw/source/filter/ww8/docxattributeoutput.cxx

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 2c4638b..4f17e40 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -8161,14 +8161,14 @@

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