diff options
| author | Mark Hung <marklh9@gmail.com> | 2015-01-24 07:10:20 -0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-02-03 14:58:43 +0000 |
| commit | f5d305a605b9c8f8d22eebce7c5556ed9e134025 (patch) | |
| tree | e3e9340940a1f0549a4fced2be89dd437581b2f2 /sw/qa/extras | |
| parent | 0bfb7ed1d3050c827a37f7431cf4c05efeb536cb (diff) | |
Update for CJK numbered list enhancement.
1. Revert koreanDigital2 back to NUMBER_HANGUL_KO (import).
2. Map NUMBER_LOWER_ZH in Simplified Chinese document to
chineseCountingThousand (export).
Change-Id: I62ec255626c250802288bf7fbec7371076e727d3
Reviewed-on: https://gerrit.libreoffice.org/14155
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'sw/qa/extras')
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/cjklist44.docx | bin | 0 -> 13384 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/numlist-zhcn.odt | bin | 0 -> 10410 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/data/numlist-zhtw.odt | bin | 0 -> 10419 bytes | |||
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 25 |
4 files changed, 25 insertions, 0 deletions
diff --git a/sw/qa/extras/ooxmlexport/data/cjklist44.docx b/sw/qa/extras/ooxmlexport/data/cjklist44.docx Binary files differnew file mode 100644 index 000000000000..98538e931b4b --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/cjklist44.docx diff --git a/sw/qa/extras/ooxmlexport/data/numlist-zhcn.odt b/sw/qa/extras/ooxmlexport/data/numlist-zhcn.odt Binary files differnew file mode 100644 index 000000000000..0ced2b63a115 --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/numlist-zhcn.odt diff --git a/sw/qa/extras/ooxmlexport/data/numlist-zhtw.odt b/sw/qa/extras/ooxmlexport/data/numlist-zhtw.odt Binary files differnew file mode 100644 index 000000000000..62a729d51a3c --- /dev/null +++ b/sw/qa/extras/ooxmlexport/data/numlist-zhtw.odt diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 1815242e63a6..dcdef6a357b9 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -585,6 +585,31 @@ DECLARE_OOXMLEXPORT_TEST(testOoxmlCjklist35, "cjklist35.docx") CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_LOWER_ZH, numFormat); } +DECLARE_OOXMLEXPORT_TEST(testOoxmlCjklist44, "cjklist44.docx") +{ + sal_Int16 numFormat; + CPPUNIT_ASSERT(CjkNumberedListTestHelper(numFormat)); + CPPUNIT_ASSERT_EQUAL(style::NumberingType::NUMBER_HANGUL_KO, numFormat); +} + +DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHTW, "numlist-zhtw.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); + if (!pXmlDoc) + return; + + assertXPath ( pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","taiwaneseCountingThousand" ); +} + +DECLARE_OOXMLEXPORT_TEST(testOoxmlNumListZHCN, "numlist-zhcn.odt") +{ + xmlDocPtr pXmlDoc = parseExport("word/numbering.xml"); + if (!pXmlDoc) + return; + + assertXPath ( pXmlDoc, "/w:numbering/w:abstractNum[1]/w:lvl[1]/w:numFmt","val","chineseCountingThousand" ); +} + DECLARE_OOXMLEXPORT_TEST(testNumParentStyle, "num-parent-style.docx") { // This was "Outline", i.e. <w:numId> was not imported from the Heading 2 paragraph style. |