diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2013-03-25 10:12:20 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2013-03-25 10:25:14 +0100 |
commit | cadb3433b395b53a9eda584ed5fee79ca74e7483 (patch) | |
tree | 2005477a8921916b6eea636d0439bf88f5b738be /sw | |
parent | 25810de17f143a0946634fa5ba9f68977fc63cfd (diff) |
fdo#60922 ignore DOCX import of w:position w:val="0"
Change-Id: I10e9c0f1078e36710335a9a48f7f02292c764795
Diffstat (limited to 'sw')
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo60922.docx | bin | 0 -> 4503 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 8 |
2 files changed, 8 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo60922.docx b/sw/qa/extras/ooxmlimport/data/fdo60922.docx Binary files differnew file mode 100644 index 000000000000..0d1ff2613ecd --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/fdo60922.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 94c934dbbf22..a5b41e3a564e 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -121,6 +121,7 @@ public: void testFdo59638(); void testFdo61343(); void testToolsLineNumbering(); + void testFdo60922(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -193,6 +194,7 @@ void Test::run() {"fdo59638.docx", &Test::testFdo59638}, {"fdo61343.docx", &Test::testFdo61343}, {"tools-line-numbering.docx", &Test::testToolsLineNumbering}, + {"fdo60922.docx", &Test::testFdo60922}, }; header(); for (unsigned int i = 0; i < SAL_N_ELEMENTS(aMethods); ++i) @@ -1280,6 +1282,12 @@ void Test::testToolsLineNumbering() CPPUNIT_ASSERT_EQUAL(sal_Int32(3), nValue); } +void Test::testFdo60922() +{ + // This was 0, not 100, due to wrong import of w:position w:val="0" + CPPUNIT_ASSERT_EQUAL(sal_Int32(100), getProperty<sal_Int32>(getRun(getParagraph(1), 1), "CharEscapementHeight")); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |