diff options
| author | Jian Fang Zhang <zhangjf@apache.org> | 2012-09-03 07:50:59 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-03-12 15:21:40 +0000 |
| commit | 775c3ddd47e0619a7f0ebed6dbcba3d5b41a708e (patch) | |
| tree | 2392552150f13da1fbd04373eca0f2d4d2d19674 | |
| parent | 9b0b0d92862c1210fd168b4e5997f776fb8be7a8 (diff) | |
Resolves: #i119658#, some Chinese numbering formats not supported
Found by: xiao ting xiao, tingxiaox@gmail.com
Patch by: bjcheny, companycy@gmail.com
Review by: zhangjf
(cherry picked from commit 50eca22976c42014f5e2c53f4bf19e2e1d21ee62)
Change-Id: If3f27764352b59fdb45bf84c4a0e604c9c844077
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
(cherry picked from commit 3c1eba7314d3a0dae925cbe90e0cd98cfb79c81b)
Reviewed-on: https://gerrit.libreoffice.org/2682
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
| -rw-r--r-- | writerfilter/source/dmapper/ConversionHelper.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx index 88c93728a5ba..86357af2fc78 100644 --- a/writerfilter/source/dmapper/ConversionHelper.cxx +++ b/writerfilter/source/dmapper/ConversionHelper.cxx @@ -426,8 +426,12 @@ sal_Int16 ConvertNumberingType(sal_Int32 nNFC) case NS_ooxml::LN_Value_ST_NumberFormat_japaneseCounting: case NS_ooxml::LN_Value_ST_NumberFormat_taiwaneseCounting: case NS_ooxml::LN_Value_ST_NumberFormat_ideographDigital: + case NS_ooxml::LN_Value_ST_NumberFormat_chineseCountingThousand: nRet = style::NumberingType::NUMBER_LOWER_ZH; break; + case NS_ooxml::LN_Value_ST_NumberFormat_chineseLegalSimplified: + nRet = style::NumberingType::NUMBER_UPPER_ZH; + break; default: nRet = style::NumberingType::ARABIC; } /* TODO: Lots of additional values are available - some are supported in the I18 framework |