Attachment 9301 Details for Bug 39927 – 3236020.diff

[patch] 3236020.diff

3236020.diff (text/plain), 3.61 KB, created by Andrey Cherepanov on 2021-04-13 11:19:51 MSK

(hide)

Description:

Filename:

MIME Type:

Creator: Andrey Cherepanov

Created: 2021-04-13 11:19:51 MSK

Size: 3.61 KB

patch

obsolete

>From 3236020c4b8bed68dcf57210c0437f43f4160130 Mon Sep 17 00:00:00 2001
>From: Justin Luth <justin.luth@collabora.com>
>Date: Thu, 08 Apr 2021 20:27:58 +0200
>Subject: [PATCH] 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>
>---
>
>diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>index 6275ee8..592699c 100644
>--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
>@@ -760,10 +760,10 @@
>     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 1416dd4..4eccf56 100644
>--- a/sw/source/filter/ww8/docxattributeoutput.cxx
>+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
>@@ -6847,6 +6847,10 @@
>         case style::NumberingType::CHARS_ARABIC_ABJAD: aType="arabicAbjad"; 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;
>@@ -6881,10 +6885,6 @@
>         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:

Actions: View | Diff

Attachments on bug 39927: 9301