[PATCH libreoffice-4-0] fdo#48440 fix import of RTF_PAGE between text frames

[Miklos Vajna (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1965

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/65/1965/1

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
---
M writerfilter/source/rtftok/rtfdocumentimpl.cxx
1 file changed, 1 insertion(+), 0 deletions(-)



diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index c961c7d..220460b 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -1819,6 +1819,7 @@
                 }
                 else
                 {
+                    checkNeedPap();
                     sal_uInt8 sBreak[] = { 0xc };
                     Mapper().text(sBreak, 1);
                     if (!m_bNeedPap)

-- 
To view, visit https://gerrit.libreoffice.org/1965
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3961272d77c743e0e6da2d5052e57cec5f5937e7
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Miklos Vajna <vmiklos at suse.cz>