diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-09-21 14:57:26 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@suse.cz> | 2012-09-21 15:15:49 +0200 |
commit | b3603e0e0e5dbfbeaa2426c499e8f64be2d15765 (patch) | |
tree | bda8e7a21059e5884609f510a096e2f34f5c4ee7 /sw/qa | |
parent | 01207ca9851f79dd4aaf2b7a011bea7b8971d9c6 (diff) |
fdo#55187 fix DOCX import of unicode 0xNN0d when it's a separate run
E.g. 0x010d was parsed as a newline character... This also makes the RTF
workaround from fdo#39856 unnecessary.
Change-Id: I5e4a95b4436e1492b64961820702caace0a33e4b
Diffstat (limited to 'sw/qa')
-rw-r--r-- | sw/qa/extras/ooxmlimport/data/fdo55187.docx | bin | 0 -> 12759 bytes | |||
-rw-r--r-- | sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 9 |
2 files changed, 9 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlimport/data/fdo55187.docx b/sw/qa/extras/ooxmlimport/data/fdo55187.docx Binary files differnew file mode 100644 index 000000000000..59cd0a806250 --- /dev/null +++ b/sw/qa/extras/ooxmlimport/data/fdo55187.docx diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx index 621650205101..6b1c425b0890 100644 --- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx +++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx @@ -91,6 +91,7 @@ public: void testInk(); void testN779834(); void testN779627(); + void testFdo55187(); CPPUNIT_TEST_SUITE(Test); #if !defined(MACOSX) && !defined(WNT) @@ -128,6 +129,7 @@ public: CPPUNIT_TEST(testInk); CPPUNIT_TEST(testN779834); CPPUNIT_TEST(testN779627); + CPPUNIT_TEST(testFdo55187); #endif CPPUNIT_TEST_SUITE_END(); @@ -885,6 +887,13 @@ void Test::testN779627() CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nLeftMargin); } +void Test::testFdo55187() +{ + // 0x010d was imported as a newline. + load("fdo55187.docx"); + getParagraph(1, OUString("lupĨka", 7, RTL_TEXTENCODING_UTF8)); +} + CPPUNIT_TEST_SUITE_REGISTRATION(Test); CPPUNIT_PLUGIN_IMPLEMENT(); |