diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-02 15:29:24 +0100 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2013-02-05 20:33:09 +0000 |
commit | bc6a23a47936f6d74f5348a22ada4874945dc884 (patch) | |
tree | 7a7f844b5c325d49ccefe74951c87126cf787b84 /writerfilter | |
parent | ac4b9e2e6bb2c5f9fbd18cb05a11e9e70650abb7 (diff) |
fdo#58646 fix import of RTF_PAGE in cont section when having titlepg
(cherry picked from commit 3974e9952102dbfb4f004872768b1096133bd9a5)
Conflicts:
sw/qa/extras/rtfimport/rtfimport.cxx
Change-Id: Ia632edb24869ddfb76a029fdb460bcf24d9a2059
Reviewed-on: https://gerrit.libreoffice.org/1968
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'writerfilter')
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index 37d037638b2e..2fc5a103b3ea 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1811,7 +1811,9 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword) { // If we're inside a continous section, we should send a section break, not a page one. RTFValue::Pointer_t pBreak = m_aStates.top().aSectionSprms.find(NS_sprm::LN_SBkc); - if (pBreak.get() && !pBreak->getInt()) + // Unless we're on a title page. + RTFValue::Pointer_t pTitlePg = m_aStates.top().aSectionSprms.find(NS_ooxml::LN_EG_SectPrContents_titlePg); + if ((pBreak.get() && !pBreak->getInt()) && !(pTitlePg.get() && pTitlePg->getInt())) { if (m_bWasInFrame) { |