diff options
| author | Mark Hung <marklh9@gmail.com> | 2016-01-24 16:36:05 +0800 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-01-27 13:35:42 +0000 |
| commit | 91b926d4b9939337f54d6c9f0b940b161dc3437f (patch) | |
| tree | 992ac33593bf5b90c07cfd72e36156fa4066d4e7 /sw/source | |
| parent | aee3355a8a7a6b7749f2eddd74e9389fe5782186 (diff) | |
tdf#84317 convert missing numbering types to OOXML tokens.
CIRCLE_NUMBER -> decimalEnclosedCircle
CHARS_ARABIC --> arabicAlpha
CHARS_THAI --> thaiLetter
CHARS_PERSIAN --> hindiVowels
NUMBER_NONE --> none
All the reset --> decimal
All the types above were converted to 'none' before.
Change-Id: Ie97e3fd4a00b7e4cc80ffb3776028e431e0535de
Reviewed-on: https://gerrit.libreoffice.org/21741
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 138b8069f225..1586054805f3 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -5644,6 +5644,7 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , const SfxItemSet *pOut case style::NumberingType::BITMAP: case style::NumberingType::CHAR_SPECIAL: case style::NumberingType::CHARS_HEBREW: + case style::NumberingType::NUMBER_NONE: return impl_NumberingType( nNumberingType ); case style::NumberingType::FULLWIDTH_ARABIC: aType="decimalFullWidth"; break; case style::NumberingType::TIAN_GAN_ZH: aType="ideographTraditional"; break; @@ -5670,8 +5671,39 @@ static OString impl_LevelNFC( sal_uInt16 nNumberingType , const SfxItemSet *pOut case style::NumberingType::HANGUL_JAMO_KO: aType="chosung";break; case style::NumberingType::NUMBER_HANGUL_KO: aType="koreanDigital";break; case style::NumberingType::NUMBER_UPPER_KO: aType="koreanLegal"; break; + case style::NumberingType::CIRCLE_NUMBER: aType="decimalEnclosedCircle"; break; + case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break; + case style::NumberingType::CHARS_THAI: aType="thaiLetters"; break; + case style::NumberingType::CHARS_PERSIAN: aType="hindiVowels"; break; +/* + Fallback the rest to decimal. + case style::NumberingType::NATIVE_NUMBERING: + case style::NumberingType::HANGUL_CIRCLED_JAMO_KO: + case style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO: + case style::NumberingType::CHARS_GREEK_UPPER_LETTER: + case style::NumberingType::CHARS_GREEK_LOWER_LETTER: + case style::NumberingType::PAGE_DESCRIPTOR: + case style::NumberingType::TRANSLITERATION: + case style::NumberingType::CHARS_NEPALI: + case style::NumberingType::CHARS_KHMER: + case style::NumberingType::CHARS_LAO: + case style::NumberingType::CHARS_TIBETAN: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_BG: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_BG: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_BG: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_BG: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU: + case style::NumberingType::CHARS_MYANMAR: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR: +*/ default: - aType = "none"; break; + aType = "decimal"; break; } return aType; } |