diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-16 12:12:43 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:32:30 +0100 |
| commit | 359c4268d05a45a7afe6c97ef60ead6dc316d2bd (patch) | |
| tree | 7f1e73a2e7466ca690f87e5eed1103b4d42af675 /sw | |
| parent | 9bc7d0def39a79aa91a14e1a6c5ca3c628e22234 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/qa/extras/rtfimport/data/fdo83204.rtf | 9 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo83204.rtf b/sw/qa/extras/rtfimport/data/fdo83204.rtf new file mode 100644 index 000000000000..39d89b0303e2 --- /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 8a6c6daa4edf..9a274fdcd634 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: */ |