diff options
| author | Mark Hung <marklh9@gmail.com> | 2014-11-04 05:31:53 -0800 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-07 22:07:33 +0100 |
| commit | d30a8ec448bcd08c6a52a37d6ae41a4b71c235da (patch) | |
| tree | f2b98f28a26d2dde0f136d0565a4043881e27c02 /sw/source/filter/ww8/rtfattributeoutput.cxx | |
| parent | indentation fixes (diff) | |
| download | core-d30a8ec448bcd08c6a52a37d6ae41a4b71c235da.tar.gz core-d30a8ec448bcd08c6a52a37d6ae41a4b71c235da.zip | |
Correct number format mapping for CJK numbered lists in rtf/doc/docx filters.
Reviewed on:
https://gerrit.libreoffice.org/12252
Change-Id: I2d8760c7ecb3677464e167528b2424aaca19a0d7
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.cxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 62 |
1 files changed, 62 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index cee683b74844..84b031a60859 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1301,6 +1301,68 @@ void RtfAttributeOutput::NumberingLevel(sal_uInt8 nLevel, case SVX_NUM_CHARS_LOWER_LETTER_N: nVal = 4; break; + case SVX_NUM_FULL_WIDTH_ARABIC: + nVal=14; + break; + case SVX_NUM_CIRCLE_NUMBER: + nVal=18; + break; + case SVX_NUM_NUMBER_LOWER_ZH: + nVal=35; + if (pOutSet) + { + const SvxLanguageItem rlang = (const SvxLanguageItem&) pOutSet->Get(RES_CHRATR_CJK_LANGUAGE,true); + if (LANGUAGE_CHINESE_SIMPLIFIED == rlang.GetLanguage()) + { + nVal=39; + } + } + break; + case SVX_NUM_NUMBER_UPPER_ZH: + nVal=38; + break; + case SVX_NUM_NUMBER_UPPER_ZH_TW: + nVal=34; + break; + case SVX_NUM_TIAN_GAN_ZH: + nVal=30; + break; + case SVX_NUM_DI_ZI_ZH: + nVal=31; + break; + case SVX_NUM_NUMBER_TRADITIONAL_JA: + nVal=16; + break; + case SVX_NUM_AIU_FULLWIDTH_JA: + nVal=20; + break; + case SVX_NUM_AIU_HALFWIDTH_JA: + nVal=12; + break; + case SVX_NUM_IROHA_FULLWIDTH_JA: + nVal=21; + break; + case SVX_NUM_IROHA_HALFWIDTH_JA: + nVal=13; + break; + case style::NumberingType::HANGUL_SYLLABLE_KO: + nVal = 24; + break;// ganada + case style::NumberingType::HANGUL_JAMO_KO: + nVal = 25; + break;// chosung + case style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO: + nVal = 24; + break; + case style::NumberingType::HANGUL_CIRCLED_JAMO_KO: + nVal = 25; + break; + case style::NumberingType::NUMBER_HANGUL_KO: + nVal = 41; + break; + case style::NumberingType::NUMBER_UPPER_KO: + nVal = 44; + break; case SVX_NUM_BITMAP: case SVX_NUM_CHAR_SPECIAL: |