[PATCH libreoffice-4-0] Resolves: #i119658#, some Chinese numbering formats not supp...

[Fridrich Strba (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/2682

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/82/2682/1

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>
(cherry picked from commit 3c1eba7314d3a0dae925cbe90e0cd98cfb79c81b)
---
M writerfilter/source/dmapper/ConversionHelper.cxx
1 file changed, 4 insertions(+), 0 deletions(-)



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 @@
         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

-- 
To view, visit https://gerrit.libreoffice.org/2682
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If3f27764352b59fdb45bf84c4a0e604c9c844077
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: libreoffice-4-0
Gerrit-Owner: Fridrich Strba <fridrich at documentfoundation.org>