sw/qa/extras/odfexport/data/spellout-numberingtypes.odt |binary sw/qa/extras/odfexport/odfexport.cxx | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit 066abd6163a1b12e3bdcaf0385a4842c7bc7d119 Author: László Németh <nem...@numbertext.org> Date: Fri May 18 18:04:21 2018 +0200 tdf#117171 unit test for localized page number numbering styles Change-Id: Iad92cbe0b0376725c3078d26a4f3201d072c3c16 Reviewed-on: https://gerrit.libreoffice.org/54554 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: László Németh <nem...@numbertext.org> diff --git a/sw/qa/extras/odfexport/data/spellout-numberingtypes.odt b/sw/qa/extras/odfexport/data/spellout-numberingtypes.odt index 194920b5d91b..0f07d93f2426 100644 Binary files a/sw/qa/extras/odfexport/data/spellout-numberingtypes.odt and b/sw/qa/extras/odfexport/data/spellout-numberingtypes.odt differ diff --git a/sw/qa/extras/odfexport/odfexport.cxx b/sw/qa/extras/odfexport/odfexport.cxx index 06a9256b82c9..e6f544da51c2 100644 --- a/sw/qa/extras/odfexport/odfexport.cxx +++ b/sw/qa/extras/odfexport/odfexport.cxx @@ -1981,7 +1981,7 @@ DECLARE_ODFEXPORT_TEST(testChapterNumberingNewLine, "chapter-number-new-line.odt DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt") { // ordinal indicator, ordinal and cardinal number numbering styles (from LibreOffice 6.1) - const char* aFieldTexts[] = { "1st", "First", "One" }; + const char* aFieldTexts[] = { "1st", "Erste", "Eins", "1.", "Premier", "Un", "1ᵉʳ", "First", "One" }; // fallback for old platforms without std::codecvt and std::regex supports const char* aFieldTextFallbacks[] = { "Ordinal-number 1", "Ordinal 1", "1" }; uno::Reference<text::XTextFieldsSupplier> xTextFieldsSupplier(mxComponent, uno::UNO_QUERY); @@ -1999,7 +1999,7 @@ DECLARE_ODFEXPORT_TEST(testSpellOutNumberingTypes, "spellout-numberingtypes.odt" { uno::Reference<text::XTextContent> xField(aField, uno::UNO_QUERY); CPPUNIT_ASSERT_EQUAL(true, OUString::fromUtf8(aFieldTexts[i]).equals(xField->getAnchor()->getString()) || - OUString::fromUtf8(aFieldTextFallbacks[i]).equals(xField->getAnchor()->getString())); + OUString::fromUtf8(aFieldTextFallbacks[i%3]).equals(xField->getAnchor()->getString())); } } } _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits