[PATCH] docx export: invalid sectPr added at the beginning of the do...

[Pierre-Eric Pelloux-Prayer (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1647

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/47/1647/1

docx export: invalid sectPr added at the beginning of the doc

This reverts commit 60fa5057039d2413d56813df4d45e5cfdfbb40ac,
which was a revert of 723f772d (fix for ooo#106749) with an
alternative fix to avoid a regression (fdo#56513).

This commit contain a fix for the sectPr issue, and does not
regress on the 2 previously fixed issue.

Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f
---
M sw/source/filter/ww8/wrtww8.cxx
M sw/source/filter/ww8/ww8atr.cxx
2 files changed, 11 insertions(+), 4 deletions(-)



diff --git a/sw/source/filter/ww8/wrtww8.cxx b/sw/source/filter/ww8/wrtww8.cxx
index b89a143..01d61c5 100644
--- a/sw/source/filter/ww8/wrtww8.cxx
+++ b/sw/source/filter/ww8/wrtww8.cxx
@@ -2368,9 +2368,7 @@
         }
         else if ( pNd->IsTableNode() )
         {
-            SwTable * pTable = &pNd->GetTableNode()->GetTable();
-            OutputSectionBreaks( &pTable->GetTableFmt()->GetAttrSet(), *pNd );
-            mpTableInfo->processSwTable( pTable );
+            mpTableInfo->processSwTable( &pNd->GetTableNode()->GetTable() );
         }
         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 d6cbdaa..393a685 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -403,6 +403,15 @@
     //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 ) &&
@@ -456,7 +465,7 @@
                     if ( pBreak &&
                          pBreak->GetBreak() == SVX_BREAK_PAGE_BEFORE )
                     {
-                        bNewPageDesc = SetAktPageDescFromNode( rNd );
+                        bNewPageDesc |= SetAktPageDescFromNode( rNd );
                     }
                 }
                 if ( !bNewPageDesc )

-- 
To view, visit https://gerrit.libreoffice.org/1647
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc551b38d25554c59b7c4ac5a447a0d60323f53f
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Pierre-Eric Pelloux-Prayer <pierre-eric at lanedo.com>