diff options
| author | Justin Luth <justin_luth@sil.org> | 2018-12-29 18:50:18 +0300 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-28 15:03:06 +0100 |
| commit | b761504aa81ac8e2f61ba87899a965de19dc35cc (patch) | |
| tree | 3d52a55f11ca76de966d9967ba30acae7d085813 /writerfilter | |
| parent | 303e03115e59c8e8c7e7727569012453e643c2a9 (diff) | |
tdf#120511 writerfilter: track inserted frame per section
The logic using IsTextFrameInserted is worried about whether
a frame has been inserted before a table *in this section*,
so track frame's existence per section, not per document.
Change-Id: I8aa8a695b89727832e65535adae3fc3c94f95be5
Reviewed-on: https://gerrit.libreoffice.org/65720
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 6aeba04b31cc33135f84bd7ea38a04ee9faa14ec)
Reviewed-on: https://gerrit.libreoffice.org/65722
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper.cxx | 1 | ||||
| -rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.hxx | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx index 5e9bed49044a..a44771dbd8ab 100644 --- a/writerfilter/source/dmapper/DomainMapper.cxx +++ b/writerfilter/source/dmapper/DomainMapper.cxx @@ -2883,6 +2883,7 @@ void DomainMapper::lcl_endSectionGroup() if (m_pImpl->GetIsDummyParaAddedForTableInSection()) m_pImpl->RemoveDummyParaForTableInSection(); } + m_pImpl->SetIsTextFrameInserted( false ); m_pImpl->PopProperties(CONTEXT_SECTION); } } diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx index 02f029a4732c..6006d2465f13 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx @@ -605,8 +605,11 @@ public: bool GetIsFirstParagraphInShape() { return m_bIsFirstParaInShape; } void SetIsDummyParaAddedForTableInSection( bool bIsAdded ); bool GetIsDummyParaAddedForTableInSection() { return m_bDummyParaAddedForTableInSection;} + + /// Track if a textframe has been inserted into this section void SetIsTextFrameInserted( bool bIsInserted ); bool GetIsTextFrameInserted() { return m_bTextFrameInserted;} + void SetIsPreviousParagraphFramed( bool bIsFramed ) { m_bIsPreviousParagraphFramed = bIsFramed; } bool GetIsPreviousParagraphFramed() { return m_bIsPreviousParagraphFramed; } void SetParaSectpr(bool bParaSectpr); |