diff options
| author | Luke Deller <luke@deller.id.au> | 2012-11-26 20:08:22 +1100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-11-27 17:11:25 +0000 |
| commit | 60fa5057039d2413d56813df4d45e5cfdfbb40ac (patch) | |
| tree | 8ded7393dbf505848a9a63bd4ce917c84f6fc79a /sw | |
| parent | a33727bf547c1d8e8435e06f3d4d1ef80ed7fc0c (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 f1da99d4f3d3..57d23438790b 100644 --- a/sw/source/filter/ww8/wrtww8.cxx +++ b/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() ); diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index 632a56964c10..e8a3a5770c42 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/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 ) && |