summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuboš Luňák <l.lunak@centrum.cz>2014-03-18 19:29:29 +0100
committerLuboš Luňák <l.lunak@centrum.cz>2014-03-18 20:57:05 +0100
commit075fc0c0a34875adf2833e5933b4982b9443a373 (patch)
tree0b1f33d5c32d481ab940433b16abc5a32b7dd71b
parente1036f0faedcb58897628dcfa8ccbda42b20403c (diff)
testcase for fdo#38414
Change-Id: I9467ae2ba5155175d5be8218248edada136a5ca1
-rw-r--r--sw/qa/extras/ooxmlimport/data/fdo38414.docxbin0 -> 21800 bytes
-rw-r--r--sw/qa/extras/ooxmlimport/ooxmlimport.cxx7
2 files changed, 7 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo38414.docx b/sw/qa/extras/ooxmlimport/data/fdo38414.docx
new file mode 100644
index 000000000000..135cd32c981e
--- /dev/null
+++ b/sw/qa/extras/ooxmlimport/data/fdo38414.docx
Binary files differ
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index e47a20820dfb..87571c81f9cc 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -1997,6 +1997,13 @@ DECLARE_OOXMLIMPORT_TEST(testLargeTwips, "large-twips.docx" )
CPPUNIT_ASSERT( width.toInt32() > 0 );
}
+DECLARE_OOXMLIMPORT_TEST(testFdo38414, "fdo38414.docx" )
+{
+ // The cells in the last (4th) column were merged properly and so the result didn't have the same height.
+ OUString height3 = parseDump("/root/page/body/tab/row[1]/cell[3]/infos/bounds", "height" );
+ OUString height4 = parseDump("/root/page/body/tab/row[1]/cell[4]/infos/bounds", "height" );
+ CPPUNIT_ASSERT_EQUAL( height3, height4 );
+}
#endif
CPPUNIT_PLUGIN_IMPLEMENT();