Revert "tdf#103025 sw: don't format header/footer in ...

... SwPageFrame::PreparePage()"

A customer document breaks with this, revert the commit for now till a
public reproducer and a proper fix is created.

This reverts commit 9107b719.

Change-Id: I6d7a6737f47313fb00955b431d8967bb533ccbae

sw/qa/extras/odfimport/odfimport.cxx

@@ -631,15 +631,6 @@ 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(testTdf96113, "tdf96113.odt")
 {
     // Background of the formula frame was white (0xffffff), not green.

sw/source/core/layout/pagechg.cxx

@@ -467,6 +467,22 @@ 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());
+        }
     }
 }