diff options
| author | László Németh <nemeth@numbertext.org> | 2018-08-01 16:44:00 +0200 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-08-01 20:58:40 +0200 |
| commit | 58e266ae808dbf3e157b38eb2c8f24774131e0f8 (patch) | |
| tree | f3ac0a01c34bf3be103179883ce96d2ce0c9c028 /writerfilter | |
| parent | 45f4d02dd0129d20accc62b889d4e36968ee27b0 (diff) | |
tdf#118949 don't set zero auto top margin in every first paragraph
of sections, only in table cells.
Partially revert of the commit 0307a62790b33ee0c02c2323a8f759e53e2035a4.
Change-Id: I1daf1bc49ce1acf42a55857c1b6b92c7cbcb8e00
Reviewed-on: https://gerrit.libreoffice.org/58431
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 45ae707e3b46..36baed7489ce 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -655,8 +655,8 @@ void DomainMapper::lcl_attribute(Id nName, Value & val) default_spacing = 49; else { - // tdf#104354, tdf#118533 first paragraph of sections and shapes got zero top margin - if ((m_pImpl->GetIsFirstParagraphInSection() && !m_pImpl->IsInShape()) || + // tdf#104354 first paragraphs of table cells and shapes get zero top margin + if ((m_pImpl->GetIsFirstParagraphInSection() && !m_pImpl->IsInShape() && m_pImpl->m_nTableDepth > 0) || m_pImpl->GetIsFirstParagraphInShape()) default_spacing = 0; else |