diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-12-24 15:06:15 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-12-24 16:16:34 +0100 |
commit | f9c0deef40a59095c6132b80eb5b21835d3e3a9c (patch) | |
tree | fc3513a809f1e174417ee2b77aa7f68e803d003e /sw | |
parent | b984cb56d70dec578103dae885ec5868582c0ffe (diff) |
fdo#57678 fix import of RTF_PARD between RTF_CELL and RTF_ROW
(cherry picked from commit c58981ca3dbf65c998acf979fb104534991b08c4)
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/rtfimport/data/fdo57678.rtf | 34 | ||||
-rw-r--r-- | sw/qa/extras/rtfimport/rtfimport.cxx | 10 |
2 files changed, 44 insertions, 0 deletions
diff --git a/sw/qa/extras/rtfimport/data/fdo57678.rtf b/sw/qa/extras/rtfimport/data/fdo57678.rtf new file mode 100644 index 000000000000..e0a26cdfab8e --- /dev/null +++ b/sw/qa/extras/rtfimport/data/fdo57678.rtf @@ -0,0 +1,34 @@ +{\rtf\ansi\deff0 +{\fonttbl{\f0 Times New Roman;}} +{\colortbl;\red0\green0\blue0;} +{\info +} +\paperw11907 \paperh16443 \deftab1298 \margl1701 \margr1701 \margt567 \margb1134 \pgnstart1\ftnnar \aftnnrlc \ftnstart1 \aftnstart1 +\trowd\trowd\cellx1701\cellx3402 + +\intbl\itap1 +\qc{Cell 1:1} +\cell\pard + +\intbl\itap1 +\qc{Cell 1:2} +\cell\pard + +\row +\pard\itap0 +\par \trowd\trowd \cellx1701\cellx3402\cellx5103\cellx6804 + +\intbl\itap1 +{cell 1:1} +\cell\pard + +{{\~}}\cell\pard + +{{\~}}\cell\pard + +{{\~}}\cell\pard + +\row +\pard\itap0 + +} diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx index da5794f41751..513ea2c2f65d 100644 --- a/sw/qa/extras/rtfimport/rtfimport.cxx +++ b/sw/qa/extras/rtfimport/rtfimport.cxx @@ -131,6 +131,7 @@ public: void testFdo49934(); void testFdo57886(); void testFdo58076(); + void testFdo57678(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -212,6 +213,7 @@ void Test::run() {"fdo49934.rtf", &Test::testFdo49934}, {"fdo57886.rtf", &Test::testFdo57886}, {"fdo58076.rtf", &Test::testFdo58076}, + {"fdo57678.rtf", &Test::testFdo57678}, }; for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) { @@ -978,6 +980,14 @@ void Test::testFdo58076() CPPUNIT_ASSERT_EQUAL(sal_Int32(635), getProperty<sal_Int32>(xStyle, "BottomMargin")); } +void Test::testFdo57678() +{ + // Paragraphs of the two tables were not converted to tables. + uno::Reference<text::XTextTablesSupplier> xTextTablesSupplier(mxComponent, uno::UNO_QUERY); + uno::Reference<container::XIndexAccess> xIndexAccess(xTextTablesSupplier->getTextTables(), uno::UNO_QUERY); + CPPUNIT_ASSERT_EQUAL(sal_Int32(2), xIndexAccess->getCount()); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |