summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport11.cxx2
-rw-r--r--sw/qa/extras/ooxmlexport/ooxmlexport4.cxx3
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx4
3 files changed, 3 insertions, 6 deletions
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 );