summaryrefslogtreecommitdiff
path: root/writerfilter
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2013-02-01 11:20:52 +0100
committerMichael Stahl <mstahl@redhat.com>2013-02-05 20:49:55 +0000
commit94765a1b3f543b3b60f8c1de05048d12f2576be4 (patch)
tree52436d0ff7b2ff8351c7335df85a014202d02cd6 /writerfilter
parentbc6a23a47936f6d74f5348a22ada4874945dc884 (diff)
fdo#48440 fix import of RTF_PAGE between text frames
Normally such a page break is surrounded by text, and text() already calls checkNeedPap(), but in case the whole paragraph contains a page break only, we need it here as well. (cherry picked from commit b70f74cb5f4b499f14831fd6ad49d9238735e6ef) Conflicts: sw/qa/extras/rtfimport/rtfimport.cxx Change-Id: I3961272d77c743e0e6da2d5052e57cec5f5937e7 Reviewed-on: https://gerrit.libreoffice.org/1965 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.cxx1
1 files changed, 1 insertions, 0 deletions
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2fc5a103b3ea..3ef92ac2e1f4 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1829,6 +1829,7 @@ int RTFDocumentImpl::dispatchSymbol(RTFKeyword nKeyword)
}
else
{
+ checkNeedPap();
sal_uInt8 sBreak[] = { 0xc };
Mapper().text(sBreak, 1);
if (!m_bNeedPap)