diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-20 12:19:43 +0300 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2018-01-23 16:20:28 +0100 |
| commit | f24db79e31c86181c603ca0ee1c1d82d30652c2e (patch) | |
| tree | cc6fa35ec3ee8c7fc9a599a17b653cbaa4115322 /writerfilter | |
| parent | ee9632df22721b78bfc3b1b59a80a0e1a8e04d9a (diff) | |
related to tdf#97417: fix unit test page count
The unit test should have been showing a blank page before the
content page.
Non-section paragraphs should not remove the first/last status.
Frames were already excluded, now this patch also
excludes header/footer paragraphs.
This is in preparation for tdf#104710.
Change-Id: I686944843302160d6f6bbbcb73f01c836179aa9f
Reviewed-on: https://gerrit.libreoffice.org/32234
Reviewed-by: Justin Luth <justin_luth@sil.org>
Tested-by: Justin Luth <justin_luth@sil.org>
tdf#102466 Added unit test: ensure 1st page is not missing
Change-Id: Icbc97d6a69447575aa2980a700a663ece226f781
Reviewed-on: https://gerrit.libreoffice.org/44273
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
Reviewed-on: https://gerrit.libreoffice.org/48300
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index f41e406409dc..82a202109613 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -1203,7 +1203,7 @@ void DomainMapper_Impl::finishParagraph( const PropertyMapPtr& pPropertyMap ) } m_bParaChanged = false; - if( !IsInShape() && (!pParaContext || !pParaContext->IsFrameMode()) ) + if( !IsInHeaderFooter() && !IsInShape() && (!pParaContext || !pParaContext->IsFrameMode()) ) { // If the paragraph is in a frame, shape or header/footer, it's not a paragraph of the section itself. SetIsFirstParagraphInSection(false); SetIsLastParagraphInSection(false); |