diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-20 13:51:26 +0300 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2016-12-22 07:44:38 +0000 |
| commit | a21035c779167ec0e84ac21b9e5cdf6f2553ab30 (patch) | |
| tree | 9e72453884ff6dc905de60aea0b43ac01ee1b521 /writerfilter | |
| parent | 7e38087bf2a4d9d9edd0c98f965531002e0be777 (diff) | |
related to tdf#97417: fix unit test's early para numbering
The unit test's first blank page already started the paragraph
numbering. Setting it so that a contentless, single paragraph
section will not display numbering. In fact, no dummy paragraph
should have numbering, but that would get complicated.
This is in preparation for tdf#104710.
Change-Id: I98c9926cb3cd1e3fe3cd43bf46cab22bfbec7eba
Reviewed-on: https://gerrit.libreoffice.org/32235
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
(cherry picked from commit c829e01e973ac32fb625925ce83f843ad30d94db)
Reviewed-on: https://gerrit.libreoffice.org/32326
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 45f2764aa664..f79ad82402f6 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -3281,7 +3281,9 @@ void DomainMapper::lcl_utext(const sal_uInt8 * data_, size_t len) && !( pContext && pContext->isSet(PROP_BREAK_TYPE) ) && !m_pImpl->GetIsDummyParaAddedForTableInSection() && !m_pImpl->GetIsPreviousParagraphFramed(); - PropertyMapPtr xContext = bRemove ? m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr(); + + const bool bNoNumbering = bRemove || (!m_pImpl->GetParaChanged() && m_pImpl->GetParaSectpr() && bSingleParagraph); + PropertyMapPtr xContext = bNoNumbering ? m_pImpl->GetTopContextOfType(CONTEXT_PARAGRAPH) : PropertyMapPtr(); if (xContext) { // tdf#97417 delete numbering of the paragraph |