diff options
| author | Justin Luth <justin.luth@collabora.com> | 2021-04-08 20:27:58 +0200 |
|---|---|---|
| committer | Xisco Fauli <xiscofauli@libreoffice.org> | 2021-04-09 14:48:35 +0200 |
| commit | 057d38385b7bc79c688b837416fa881050b2b370 (patch) | |
| tree | 337aca75f052873679f5868fbecdabbadee54b86 | |
| parent | tdf#139495 doc import: prevent negative Int forced into uInt (diff) | |
| download | core-057d38385b7bc79c688b837416fa881050b2b370.tar.gz core-057d38385b7bc79c688b837416fa881050b2b370.zip | |
tdf#97569 docxexport: export russianUpper/russianLower numbering
Change-Id: Iad5f5d4687eccc05a63d6a9a4f81cf3f552cb17d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113829
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
(cherry picked from commit 3236020c4b8bed68dcf57210c0437f43f4160130)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113771
Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>
| -rw-r--r-- | sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx index 26151ebcc0c9..2044d76b82e7 100644 --- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx +++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx @@ -760,10 +760,10 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testOOxmlOutlineNumberTypes, "outline-number assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[2]/w:numFmt", "val", "decimal"); assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[3]/w:numFmt", "val", "decimal"); assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[4]/w:numFmt", "val", "decimal"); - assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[5]/w:numFmt", "val", "decimal"); - assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[6]/w:numFmt", "val", "decimal"); - assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[7]/w:numFmt", "val", "decimal"); - assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[8]/w:numFmt", "val", "decimal"); + assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[5]/w:numFmt", "val", "russianUpper"); + assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[6]/w:numFmt", "val", "russianLower"); + assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[7]/w:numFmt", "val", "russianUpper"); + assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[2]/w:lvl[8]/w:numFmt", "val", "russianLower"); assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[3]/w:lvl[1]/w:numFmt", "val", "decimal"); assertXPath(pXmlDoc, "/w:numbering/w:abstractNum[3]/w:lvl[2]/w:numFmt", "val", "decimal"); diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index ebca5798144e..3ba079cde7f4 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -6827,6 +6827,10 @@ static OString impl_LevelNFC(sal_uInt16 nNumberingType, const SfxItemSet* pOutSe case style::NumberingType::CHARS_ARABIC: aType="arabicAlpha"; break; case style::NumberingType::CHARS_THAI: aType="thaiLetters"; break; case style::NumberingType::CHARS_PERSIAN: aType="hindiVowels"; break; + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU: + case style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU: aType = "russianUpper"; break; + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU: + case style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU: aType = "russianLower"; break; case style::NumberingType::TEXT_NUMBER: aType="ordinal"; break; case style::NumberingType::TEXT_CARDINAL: aType="cardinalText"; break; case style::NumberingType::TEXT_ORDINAL: aType="ordinalText"; break; @@ -6861,10 +6865,6 @@ static OString impl_LevelNFC(sal_uInt16 nNumberingType, const SfxItemSet* pOutSe 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: |