[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/calendar/calendar_gregorian.cxx |9 - 1 file changed, 8 insertions(+), 1 deletion(-) New commits: commit 0b14b9ec55fb2a8dd0ec24e1c03702bc4bbf1878 Author: Rene Engelhard AuthorDate: Sun Nov 1 18:30:49 2020 +0100 Commit: Eike Rathke CommitDate: Mon Nov 2 17:48:35 2020 +0100 fix build with ICU 68 use standard true. /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx: In member function 'virtual void i18npool::Calendar_gregorian::setLocalDateTime(double)': /home/rene/LibreOffice/git/master/i18npool/source/calendar/calendar_gregorian.cxx:363:40: error: 'TRUE' was not declared in this scope 363 | body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); |^~~~ /usr/include/unicode/umachine.h says: @deprecated ICU 68 Use standard "true" instead. Change-Id: I45d2b0afa6a9043767af5c2cf41ba24377f2cdc4 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105057 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/i18npool/source/calendar/calendar_gregorian.cxx b/i18npool/source/calendar/calendar_gregorian.cxx index b7ae49fbd96e..59ee46fa0e0f 100644 --- a/i18npool/source/calendar/calendar_gregorian.cxx +++ b/i18npool/source/calendar/calendar_gregorian.cxx @@ -347,7 +347,14 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays ) "Calendar_gregorian::setLocalDateTime: " << std::fixed << fM << " rounded to " << fR); int32_t nZoneOffset, nDSTOffset; UErrorCode status = U_ZERO_ERROR; -body->getTimeZone().getOffset( fR, TRUE, nZoneOffset, nDSTOffset, status ); +body->getTimeZone().getOffset( fR, +#if U_ICU_VERSION_MAJOR_NUM >= 68 +true, +#else +TRUE, +#endif +nZoneOffset, nDSTOffset, status ); + if ( !U_SUCCESS(status) ) throw ERROR; status = U_ZERO_ERROR; body->setTime( fR - (nZoneOffset + nDSTOffset), status ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/collator/data/hu_charset.txt |3 --- 1 file changed, 3 deletions(-) New commits: commit d2cf0df6696e42c36b2de4ca5548da6e656f08c5 Author: Attila Szűcs AuthorDate: Fri Aug 28 10:12:17 2020 +0200 Commit: Eike Rathke CommitDate: Sat Oct 10 23:44:57 2020 +0200 tdf#122759 sc: fix Autofilter case sensitivity for Hungarian Remove case sensitivity from NON case-sensitive Hungarian collator in i18npool, added by commit 7b1eb6313c0d2621c364df1724c69d28f8267841 (tdf#11 fix Hungarian sorting). It seems, this doesn't affect Writer, where it's possible to choose case-sensitive sorting, too. Note: Handling of space is still a problem for normal text, i.e. sorting according to Hungarian orthography, see commit 7618490d334409c3fc4167f32732537ef738647f (tdf#123204 hu_HU collation: don't ignore special characters). Co-authored-by: Tibor Nagy (NISZ) Change-Id: I667eb5e22401a7fcef0e6e6111c48ce7d9c4aaf3 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101527 Reviewed-by: László Németh Tested-by: László Németh (cherry picked from commit 0baa63eb00cf42712584dc87cc9874df1195c24a) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103063 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/i18npool/source/collator/data/hu_charset.txt b/i18npool/source/collator/data/hu_charset.txt index f38ecfd5c7b6..027bea7e230c 100644 --- a/i18npool/source/collator/data/hu_charset.txt +++ b/i18npool/source/collator/data/hu_charset.txt @@ -20,9 +20,6 @@ # Collation of Hungarian letters # -[caseLevel on] -[caseFirst lower] - # Because of the different requirements of Writer and Calc, # don't ignore the special characters, yet. # See tdf#123204 "EDITING Not all special characters appear in the AutoFilter window" ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/localedata/data/fr_BF.xml |8 - i18npool/source/localedata/data/fr_TG.xml | 152 +- 2 files changed, 155 insertions(+), 5 deletions(-) New commits: commit 30ac2c61eacd8d14972afb381ffd76ae37590556 Author: Julien Nabet AuthorDate: Tue Sep 29 21:14:19 2020 +0200 Commit: Eike Rathke CommitDate: Sat Oct 10 21:58:52 2020 +0200 tdf#137009: except Togo, all French locales in African don't use AM/PM See https://bugs.documentfoundation.org/show_bug.cgi?id=137009#c4 Change-Id: I01612e79ffd947c1a4c0cf252d71bda48bc3ef8e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103638 (cherry picked from commit f11dc8335c9bae837823c14d059388b8d5965dcb) Change-Id: I55f0c33f884e330e7557a46990ffdbc5f32f2042 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103654 Tested-by: Jenkins Reviewed-by: Eike Rathke diff --git a/i18npool/source/localedata/data/fr_BF.xml b/i18npool/source/localedata/data/fr_BF.xml index 72ccc852f0da..7f4661b8edb4 100644 --- a/i18npool/source/localedata/data/fr_BF.xml +++ b/i18npool/source/localedata/data/fr_BF.xml @@ -162,16 +162,16 @@ WW - + HH:MM - + HH:MM:SS - + HH:MM AM/PM - + HH:MM:SS AM/PM diff --git a/i18npool/source/localedata/data/fr_TG.xml b/i18npool/source/localedata/data/fr_TG.xml index a322f88b329d..4f369c538e10 100644 --- a/i18npool/source/localedata/data/fr_TG.xml +++ b/i18npool/source/localedata/data/fr_TG.xml @@ -20,7 +20,157 @@ - + +D/M +D.M.Y +D-M-Y + + Standard + + + 0 + + + 0,00 + + + # ##0 + + + # ##0,00 + + + # ###,00 + + + 0,00E+000 + + + 0,00E+00 + + + ##0,00E+00 + + + 0" "% + + + 0,00" "% + + + # ##0 [CURRENCY];-# ##0 [CURRENCY] + + + # ##0,00 [CURRENCY];-# ##0,00 [CURRENCY] + + + # ##0 [CURRENCY];[RED]-# ##0 [CURRENCY] + + + # ##0,00 [CURRENCY];[RED]-# ##0,00 [CURRENCY] + + + # ##0,00 CCC + + + # ##0,-- [CURRENCY];[RED]-# ##0,-- [CURRENCY] + + + D/MM/YY + + + DD + + + DD/MM/YY + + + DD/MM/ + + + D MMM YY + + + D MMM + + + D MMM + + + D + + + D YY + + + NN DD/MMM/YY + + + NN D MMM YY + + + NN D + + + D + + + MM/DD + + + YY-MM-DD + ISO 8601 + + + -MM-DD + ISO 8601 + + + MM/YY + + + MMM/DD + + + + + + QQ YY + + + WW + + + HH:MM + + + HH:MM:SS + + + HH:MM AM/PM + + + HH:MM:SS AM/PM + + + [HH]:MM:SS + + + MM:SS,00 + + + [HH]:MM:SS,00 + + + DD/MM/YY HH:MM + + + DD/MM/ HH:MM:SS AM/PM + + + DD/MM/ HH:MM + + ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/localedata/data/et_EE.xml | 32 +++--- 1 file changed, 16 insertions(+), 16 deletions(-) New commits: commit 195e496f6ce92e9e5baa4b58015281a5c91fbf1a Author: Mihkel Tõnnov AuthorDate: Thu Jul 23 02:57:54 2020 +0200 Commit: Christian Lohmaier CommitDate: Wed Jul 29 21:00:11 2020 +0200 tdf#130154: update locale data for Estonian [et-EE] - follow-up Follow-up for 4804d969bacd25ad586b3bf70d3dc8c27adb48ef: * change abbreviations to omit trailing periods, as officially preferred * add quotes around literal characters in date formats (so those formats wouldn't be mistakenly detected as "user-defined") * revert sorting of a few date formats for backwards compatibility's sake: - when opening files created in 7.0, previous versions shouldn't add ". a" anymore to formats that aren't supposed to have it Change-Id: I666273aa32e7ca363aa929b8a1fd83bf46533f6f Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99204 Tested-by: Adolfo Jayme Barrientos Reviewed-by: Christian Lohmaier diff --git a/i18npool/source/localedata/data/et_EE.xml b/i18npool/source/localedata/data/et_EE.xml index 5154760778ce..bdc06c16f5fe 100644 --- a/i18npool/source/localedata/data/et_EE.xml +++ b/i18npool/source/localedata/data/et_EE.xml @@ -47,8 +47,8 @@ „ ” -e.l. -p.l. +e.l +p.l metric @@ -111,7 +111,7 @@ DD.MM.YY - D. + D. ". a" D.M. @@ -122,17 +122,17 @@ D. M - - D. MMM + + D. MMM ". a" - - D. MMM . a + + D. MMM - D. + D. ". a" - D. . a + D. NN, D. M @@ -141,10 +141,10 @@ NN, D. MMM - NN, D. + NN, D. ". a" - D. . a + DD. ". a" MM-DD @@ -172,13 +172,13 @@ WW - WW. "nädal" + WW". nädal" - WW. "nädal" + WW". nädal " - NN, D. . a + NN, D. D.MM. @@ -250,8 +250,8 @@ 0 1 2 - jj. - jj. + jj + jj ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source sw/qa
i18npool/source/breakiterator/breakiterator_unicode.cxx |5 + sw/qa/extras/layout/data/no-line-break-at-slash.fodt| 50 sw/qa/extras/layout/layout.cxx | 40 3 files changed, 94 insertions(+), 1 deletion(-) New commits: commit a8eaeced531ac2acb91c719532d42d51a6b9d589 Author: Michael Stahl AuthorDate: Mon Jul 20 20:22:55 2020 +0200 Commit: Eike Rathke CommitDate: Wed Jul 22 16:40:55 2020 +0200 i18npool: don't break line at slash '/' If sw text formatting gets the result of the special-case code added to the "word boundary break" condition, it may call again the next time with the preceding index, and fall into the "Line boundary break" condition, which hence also needs to special case '/'. (regression from ICU 60, 9206a08ada00e8762c4a634f242bd566028964bb) Change-Id: I2aaefbc7b25af157e0a6ef15fabaa71bff1e8d9a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99104 Tested-by: Jenkins Reviewed-by: Michael Stahl (cherry picked from commit a916e2253df2bf1415c25fb7f974e0d16b615d03) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99059 Reviewed-by: Eike Rathke diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx b/i18npool/source/breakiterator/breakiterator_unicode.cxx index 2d2ac437b430..7c79b99ec028 100644 --- a/i18npool/source/breakiterator/breakiterator_unicode.cxx +++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx @@ -499,7 +499,10 @@ LineBreakResults SAL_CALL BreakIterator_Unicode::getLineBreak( icu::BreakIterator* pLineBI = line.mpValue->mpBreakIterator.get(); bool GlueSpace=true; while (GlueSpace) { -if (pLineBI->preceding(nStartPos + 1) == nStartPos) { //Line boundary break +// don't break with Slash U+002F SOLIDUS at end of line; see "else" below! +if (pLineBI->preceding(nStartPos + 1) == nStartPos +&& (nStartPos == 0 || Text[nStartPos - 1] != '/')) +{ //Line boundary break lbr.breakIndex = nStartPos; lbr.breakType = BreakType::WORDBOUNDARY; } else if (hOptions.rHyphenator.is()) { //Hyphenation break diff --git a/sw/qa/extras/layout/data/no-line-break-at-slash.fodt b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt new file mode 100644 index ..e900594fa0c8 --- /dev/null +++ b/sw/qa/extras/layout/data/no-line-break-at-slash.fodt @@ -0,0 +1,50 @@ + + +http://openoffice.org/2009/office; xmlns:css3t="http://www.w3.org/TR/css3-text/; xmlns:grddl="http://www.w3.org/2003/g/data-view#; xmlns:xhtml="http://www.w3.org/1999/xhtml; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance; xmlns:xsd="http://www.w3.org/2001/XMLSchema; xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:rpt="http://openoffice.org/2005/report; xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:xlink="http://www.w3.org/1999/xlink; xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:dc="http://purl.org/dc/eleme nts/1.1/" xmlns:ooo="http://openoffice.org/2004/office; xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0" xmlns:drawooo="http://openoffice.org/2010/draw; xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:ooow="http://openoffice.org/2004/writer; xmlns:oooc="http://openoffice.org/2004/calc; xmlns:tableooo="http://openoffice.org/2009/table; xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML; xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0 " xmlns:dom="http://www.w3.org/2001/xml-events; xmlns:xforms="http://www.w3.org/2002/xforms; office:version="1.2" office:mimetype="application/vnd.oasis.opendocument.text"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Blah blah bla bla bla Foostrasse 13/c/2, etc. + + + diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx index
[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - i18npool/source
i18npool/source/localedata/data/kk_KZ.xml | 39 +- 1 file changed, 23 insertions(+), 16 deletions(-) New commits: commit b170c159c8b77a81dafd98d825af9e503348ec8c Author: Baurzhan Muftakhidinov AuthorDate: Sun Jul 12 18:57:09 2020 +0200 Commit: Eike Rathke CommitDate: Wed Jul 15 11:50:08 2020 +0200 tdf#134755 Update locale data for Kazakh [kk-KZ] Change-Id: I47e920a98833f71bd5c8db0a0590a4f8cdcb83b5 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98465 Tested-by: Jenkins Reviewed-by: Eike Rathke (cherry picked from commit a3c3ab7394f578340c33e6e1cd8da13196a8b596) Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98639 diff --git a/i18npool/source/localedata/data/kk_KZ.xml b/i18npool/source/localedata/data/kk_KZ.xml index 121ab7ac887e..e2c913c5fea0 100644 --- a/i18npool/source/localedata/data/kk_KZ.xml +++ b/i18npool/source/localedata/data/kk_KZ.xml @@ -39,7 +39,7 @@ - ж. + ж. „ @@ -47,11 +47,11 @@ « » -күндіз -кешкі +AM +PM metric - + D.M General @@ -168,16 +168,16 @@ WW - + HH:MM - + HH:MM:SS - + HH:MM AM/PM - + HH:MM:SS AM/PM @@ -193,7 +193,7 @@ DD.MM.YY HH:MM - DD.MM. HH:MM:SS AM/PM + DD.MM. HH:MM:SS DD.MM. HH:MM @@ -226,7 +226,7 @@ mon - Дб + Дс Дүйсенбі @@ -247,7 +247,7 @@ fri Жм - Жума + Жұма sat @@ -258,8 +258,8 @@ jan - Қан - Қантар + Қаң + Қаңтар feb @@ -299,7 +299,7 @@ sep Қыр - Қырқүйек + Қыркүйек oct @@ -337,6 +337,13 @@ + KZT + ₸ + KZT + Қазақстан теңгесі + 2 + + KZT тңг KZT @@ -354,8 +361,8 @@ - Ақиқат - Жалған + ақиқат + жалған бірінші тоқсан екінші тоқсан үшінші тоқсан ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits