diff options
author | Luke Deller <luke@deller.id.au> | 2012-11-26 20:08:22 +1100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-12-06 09:51:25 +0100 |
commit | 44dafcf9e29b2286016b9be2ac47c2609c817abc (patch) | |
tree | 4deb1a135e25067ca448154cdb13bee7ef0304c6 /sw | |
parent | 05a116786648c0a045956b626c3f9f163f0a268e (diff) |
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/1170
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
-rw-r--r-- | sw/source/filter/ww8/wrtww8.cxx | 4 | ||||
-rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 9 |
2 files changed, 3 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx index e0bacc44a296..453ee0c29c0f 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/sw/source/filter/ww8/wrtww8.cxx @@ -2386,7 +2386,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() ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 26db61bedc57..4354d68052aa 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -436,15 +436,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 ) && |