diff options
author | DaeHyun Sung <sungdh86+git@gmail.com> | 2021-07-26 23:36:50 +0900 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2021-07-29 08:43:18 +0200 |
commit | 4598a385ffaaf8fdc124962d347fead994450bea (patch) | |
tree | d718b0245699ccca3d70eec79639f76574c85ac3 /sw/source/filter/ww8/docxattributeoutput.cxx | |
parent | ff1d4168dd8620431a4f9da64c8d25a7c8f69693 (diff) |
tdf#143526 fix and add Korean numbering
fix Korean NumberFormat, compare with MS Word
change mapping of style::NumberingType::NUMBER_HANGUL_KO,
from "koreanLegal" to "koreanCounting"
"koreanDigital" add new reserved words "일, 일영, 일영영, etc"
- style::NumberingType::NUMBER_DIGITAL_KO
"koreanLegal" is new reserved words "하나, 둘, 셋, 넷, 다섯, 여섯, 일곱, 여덟, 아홉, 열"
- style::NumberingType::NUMBER_LEGAL_KO
"koreanDigital2" is new reserved words "一, 一零, 一零零, etc"
- style::NumberingType::NUMBER_DIGITAL2_KO
Reference:
1: "[MS-OE376]: Office Implementation Information for ECMA-376 Standards Support"
https://docs.microsoft.com/en-us/openspecs/office_standards/ms-oe376/a5deef83-bb01-410f-bde0-9c35abe4ca52
2.1.350 Part 4 Section 2.13.5.30, numberingChange (Previous Paragraph Numbering Properties)
2: "[MS-DOCX]: Word Extensions to the Office Open XML (.docx) File Format" shows example of not only Korean Numbering also others Numbering examples.
https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx/b839fe1f-e1ca-4fa6-8c26-5954d0abbccd
2.4 numFmt Extensions
https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx/a1bb5809-e361-4e49-8e16-7f1a67da4121
Change-Id: I535b2aa3cf4111d86b9b7b788afe4aa64e8e4545
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119518
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sw/source/filter/ww8/docxattributeoutput.cxx')
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index bb8334bda259..5f325eaec6c9 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6992,8 +6992,10 @@ static OString lcl_ConvertNumberingType(sal_Int16 nNumberingType, const SfxItemS case style::NumberingType::IROHA_HALFWIDTH_JA: aType="irohaFullWidth";break; case style::NumberingType::HANGUL_SYLLABLE_KO: aType="ganada";break; 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::NUMBER_HANGUL_KO: aType="koreanCounting"; break; + case style::NumberingType::NUMBER_LEGAL_KO: aType = "koreanLegal"; break; + case style::NumberingType::NUMBER_DIGITAL_KO: aType = "koreanDigital"; break; + case style::NumberingType::NUMBER_DIGITAL2_KO: aType = "koreanDigital2"; break; case style::NumberingType::CIRCLE_NUMBER: aType="decimalEnclosedCircle"; break; case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break; case style::NumberingType::CHARS_ARABIC_ABJAD: aType="arabicAbjad"; break; |