diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-04-27 14:50:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-04-27 16:30:07 +0000 |
| commit | b71f470e370c1819cba99abe5ef654d28bbf8749 (patch) | |
| tree | 17febfcede3a9579661fb1f923fb3f8e2db32ec6 /sw | |
| parent | 0445de5e0d9bccd7634911ca3547c0e14f4f47c5 (diff) | |
Resolves: tdf#99498 don't overwrite trwWidth value if set on a table
Change-Id: Ia39da999a2de1ca2b8bec5fc7f35d2f9ffe2dd19
Reviewed-on: https://gerrit.libreoffice.org/24430
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/tdf99498.rtf | 3 | ||||
| -rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 11 |
2 files changed, 14 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/tdf99498.rtf b/sw/qa/extras/rtfimport/data/tdf99498.rtf new file mode 100644 index 000000000000..61a306696933 --- /dev/null +++ b/sw/qa/extras/rtfimport/data/tdf99498.rtf @@ -0,0 +1,3 @@ +{\rtf1\ansi\ansicpg1252\deff0{\fonttbl{\f0\froman\fcharset0 Times New Roman;}{\f1\froman\fcharset0 Arial;}}{\colortbl\red0\green0\blue0;\red255\green255\blue255;}{\stylesheet {\style\s0 \ql\fi0\li0\ri0\f1\fs24\cf0 Normal;}} +{\*\generator iText 2.1.7 by 1T3XT} +\par\par\trowd\trftsWidth3\trwWidth4000\trhdr\trqc\trgaph10\trpaddl0\trpaddr0\trpaddfl3\trpaddfr3\clvertalt\clcbpat1\clftsWidth3\clwWidth0\cellx0\clvertalt\clcbpat1\clftsWidth3\clwWidth0\cellx0\pard\plain\intbl\s0\fi0\li0\ri0\sl280\plain\f1\fs22\cf0 CELLCONTENTS \cell\pard\plain\intbl\s0\fi0\li0\ri0\sl280\plain\cell \row\pard} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index 3cc668f906f6..186af7fe23fc 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -2518,6 +2518,17 @@ DECLARE_RTFIMPORT_TEST(testTdf97035, "tdf97035.rtf") CPPUNIT_ASSERT_EQUAL(sal_Int16(2299), getProperty< uno::Sequence<text::TableColumnSeparator> >(xTableRows->getByIndex(1), "TableColumnSeparators")[0].Position); } +DECLARE_RTFIMPORT_TEST(testTdf99498, "tdf99498.rtf") +{ + uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xTables(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); + + // Table width was a tiny sub one char wide 145twips, it should now be a table wide + // enough to see all the text in the first column without breaking into multiple lines + CPPUNIT_ASSERT_EQUAL(sal_Int32(7056), getProperty<sal_Int32>(xTables->getByIndex(0), "Width")); +} + + DECLARE_RTFIMPORT_TEST(testTdf87034, "tdf87034.rtf") { // This was A1BC34D, i.e. the first "super" text portion was mis-imported, |