diff options
| author | László Németh <nemeth@numbertext.org> | 2018-11-20 09:44:43 +0100 |
|---|---|---|
| committer | László Németh <nemeth@numbertext.org> | 2018-12-21 12:13:27 +0100 |
| commit | dbc180888624805ec3df4b7787ff107c425eab21 (patch) | |
| tree | 4e1eab4fc5fe3e10db82464ba33c4fb9e1ab229b | |
| parent | 027e592758421287463b1a3bf64cb32d3ef96601 (diff) | |
tdf#115319 fix Hungarian article before letter i
in words, for example “az Ipsum”, not “a Ipsum”.
This bug was reported by Gellért Gyuris.
Complete commit 1037e3759bf178b52d16c12a811717f94ab9950a
(tdf#115319 references with Hungarian articles)
Change-Id: If930feb11a0308246d2512f0093bcacdc8675d0b
Reviewed-on: https://gerrit.libreoffice.org/63637
Tested-by: Jenkins
Reviewed-by: László Németh <nemeth@numbertext.org>
(cherry picked from commit 542d17d9384cced62db6bcfa45a5f44316409edc)
Reviewed-on: https://gerrit.libreoffice.org/63669
| -rw-r--r-- | sw/qa/extras/odfexport/data/referencelanguage.odt | bin | 17461 -> 16137 bytes | |||
| -rw-r--r-- | sw/qa/extras/odfexport/odfexport.cxx | 2 | ||||
| -rw-r--r-- | sw/source/core/fields/reffld.cxx | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/sw/qa/extras/odfexport/data/referencelanguage.odt b/sw/qa/extras/odfexport/data/referencelanguage.odt Binary files differindex dcdd626fe3cf..9614bb3e31bc 100644 --- a/sw/qa/extras/odfexport/data/referencelanguage.odt +++ b/sw/qa/extras/odfexport/data/referencelanguage.odt diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 01327898daa0..9245c3c16716 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -1957,7 +1957,7 @@ DECLARE_ODFEXPORT_TEST(testReferenceLanguage, "referencelanguage.odt") { // Test loext:reference-language attribute of reference fields // (used from LibreOffice 6.1, and proposed for next ODF) - const char* aFieldTexts[] = { "A 2", "Az 50-esek", + const char* aFieldTexts[] = { "A 2", "Az Isten", "Az 50-esek", "A 2018-asok", "Az egyebek", "A fejezetek", u8"Az „Őseinket...”", "a 2", "Az v", "az 1", "Az e", "az 1", diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx index 9f6ec1998185..47bb1b0a615b 100644 --- a/sw/source/core/fields/reffld.cxx +++ b/sw/source/core/fields/reffld.cxx @@ -286,7 +286,7 @@ static void lcl_formatReferenceLanguage( OUString& rRefText, 0x00E1, 0x00C1, 0x00E9, 0x00C9, 0x00ED, 0x00CD, 0x00F3, 0x00D3, 0x00F6, 0x00D6, 0x0151, 0x0150, 0x00FA, 0x00DA, 0x00FC, 0x00DC, 0x0171, 0x0170, 0 }; - static OUString sVowels = "aAeEoOuU" + OUString(sVowelsWithDiacritic); + static OUString sVowels = "aAeEiIoOuU" + OUString(sVowelsWithDiacritic); // handle more than 1-letter long Roman numbers and // their possible combinations with letters: |