[Libreoffice-commits] core.git: writerfilter/source

[Jian Fang Zhang]

Rebased ref, commits from common ancestor:
commit 3c1eba7314d3a0dae925cbe90e0cd98cfb79c81b
Author: Jian Fang Zhang <zhangjf at apache.org>
Date:   Mon Sep 3 07:50:59 2012 +0000

    Resolves: #i119658#, some Chinese numbering formats not supported
    
    Found by: xiao ting xiao, tingxiaox at gmail.com
    Patch by: bjcheny, companycy at gmail.com
    Review by: zhangjf
    (cherry picked from commit 50eca22976c42014f5e2c53f4bf19e2e1d21ee62)
    
    Change-Id: If3f27764352b59fdb45bf84c4a0e604c9c844077
    Signed-off-by: Fridrich Å trba <fridrich.strba at bluewin.ch>

diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 88c9372..86357af 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