sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 8 ++++----
sw/source/filter/ww8/docxattributeoutput.cxx | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 057d38385b7bc79c688b837416fa881050b2b370
Author: Justin Luth <justin.l...@collabora.com>
AuthorDate: Thu Apr 8 20:27:58 2021 +0200
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Fri Apr 9 14:48:35 2021 +0200
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_l...@sil.org>
(cherry picked from commit 3236020c4b8bed68dcf57210c0437f43f4160130)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113771
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
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:
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
