diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-01 22:00:46 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-11-23 14:32:15 +0100 |
| commit | 991d103f7a21a0e6e6ed92000db1b5994f69d032 (patch) | |
| tree | bffd72fe2b5613dda3a02d9468fa3b28343c15ae /sw | |
| parent | 6c9a3171922e79ad510c3192cd90d4cc00c007b4 (diff) | |
fdo#82512 RTF import: fix position of column break
(cherry picked from commit dcb37dcebcde6188eb58ef7d8d34d08fea4badb8)
Change-Id: Ib0f39c4af7cc32d0f4491f13ea207d90a449a47d
Reviewed-on: https://gerrit.libreoffice.org/12309
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/fdo82512.rtf | 10 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 6 |
2 files changed, 16 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo82512.rtf b/sw/qa/extras/rtfimport/data/fdo82512.rtf new file mode 100644 index 000000000000..925cc4bf6f9e --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo82512.rtf @@ -0,0 +1,10 @@ +{\rtf1\ansi\deff0 +\cols2\colsx709 +\pard\plain +{First col\par}{ +\column +\par +\par +Second col\par +} +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 93e1904c29a2..1214051dc7aa 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2003,6 +2003,12 @@ DECLARE_RTFIMPORT_TEST(testFdo82076, "fdo82076.rtf") CPPUNIT_ASSERT_EQUAL(OUString("Footnote"), getProperty<OUString>(getRun(getParagraphOfText(1, xCell->getText()), 2), "TextPortionType")); } +DECLARE_RTFIMPORT_TEST(testFdo82512, "fdo82512.rtf") +{ + // This was style::BreakType_NONE, column break was before the 3rd paragraph, not before the 2nd one. + CPPUNIT_ASSERT_EQUAL(style::BreakType_COLUMN_BEFORE, getProperty<style::BreakType>(getParagraph(2), "BreakType")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |