summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-02-02 15:29:24 +0100
committerMiklos Vajna <vmiklos@suse.cz>2013-02-02 15:38:47 +0100
commit3974e9952102dbfb4f004872768b1096133bd9a5 (patch)
treec29d161eddddb02585af3005e04ecc343a65850a /writerfilter
parent0cd3e819ecef72df2d586facd4e3f635fb95146a (diff)
fdo#58646 fix import of RTF_PAGE in cont section when having titlepg
Change-Id: Ia632edb24869ddfb76a029fdb460bcf24d9a2059
Diffstat (limited to 'writerfilter')
-rw-r--r--writerfilter/source/rtftok/rtfdocumentimpl.cxx4
1 files changed, 3 insertions, 1 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 4f47d9d3be48..3aed3b4ee1fb 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1804,7 +1804,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)
{