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

[Miklos Vajna]

 sw/qa/extras/rtfimport/data/fdo83204.rtf       |    9 +++++++++
 sw/qa/extras/rtfimport/rtfimport.cxx           |    6 ++++++
 writerfilter/source/rtftok/rtfdocumentimpl.cxx |    2 ++
 3 files changed, 17 insertions(+)

New commits:
commit 741be800ff7c6e6979c8b816ac2ceb955e7c303d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sun Nov 16 12:12:43 2014 +0100

    fdo#83204 RTF import: handle \pard<para props> after \bkmkstart
    
    (cherry picked from commit 8a30ba573470d59dbb0501b488f8a655b015ffd2)
    
    Change-Id: I4f5f0f653f2ce7782ec1d1fc5ef550a21a9c1d35
    Reviewed-on: https://gerrit.libreoffice.org/12527
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sw/qa/extras/rtfimport/data/fdo83204.rtf b/sw/qa/extras/rtfimport/data/fdo83204.rtf
new file mode 100644
index 0000000..39d89b0
--- /dev/null
+++ b/sw/qa/extras/rtfimport/data/fdo83204.rtf
@@ -0,0 +1,9 @@
+{\rtf1
+{\stylesheet
+{Normal;}
+{\s1 heading 1;}
+}
+{\*\bkmkstart titlebookmark}
+\pard\s1 Title\par
+{\*\bkmkend titlebookmark}
+}
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index 8a6c6da..9a274fd 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -2017,6 +2017,12 @@ DECLARE_RTFIMPORT_TEST(testUnbalancedColumns, "unbalanced-columns.rtf")
     CPPUNIT_ASSERT_EQUAL(true, getProperty<bool>(xTextSections->getByIndex(0), "DontBalanceTextColumns"));
 }
 
+DECLARE_RTFIMPORT_TEST(testFdo83204, "fdo83204.rtf")
+{
+    // This was Standard, \sN was ignored after \bkmkstart and \pard.
+    CPPUNIT_ASSERT_EQUAL(OUString("Heading 1"), getProperty<OUString>(getParagraph(1), "ParaStyleName"));
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index b372d34..31ff8b8 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -2873,6 +2873,8 @@ int RTFDocumentImpl::dispatchFlag(RTFKeyword nKeyword)
                 m_aStates.top().nCurrentStyleIndex = -1;
             }
         }
+        // Need to send paragraph properties again, if there will be any.
+        m_bNeedPap = true;
         break;
     case RTF_SECTD:
     {