writerfilter/source/dmapper/DomainMapper.cxx | 2 +-
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 706b303a5abadd7cd4f58905ae6582c84ed5dcbd
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Sat Feb 8 20:00:38 2025 -0500
Commit: Miklos Vajna <vmik...@collabora.com>
CommitDate: Tue Feb 11 15:27:05 2025 +0100
tdf#164876 tdf#165117 writerfilter: no dummy paragraphs in header
The problem was that an extra CR was being added
(often every round-trip) to headers that started with a table.
This is a long-standing bug (see moz1211781-1.docx)
that got more exposure recently from changes to
7.6.6 (via 86ad08f9d25110e91e92a0badf6de75e785b3644)
and 24.8.0 (via ef77086255821d61838a7e26fee9baadaca0b9e0)
Change-Id: Idb6a0efda246fa064822f01a9ce097f686810b5c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181307
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
(cherry picked from commit 44eda1f72b4d67b9627155741067d3e57a1f9747)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181354
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181368
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181420
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Miklos Vajna <vmik...@collabora.com>
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx
b/writerfilter/source/dmapper/DomainMapper.cxx
index 479373de6660..8183dccd70a3 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -3418,7 +3418,7 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const
PropertyMapPtr& rContext )
if (m_pImpl->m_StreamStateStack.top().nTableDepth == 0
&& m_pImpl->GetIsFirstParagraphInSection()
&& !m_pImpl->GetIsDummyParaAddedForTableInSection() &&
!m_pImpl->GetIsTextFrameInserted()
- && !m_pImpl->GetIsPreviousParagraphFramed() &&
!IsInHeaderFooter())
+ && !m_pImpl->GetIsPreviousParagraphFramed())
{
m_pImpl->AddDummyParaForTableInSection();
}
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 2247758d8ad0..0057799f99a2 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -691,8 +691,8 @@ void DomainMapper_Impl::RemoveDummyParaForTableInSection()
}
void DomainMapper_Impl::AddDummyParaForTableInSection()
{
- // Shapes and textboxes can't have sections.
- if (IsInShape() || m_bIsInTextBox)
+ // Shapes, headers, and textboxes can't have sections.
+ if (IsInShape() || IsInHeaderFooter() || m_bIsInTextBox)
return;
if (!m_aTextAppendStack.empty())
