merge the formfield patch from ooo-build
[ooovba.git] / applied_patches / 0511-sw-section-import-fix.diff
blob65d4d3f0cdc6304aa4743e7bab804e243887ba38
1 --- sw/source/filter/ww8/ww8par.cxx
2 +++ sw/source/filter/ww8/ww8par.cxx
3 @@ -2808,9 +2808,10 @@
4 else if (!nInTable)
6 // Always insert a txtnode for a column break, e.g. ##
7 - AppendTxtNode(*pPaM->GetPoint());
8 - rDoc.InsertPoolItem(*pPaM,
9 - SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
10 + SwCntntNode *pCntNd=pPaM->GetCntntNode();
11 + if (pCntNd!=NULL && pCntNd->Len()>0) // if par is empty not break is needed
12 + AppendTxtNode(*pPaM->GetPoint());
13 + rDoc.InsertPoolItem(*pPaM, SvxFmtBreakItem(SVX_BREAK_COLUMN_BEFORE, RES_BREAK), 0);
15 break;
16 case 0x7: