diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-02-02 15:29:24 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-07-09 12:45:54 +0200 |
| commit | 29a2c9e208facd1956fa2dd03d66c7ad8ae5deee (patch) | |
| tree | 08c6d078ebccfc79d66ef2e6bf130cf9d5a42655 | |
| parent | 74d1e8ae14a6d4a3df6beaa432a1d5b51c1ffbfa (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>
Reviewed-on: https://gerrit.libreoffice.org/4539
Reviewed-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Björn Michaelsen <bjoern.michaelsen@canonical.com>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
| -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 8deabf73f993..e62c0ebd50cd 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -1644,7 +1644,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) { |