[Libreoffice-commits] .: Branch 'libreoffice-3-6' - writerfilter/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Sep 21 05:10:12 PDT 2012


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

New commits:
commit 363029af2207dc890939e31850aba82263c97ec6
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri Sep 21 11:58:02 2012 +0200

    fdo#52389 fix RTF import of paragraph without RTF_PAR at the end of the doc
    
    (cherry picked from commit ebf0e1953ef422bb83201c89f0558bb9071edf63)
    
    Change-Id: Ib7b48986d5b01c75ae0be8dd6618a2e8be2ae51c
    Reviewed-on: https://gerrit.libreoffice.org/663
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Tested-by: Fridrich Strba <fridrich at documentfoundation.org>

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index fb18553..35d42c7 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -3483,6 +3483,8 @@ int RTFDocumentImpl::popState()
     // This is the end of the doc, see if we need to close the last section.
     if (m_nGroup == 1 && !m_bFirstRun)
     {
+        if (m_bNeedCr)
+            dispatchSymbol(RTF_PAR);
         m_bDeferredContSectBreak = false;
         sectBreak(true);
     }


More information about the Libreoffice-commits mailing list