From f5d305a605b9c8f8d22eebce7c5556ed9e134025 Mon Sep 17 00:00:00 2001 From: Mark Hung Date: Sat, 24 Jan 2015 07:10:20 -0800 Subject: 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 Tested-by: Miklos Vajna --- writerfilter/source/dmapper/ConversionHelper.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'writerfilter') diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 7b6dc5f93c50..495ab695a85f 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -516,6 +516,7 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) 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: @@ -536,7 +537,6 @@ sal_Int16 ConvertNumberingType(sal_Int32 nFmt) 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: -- cgit