diff options
| -rw-r--r-- | sw/qa/extras/odfimport/data/tdf103025.odt | bin | 0 -> 5694 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfimport/odfimport.cxx | 9 | ||||
| -rw-r--r-- | sw/source/core/layout/pagechg.cxx | 16 |
3 files changed, 9 insertions, 16 deletions
diff --git a/sw/qa/extras/odfimport/data/tdf103025.odt b/sw/qa/extras/odfimport/data/tdf103025.odt Binary files differnew file mode 100644 index 000000000000..bd1e57314d88 --- /dev/null +++ b/sw/qa/extras/odfimport/data/tdf103025.odt diff --git a/sw/qa/extras/odfimport/odfimport.cxx b/sw/qa/extras/odfimport/odfimport.cxx index ceb55723e01a..e8bc1cf41f51 100644 --- a/sw/qa/extras/odfimport/odfimport.cxx +++ b/sw/qa/extras/odfimport/odfimport.cxx @@ -631,6 +631,15 @@ DECLARE_ODFIMPORT_TEST(testBnc800714, "bnc800714.fodt") CPPUNIT_ASSERT(getProperty<bool>(getParagraph(2), "ParaKeepTogether")); } +DECLARE_ODFIMPORT_TEST(testTdf103025, "tdf103025.odt") +{ + CPPUNIT_ASSERT_EQUAL(OUString("2014-01"), parseDump("/root/page[1]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-01"), parseDump("/root/page[2]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-02"), parseDump("/root/page[3]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-03"), parseDump("/root/page[4]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); + CPPUNIT_ASSERT_EQUAL(OUString("2014-03"), parseDump("/root/page[5]/header/tab[2]/row[2]/cell[3]/txt/Special", "rText")); +} + DECLARE_ODFIMPORT_TEST(testTdf76322_columnBreakInHeader, "tdf76322_columnBreakInHeader.docx") { // column breaks were ignored. First line should start in column 2 diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx index 50d910bae579..720a541631b8 100644 --- a/sw/source/core/layout/pagechg.cxx +++ b/sw/source/core/layout/pagechg.cxx @@ -467,22 +467,6 @@ void SwPageFrame::PreparePage( bool bFootnote ) if ( GetPrev() && static_cast<SwPageFrame*>(GetPrev())->IsEmptyPage() ) lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), static_cast<SwPageFrame*>(GetPrev()) ); lcl_MakeObjs( *pDoc->GetSpzFrameFormats(), this ); - - // format footer/ header - SwLayoutFrame *pLow = static_cast<SwLayoutFrame*>(Lower()); - while ( pLow ) - { - if ( pLow->GetType() & (SwFrameType::Header|SwFrameType::Footer) ) - { - SwContentFrame *pContent = pLow->ContainsContent(); - while ( pContent && pLow->IsAnLower( pContent ) ) - { - pContent->OptCalc(); // not the predecessors - pContent = pContent->GetNextContentFrame(); - } - } - pLow = static_cast<SwLayoutFrame*>(pLow->GetNext()); - } } } |