diff options
| author | Justin Luth <justin.luth@collabora.com> | 2020-07-21 22:18:43 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2020-07-24 16:05:24 +0200 |
| commit | 4b2f0758c99e7b50293d965699f2125ff79bee17 (patch) | |
| tree | 3a5ab74dcb2d4626005bd5462ce9b5fe4712c7f9 /sw | |
| parent | ee5408d025765762ab3c7f342cd9b5330ed8b425 (diff) | |
tdf#98000 docx export: cleanup obsolete clause
This 6.1.4/6.2 hack for tdf#118393 wasn't interested
in isCellOpen, and should have questioned why isTextNodeEmpty
was preventing the necessary page style change.
So purge it, since the removal of isTextNodeEmpty
obsoletes it.
Change-Id: I615ae84ac46f129b09b18555794ed89c42ba93b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99179
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8atr.cxx | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx index f56f0de8e820..b8a88920a4a6 100644 --- a/sw/source/filter/ww8/ww8atr.cxx +++ b/sw/source/filter/ww8/ww8atr.cxx @@ -467,35 +467,6 @@ void MSWordExportBase::OutputSectionBreaks( const SfxItemSet *pSet, const SwNode */ if ( isCellOpen && ( m_pCurrentPageDesc->GetName() != pPageDesc->GetName() ) ) pSet = nullptr; - - // tdf#118393: FILESAVE: DOCX Export loses header/footer - { - bool bPlausableSingleWordSection = sw::util::IsPlausableSingleWordSection(m_pCurrentPageDesc->GetFirstMaster(), pPageDesc->GetMaster()); - - { - const SwFrameFormat& rTitleFormat = m_pCurrentPageDesc->GetFirstMaster(); - const SwFrameFormat& rFollowFormat = pPageDesc->GetMaster(); - - auto pHeaderFormat1 = rTitleFormat.GetHeader().GetHeaderFormat(); - auto pHeaderFormat2 = rFollowFormat.GetHeader().GetHeaderFormat(); - - if (pHeaderFormat1 != pHeaderFormat2) - bPlausableSingleWordSection = false; - - auto pFooterFormat1 = rTitleFormat.GetFooter().GetFooterFormat(); - auto pFooterFormat2 = rFollowFormat.GetFooter().GetFooterFormat(); - - if (pFooterFormat1 != pFooterFormat2) - bPlausableSingleWordSection = false; - } - - if ( !bPlausableSingleWordSection && m_bFirstTOCNodeWithSection ) - { - bBreakSet = false; - bNewPageDesc = true; - m_pCurrentPageDesc = pPageDesc; - } - } } else if (!sw::util::IsPlausableSingleWordSection(m_pCurrentPageDesc->GetFirstMaster(), pPageDesc->GetMaster())) { |