writerfilter/source/rtftok/rtfdocumentimpl.cxx | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit bc6a23a47936f6d74f5348a22ada4874945dc884
Author: Miklos Vajna <vmik...@suse.cz>
Date: Sat Feb 2 15:29:24 2013 +0100
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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 37d0376..2fc5a10 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)
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
