diff options
| author | Steve Yin <steve_y@apache.org> | 2014-11-28 15:27:41 +0000 |
|---|---|---|
| committer | Steve Yin <steve_y@apache.org> | 2014-11-28 15:27:41 +0000 |
| commit | a2fdc4c281b66d927295b93b1102046845b1b958 (patch) | |
| tree | 88cff114ec73b1aa70d1ad4fe0255b3200daa6c0 /writerfilter | |
| parent | 0e8953709094680e31f0f104c3c2576cb913370e (diff) | |
Issue 125400 - CJK numbering ordered list fallback to Arabic numerals
Contributor: Mark Hung
Notes
Notes:
prefer: d30a8ec448bcd08c6a52a37d6ae41a4b71c235da
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 25785596fd67..fca33781b329 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -561,6 +561,7 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC) case 2: nRet = style::NumberingType::ROMAN_LOWER; break; + case NS_ooxml::LN_Value_ST_NumberFormat_ordinal: case 3: nRet = style::NumberingType::CHARS_UPPER_LETTER_N; break; @@ -580,10 +581,10 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC) nRet = style::NumberingType::NUMBER_NONE; break; case NS_ooxml::LN_Value_ST_NumberFormat_upperLetter: - nRet = style::NumberingType::CHARS_UPPER_LETTER; + nRet = style::NumberingType::CHARS_UPPER_LETTER_N; break; case NS_ooxml::LN_Value_ST_NumberFormat_lowerLetter: - nRet = style::NumberingType::CHARS_LOWER_LETTER; + nRet = style::NumberingType::CHARS_LOWER_LETTER_N; break; case NS_ooxml::LN_Value_ST_NumberFormat_iroha: nRet = style::NumberingType::IROHA_HALFWIDTH_JA; @@ -625,9 +626,9 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC) case NS_ooxml::LN_Value_ST_NumberFormat_chosung: nRet = style::NumberingType::HANGUL_JAMO_KO; break; + case NS_ooxml::LN_Value_ST_NumberFormat_koreanLegal: case NS_ooxml::LN_Value_ST_NumberFormat_koreanDigital: case NS_ooxml::LN_Value_ST_NumberFormat_koreanCounting: - case NS_ooxml::LN_Value_ST_NumberFormat_koreanDigital2: nRet = style::NumberingType::NUMBER_HANGUL_KO; break; case NS_ooxml::LN_Value_ST_NumberFormat_ideographLegalTraditional: @@ -645,13 +646,19 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC) case NS_ooxml::LN_Value_ST_NumberFormat_chineseCounting: case NS_ooxml::LN_Value_ST_NumberFormat_japaneseCounting: case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCounting: + case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCountingThousand: case NS_ooxml::LN_Value_ST_NumberFormat_ideographDigital: case NS_ooxml::LN_Value_ST_NumberFormat_chineseCountingThousand: + case NS_ooxml::LN_Value_ST_NumberFormat_koreanDigital2: nRet = style::NumberingType::NUMBER_LOWER_ZH; break; case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified: nRet = style::NumberingType::NUMBER_UPPER_ZH; break; + case NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth: + case NS_ooxml::LN_Value_ST_NumberFormat_decimalFullWidth2: + nRet = style::NumberingType::FULLWIDTH_ARABIC; + break; default: nRet = style::NumberingType::ARABIC; } /* TODO: Lots of additional values are available - some are supported in the I18 framework |