diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-05-25 12:30:18 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-05-26 08:44:15 +0000 |
| commit | 009c3917aa2df93c6476cbaa2b5117a60a113316 (patch) | |
| tree | 8ff54ae47808d67c81f2e6f38c46c5f48f5db50a /sw | |
| parent | 360c8458eee259eb8ca46da395621c7ec48a49ba (diff) | |
tdf#74795 RTF import: handle row-level default cell margins
(cherry picked from commit db1a4f8d1d44351ca65742d3d94371a0c0536ff2)
Conflicts:
writerfilter/source/rtftok/rtfdispatchsymbol.cxx
writerfilter/source/rtftok/rtfdispatchvalue.cxx
Change-Id: I5bdd7b8624a9e2ac1aef963ccc5ed457ebda3f84
Reviewed-on: https://gerrit.libreoffice.org/25493
Tested-by: Jenkins <ci@libreoffice.org>
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/tdf74795.rtf | 13 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 12 |
2 files changed, 25 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf74795.rtf b/sw/qa/extras/rtfimport/data/tdf74795.rtf new file mode 100644 index 000000000000..6db300890a7b --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf74795.rtf @@ -0,0 +1,13 @@ +{\rtf1\ansi\deff4\adeflang1025 +\trowd\trpaddfl3\trpaddl360\cellx4819\cellx9638 +\pard\plain\intbl +{first cell} +\cell\pard\plain\intbl +{second cell} +\cell\row\pard +\trowd\cellx4819\cellx9638 +\pard\plain +\cell\pard\plain +\intbl +\cell\row\pard\plain after. +\par } diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 2c9bc8790ce9..66b4c0410ff4 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2576,6 +2576,18 @@ DECLARE_RTFIMPORT_TEST(testTdf82073, "tdf82073.rtf") CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(xCell, "BackColor")); } +DECLARE_RTFIMPORT_TEST(testTdf74795, "tdf74795.rtf") +{ + uno::Reference<text::XTextTable> xTable(getParagraphOrTable(1), uno::UNO_QUERY); + uno::Reference<text::XTextRange> xCell(xTable->getCellByName("A1"), uno::UNO_QUERY); + // This was 0, \trpaddl was ignored on import. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(635), getProperty<sal_Int32>(xCell, "LeftBorderDistance")); + + xCell.set(xTable->getCellByName("A2"), uno::UNO_QUERY); + // Make sure that the scope of the default is only one row. + CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(0), getProperty<sal_Int32>(xCell, "LeftBorderDistance")); +} + CPPUNIT_PLUGIN_IMPLEMENT(); /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |