summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorJustin Luth <justin.luth@collabora.com>2020-07-22 21:07:57 +0300
committerJustin Luth <justin_luth@sil.org>2020-07-24 16:07:19 +0200
commitf19dd5a6d3b65556f6dfb8ee0e52333e422733f0 (patch)
treeb227fb5f8ccbf8a998b21cded1767b7c9f849e3d /sw
parent4b2f0758c99e7b50293d965699f2125ff79bee17 (diff)
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 <justin_luth@sil.org>
Diffstat (limited to 'sw')
-rw-r--r--sw/source/filter/ww8/ww8atr.cxx13
1 files changed, 3 insertions, 10 deletions
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()))
{