[Libreoffice-commits] core.git: Branch 'libreoffice-4-0' - writerfilter/source

[Miklos Vajna]

 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 94765a1b3f543b3b60f8c1de05048d12f2576be4
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Feb 1 11:20:52 2013 +0100

    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 at redhat.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 2fc5a10..3ef92ac 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)