fdo#56513 second header/footer lost saving as .doc

This reverts changeset 723f772d for i#106749, then applies an
alternative fix for that issue.

Change-Id: Ib5a1788b67517c8d3cf80fd76801e30587535366
Reviewed-on: https://gerrit.libreoffice.org/1170Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

sw/source/filter/ww8/wrtww8.cxx

@@ -2372,7 +2372,9 @@ void MSWordExportBase::WriteText()
         }
         else if ( pNd->IsTableNode() )
         {
-            mpTableInfo->processSwTable( &pNd->GetTableNode()->GetTable() );
+            SwTable * pTable = &pNd->GetTableNode()->GetTable();
+            OutputSectionBreaks( &pTable->GetTableFmt()->GetAttrSet(), *pNd );
+            mpTableInfo->processSwTable( pTable );
         }
         else if ( pNd->IsSectionNode() && TXT_MAINTEXT == nTxtTyp )
             OutputSectionNode( *pNd->GetSectionNode() );

sw/source/filter/ww8/ww8atr.cxx

@@ -437,15 +437,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode
     //section.
     bool bBreakSet = false;
 
-    const SwPageDesc * pPageDesc = rNd.FindPageDesc(sal_False);
-
-    if (pAktPageDesc != pPageDesc)
-    {
-        bBreakSet = true;
-        bNewPageDesc = true;
-        pAktPageDesc = pPageDesc;
-    }
-
     if ( pSet && pSet->Count() )
     {
         if ( SFX_ITEM_SET == pSet->GetItemState( RES_PAGEDESC, false, &pItem ) &&