From f19dd5a6d3b65556f6dfb8ee0e52333e422733f0 Mon Sep 17 00:00:00 2001 From: Justin Luth Date: Wed, 22 Jul 2020 21:07:57 +0300 Subject: NFC tdf#98000 docx export: more general code cleanup Change-Id: I765838d72e272fff2e80e5ce45efc2c5670929cb Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99251 Tested-by: Jenkins Reviewed-by: Justin Luth --- sw/source/filter/ww8/ww8atr.cxx | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'sw') diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index b8a88920a4a6..b71ec21f0bce 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -450,23 +450,16 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode const SwPageDesc * pPageDesc = rNd.FindPageDesc(); - // Even if pAktPageDesc != pPageDesc ,it might be because of the different header & footer types. + // Even if m_pCurrentPageDesc != pPageDesc ,it might be because of the different header & footer types. if (m_pCurrentPageDesc != pPageDesc) { if (isCellOpen && ( m_pCurrentPageDesc->GetName() != pPageDesc->GetName() )) { - /* Do not output a section break in the following scenarios. - 1) Table cell is open and page header types are different - Converting a page break to section break would cause serious issues while importing - the RT files with different first page being set. - */ - /* * If Table cell is open and page header types are different - * set pSet to NULL as we don't want to add any section breaks. + * set pSet to NULL as we don't want to add any section breaks inside a table. */ - if ( isCellOpen && ( m_pCurrentPageDesc->GetName() != pPageDesc->GetName() ) ) - pSet = nullptr; + pSet = nullptr; } else if (!sw::util::IsPlausableSingleWordSection(m_pCurrentPageDesc->GetFirstMaster(), pPageDesc->GetMaster())) { -- cgit v1.2.3