[Libreoffice-commits] core.git: i18npool/source

[Kevin Suo (via logerrit)]

 i18npool/source/localedata/data/zh_CN.xml |  110 +-
 1 file changed, 63 insertions(+), 47 deletions(-)

New commits:
commit 34fe1610cb98a7e57c6719a5d4f88d90a6c8752a
Author: Kevin Suo 
AuthorDate: Wed Nov 29 19:02:58 2023 +0800
Commit: Kevin Suo 
CommitDate: Thu Nov 30 02:52:27 2023 +0100

Sync LC_OutLineNumberingLevel of zh-CN with en-US locale

The previous order makes the UI tooltip does not match with the
numbering style shown, per tdf#148023.

Also add a commonly used Chinese-specific outline numbering style.
The other old styles with the Chapters and Sections etc are removed
because they are useless.

Change-Id: I585cd0e704af35125c7c38561f500e83f1a465dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160081
Tested-by: Jenkins
Reviewed-by: Kevin Suo 

diff --git a/i18npool/source/localedata/data/zh_CN.xml 
b/i18npool/source/localedata/data/zh_CN.xml
index 6a9439cadfb6..ff943c3d091e 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -446,61 +446,77 @@
  
   
   
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
-
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
+  
 
 
-  
-  
-  
-  
-  
+  
+  
+  
+  
+  
+  
+
+ 
+  
+  
+  
+  
+  
+  
 
   
 

[Libreoffice-commits] core.git: i18npool/source

[Kevin Suo (via logerrit)]

 i18npool/source/localedata/data/zh_CN.xml |   33 +++---
 1 file changed, 17 insertions(+), 16 deletions(-)

New commits:
commit 6fffa9fdf2ad2c93c319ab662d3993b89c0a24ba
Author: Kevin Suo 
AuthorDate: Wed Nov 29 17:04:58 2023 +0800
Commit: Kevin Suo 
CommitDate: Thu Nov 30 02:52:03 2023 +0100

tdf#152583 follow-up: Sync LC_NumberingLevel of zh-CN with en-US locale

The previous order makes the UI tooltip does not match with the
numbering style shown, per tdf#148023.

Also re-arrange the remaining Chinese-specific styles to make the most
commonly used ones come first.

Change-Id: I913180b1ca385e8a604b16b63ebfa130aca059c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160080
Tested-by: Jenkins
Reviewed-by: Kevin Suo 

diff --git a/i18npool/source/localedata/data/zh_CN.xml 
b/i18npool/source/localedata/data/zh_CN.xml
index 063be07c630e..6a9439cadfb6 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -427,22 +427,23 @@
 
   
   
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
+ 
   
   
 

[Libreoffice-commits] core.git: i18npool/source

[Kevin Suo (via logerrit)]

 i18npool/source/localedata/data/zh_CN.xml |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 22d8f339197b23348e401bb3e9dd7430110dfba6
Author: Kevin Suo 
AuthorDate: Wed Nov 29 11:27:17 2023 +0800
Commit: Kevin Suo 
CommitDate: Wed Nov 29 08:21:45 2023 +0100

tdf#152583: Add [1],[2],[3] numbering style for zh-CN locale

This adds the [1],[2],[3] style of numbering to the Simplified
Chinese locale data. This will show up when one clicks the
numbering toolbar icon.

Change-Id: I8b54746b431384e682f4161a3e99211b4147bad1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/160059
Tested-by: Jenkins
Reviewed-by: Kevin Suo 

diff --git a/i18npool/source/localedata/data/zh_CN.xml 
b/i18npool/source/localedata/data/zh_CN.xml
index 1f33090d0ced..063be07c630e 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -431,6 +431,7 @@
  
  
  
+ 
  
  
  

[Libreoffice-commits] core.git: i18npool/source

[Achintya Sharma (via logerrit)]

 i18npool/source/search/textsearch.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit ee65218d9e74fc787520830f29f74e1ac61383ea
Author: Achintya Sharma 
AuthorDate: Thu Nov 23 15:15:48 2023 +0530
Commit: Taichi Haradaguchi <20001...@ymail.ne.jp>
CommitDate: Thu Nov 23 15:56:03 2023 +0100

tdf#143148 use pragma once instead of include guards

Change-Id: Icc27e0ebb8fe68d1171e7075e93e7ca74569c0b6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159860
Tested-by: Jenkins
Reviewed-by: Taichi Haradaguchi <20001...@ymail.ne.jp>

diff --git a/i18npool/source/search/textsearch.hxx 
b/i18npool/source/search/textsearch.hxx
index 43a643537a3a..10c1d59e23a3 100644
--- a/i18npool/source/search/textsearch.hxx
+++ b/i18npool/source/search/textsearch.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
-#define INCLUDED_I18NPOOL_SOURCE_SEARCH_TEXTSEARCH_HXX
+#pragma once
 
 #include 
 #include 
@@ -156,6 +155,4 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() 
override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: i18npool/source

[Caolán McNamara (via logerrit)]

 i18npool/source/calendar/calendar_jewish.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit d392b24623a46058d0fa35e445a4ceae519c738f
Author: Caolán McNamara 
AuthorDate: Thu Nov 2 12:56:23 2023 +
Commit: Caolán McNamara 
CommitDate: Thu Nov 2 16:29:09 2023 +0100

add a fast path for the 1999-12-31 date in calendar conversion

seen in:

https: 
//user-images.githubusercontent.com/833656/279971758-ef3d86b1-23ea-4e57-ad15-1f9b12df6bdd.svg
Change-Id: I76f5e83860ea49e52099ece670e7c259fd89e666
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158830
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/i18npool/source/calendar/calendar_jewish.cxx 
b/i18npool/source/calendar/calendar_jewish.cxx
index ab5a32a221d8..19b55eaf8789 100644
--- a/i18npool/source/calendar/calendar_jewish.cxx
+++ b/i18npool/source/calendar/calendar_jewish.cxx
@@ -140,6 +140,15 @@ public:
 HebrewDate(sal_Int32 m, sal_Int32 d, sal_Int32 y) : year(y), month(m), 
day(d) { }
 
 explicit HebrewDate(sal_Int32 d) { // Computes the Hebrew date from the 
absolute date.
+
+if (d == 730119) // 1999-12-31 : a very common date used in calc
+{
+year = 5760;
+month = 10;
+day = 22;
+return;
+}
+
 year = (d + HebrewEpoch) / 366; // Approximation from below.
 // Search forward for year from the approximation.
 while (d >= HebrewDate(7,1,year + 1).GetAbsoluteDate())

[Libreoffice-commits] core.git: i18npool/source

[Joan Montané (via logerrit)]

 i18npool/source/localedata/data/ca_ES.xml |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 44ca7832dea2c4e6243ed9fdbc828c25c2466bbd
Author: Joan Montané 
AuthorDate: Fri Aug 18 12:25:30 2023 +0200
Commit: Eike Rathke 
CommitDate: Thu Nov 2 11:43:36 2023 +0100

Localize  to Catalan

Change-Id: I088047a94f2bd7a7405cf42e9c0eca73cdb11c6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155776
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/ca_ES.xml 
b/i18npool/source/localedata/data/ca_ES.xml
index 881d38b3ca5e..ea817eb4c056 100644
--- a/i18npool/source/localedata/data/ca_ES.xml
+++ b/i18npool/source/localedata/data/ca_ES.xml
@@ -227,7 +227,13 @@
 
   
   
-  
+  
+A-Z
+0
+1
+ i seg.
+ i seg.
+  
   
 
   

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/locale.dtd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit f3811e06b27afcbac7f63c2d184db4b1f8b01a1f
Author: Eike Rathke 
AuthorDate: Wed Nov 1 21:53:52 2023 +0100
Commit: Eike Rathke 
CommitDate: Thu Nov 2 02:03:38 2023 +0100

Update pointers to yet again moved ICU site / CLDR pages

Change-Id: Icf33b45a013393ac114e5a8866921bc8ce368189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158778
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index 616351e19f8f..81a8bdfbb35d 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -521,7 +521,7 @@
Optional ICU tailoring.
 
See Collation Customization in ICU User Guide for syntax,
-   http://www.icu-project.org/userguide/Collate_Customization.html
+   https://unicode-org.github.io/icu/userguide/collation/customization/
 
There are two ways to add language specific tailoring in LibreOffice.
For small tailoring, you can directly add it in locale data here. For
@@ -560,9 +560,9 @@
 
 The initial data was setup according to the ICU collation chart at
 http://oss.software.ibm.com/icu/charts/collation/
-Note: ICU site was moved to http://www.icu-project.org/ and as ICU per
+Note: ICU site was moved to https://icu.unicode.org/ and as ICU per
 default uses CLDR, collation charts are available at
-http://unicode.org/cldr/comparison_charts.html#Collation
+https://www.unicode.org/cldr/charts/latest/
 
 Possible notations in the syntax of the IndexKey element are:
 

[Libreoffice-commits] core.git: i18npool/source

[Ankit_Jaipuriar (via logerrit)]

 i18npool/source/breakiterator/breakiterator_unicode.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit a97ceaf14e294373b864c61c930f8723e13747c7
Author: Ankit_Jaipuriar 
AuthorDate: Sun Sep 24 11:49:28 2023 +0530
Commit: Mike Kaganski 
CommitDate: Fri Oct 13 20:00:19 2023 +0200

tdf#42982 Improved UNO API error reporting

Change-Id: I62862c8dd83b587e56177afd2ec05af1f567f6ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157201
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index 7e19e863bc70..4927a82293fc 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -146,7 +146,8 @@ void BreakIterator_Unicode::loadICUBreakIterator(const 
css::lang::Locale& rLocal
 
 status = U_ZERO_ERROR;
 udata_setAppData("OpenOffice", OpenOffice_dat, );
-if ( !U_SUCCESS(status) ) throw uno::RuntimeException();
+if ( !U_SUCCESS(status) )
+throw uno::RuntimeException("udata_setAppData returned 
error " + OUString::createFromAscii(u_errorName(status)));
 
 std::shared_ptr rbi;
 
@@ -273,14 +274,14 @@ void BreakIterator_Unicode::loadICUBreakIterator(const 
css::lang::Locale& rLocal
 break;
 }
 if ( !U_SUCCESS(status) || !pBI ) {
-throw uno::RuntimeException();
+throw uno::RuntimeException("Failed to create ICU 
BreakIterator: error " + OUString::createFromAscii(u_errorName(status)));
 }
 icuBI->mpValue = std::make_shared();
 icuBI->mpValue->mpBreakIterator = pBI;
 theBIMap.insert( std::make_pair( aBIMapLocaleTypeKey, 
icuBI->mpValue));
 } while (false);
 if (!icuBI->mpValue || !icuBI->mpValue->mpBreakIterator) {
-throw uno::RuntimeException();
+throw uno::RuntimeException("ICU BreakIterator is not properly 
initialized");
 }
 icuBI->maBIMapKey = aBIMapGlobalKey;
 if (!bInMap)
@@ -297,12 +298,12 @@ void BreakIterator_Unicode::loadICUBreakIterator(const 
css::lang::Locale& rLocal
 icuBI->mpValue->mpUt = utext_openUChars(icuBI->mpValue->mpUt, pText, 
rText.getLength(), );
 
 if (!U_SUCCESS(status))
-throw uno::RuntimeException();
+throw uno::RuntimeException("utext_openUChars returned error " + 
OUString::createFromAscii(u_errorName(status)));
 
 icuBI->mpValue->mpBreakIterator->setText(icuBI->mpValue->mpUt, status);
 
 if (!U_SUCCESS(status))
-throw uno::RuntimeException();
+throw uno::RuntimeException("Failed to set text for ICU BreakIterator: 
error " + OUString::createFromAscii(u_errorName(status)));
 
 icuBI->mpValue->maICUText = rText;
 }

[Libreoffice-commits] core.git: i18npool/source

[Yli875 (via logerrit)]

 i18npool/source/search/levdis.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit abbdb9cf2a40132f67cd6e0f2e9ad686ff36798b
Author: Yli875 
AuthorDate: Tue Aug 29 02:25:08 2023 -0700
Commit: Julien Nabet 
CommitDate: Wed Aug 30 07:11:36 2023 +0200

tdf#143148 Use pragma once instead of include guards

Change-Id: I84408aa0d48dd7804b70d012c85035e0572fa4e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156256
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/search/levdis.hxx 
b/i18npool/source/search/levdis.hxx
index c58fba842ef0..b378c03cff4e 100644
--- a/i18npool/source/search/levdis.hxx
+++ b/i18npool/source/search/levdis.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
-#define INCLUDED_I18NPOOL_SOURCE_SEARCH_LEVDIS_HXX
+#pragma once
 
 #include 
 #include 
@@ -209,6 +208,4 @@ public:
 };
 
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/eo.xml |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 2a9e83a673300dfe15a3acc66acd560b2a7cae43
Author: Eike Rathke 
AuthorDate: Mon Jul 31 20:13:02 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 1 01:48:04 2023 +0200

Correct Esperanto {eo} group separator formats wrong since initial 2005 
commit

Instead of # ##0,00 and similar it used # #0,00 that probably went
unnoticed since ever because it generates an expected display
string using the group separator at the right position; editing
such format yielded the format code ##0,00 with the group
separator flag set.

Change-Id: Id6ebb533f43a49a9aea1dd9ba87230e5d59901ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/155114
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/eo.xml 
b/i18npool/source/localedata/data/eo.xml
index 6cef3274b54d..ba718f92f4a1 100644
--- a/i18npool/source/localedata/data/eo.xml
+++ b/i18npool/source/localedata/data/eo.xml
@@ -157,31 +157,31 @@
   0,00
 
 
-  # #0
+  # ##0
 
 
-  # #0,00
+  # ##0,00
 
 
-  # ##,00
+  # ###,00
 
 
-  # #0 [CURRENCY];-# #0 [CURRENCY]
+  # ##0 [CURRENCY];-# ##0 [CURRENCY]
 
 
-  # #0,00 [CURRENCY];-# #0,00 [CURRENCY]
+  # ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]
 
 
-  # #0 [CURRENCY];[RED]-# #0 [CURRENCY]
+  # ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]
 
 
-  # #0,00 [CURRENCY];[RED]-# #0,00 [CURRENCY]
+  # ##0,00 [CURRENCY];[RED]-# ##0,00 [CURRENCY]
 
 
-  # #0,00 CCC
+  # ##0,00 CCC
 
 
-  # #0,-- [CURRENCY];[RED]-# #0,-- [CURRENCY]
+  # ##0,-- [CURRENCY];[RED]-# ##0,-- [CURRENCY]
 
 
   0%

[Libreoffice-commits] core.git: i18npool/source

[Khaled Hosny (via logerrit)]

 i18npool/source/breakiterator/breakiteratorImpl.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit f348425e0b9187f56370d9b76594872f935b4d8e
Author: Khaled Hosny 
AuthorDate: Thu Jul 6 11:10:45 2023 +0300
Commit: خالد حسني 
CommitDate: Thu Jul 6 14:25:56 2023 +0200

tdf#52577: Classify superscript numbers in Latin-1 block as ScriptType::WEAK

So that they inherit the script from the surrounding text like the rest
if superscripts and subscripts.

Change-Id: Ib5c19f84b080eca0f24009a4e6dd2dd4019441d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154094
Tested-by: Jenkins
Reviewed-by: خالد حسني 

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx 
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 2b56d2726303..444fce619e0c 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -526,6 +526,9 @@ bool getCompatibilityScriptClassByBlock(sal_uInt32 
currentChar, sal_Int16 
 // Few Spacing Modifier Letters that can be Bopomofo tonal marks.
 else if ( 0x2CA == currentChar || 0x2CB == currentChar || 0x2C7 == 
currentChar || 0x2D9 == currentChar )
 rScriptType = ScriptType::WEAK;
+// tdf#52577 superscript numbers should be we weak.
+else if ( 0xB2 == currentChar || 0xB3 == currentChar || 0xB9 == 
currentChar )
+rScriptType = ScriptType::WEAK;
 // workaround for Coptic
 else if ( 0x2C80 <= currentChar && 0x2CE3 >= currentChar)
 rScriptType = ScriptType::LATIN;

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit db591df99424dd7e1837946b36ca0658a02d520c
Author: Julien Nabet 
AuthorDate: Thu Jun 29 08:34:51 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu Jun 29 10:27:08 2023 +0200

tdf#152723: NatNum12 modifier, keep decimal separator from local settings

Change-Id: If49e7b42ac37eead4ef0a902b2e56735bb4017bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153732
Reviewed-by: Julien Nabet 
Tested-by: Jenkins

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 756866ad846e..62a7e75278bf 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -586,15 +586,11 @@ OUString getNumberText(const Locale& rLocale, const 
OUString& rNumberString,
 for (i = 0; i < len; i++)
 {
 sal_Unicode ch = src[i];
-if (isNumber(ch))
+if (isNumber(ch) || ch == aSeparators.DecimalSeparator)
 {
 ++count;
 sBuf.append(ch);
 }
-else if (ch == aSeparators.DecimalSeparator)
-// Convert any decimal separator to point - in case libnumbertext 
has a different one
-// for this locale (it seems that point is supported for all 
locales in libnumbertext)
-sBuf.append('.');
 else if (ch == aSeparators.ThousandSeparator && count > 0)
 continue;
 else if (isMinus(ch) && count == 0)

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/filewriter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b0bdc7c11cdc98aa02b6bef11868d06f623d5d01
Author: Julien Nabet 
AuthorDate: Sun Jun 18 18:08:19 2023 +0200
Commit: Julien Nabet 
CommitDate: Sun Jun 18 19:00:45 2023 +0200

Regression from speed up startup 
time(e51b4fc8c278bfa0b0671bbdb0ab35346881ebb7)

for getOutlineNumberingLevels

TB Jenkins_Linux_Ubsan
26316 [_RUN_] SwDialogsTest::openAnyDialog
26317 NEXT/i18npool/source/localedata/localedata.cxx:1330:33: runtime 
error: call to function getOutlineNumberingLevels_de_DE through pointer to 
incorrect function type ´const rtl::OUString ***(*)(short &, short &, short &)´
26318 
/workdir/CustomTarget/i18npool/localedata/localedata_de_DE.cxx:1475: note: 
getOutlineNumberingLevels_de_DE defined here
26319 #0 0x7f5f948b75d8 in 
i18npool::LocaleDataImpl::getOutlineNumberingLevels(com::sun::star::lang::Locale
 const&) /i18npool/source/localedata/localedata.cxx:1330:33
26320 #1 0x7f5f948263ba in 
i18npool::DefaultNumberingProvider::getDefaultOutlineNumberings(com::sun::star::lang::Locale
 const&) 
/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx:345:36
26321 #2 0x7f5f948264ee in non-virtual thunk to 
i18npool::DefaultNumberingProvider::getDefaultOutlineNumberings(com::sun::star::lang::Locale
 const&) /i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
26322 #3 0x7f5fc2d8e917 in svx::sidebar::OutlineTypeMgr::Init() 
/svx/source/sidebar/nbdtmg.cxx:585:35

Change-Id: Ic291f9badad2047980bff848e83bc56b8beaa723
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153235
Reviewed-by: Noel Grandin 
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/filewriter.cxx 
b/i18npool/source/localedata/filewriter.cxx
index 30a759573278..d9167ed1e950 100644
--- a/i18npool/source/localedata/filewriter.cxx
+++ b/i18npool/source/localedata/filewriter.cxx
@@ -127,8 +127,8 @@ void OFileWriter::writeOUStringRefFunction3(const char 
*func, std::u16string_vie
 {
 OString aRefLocale( OUStringToOString(useLocale, 
RTL_TEXTENCODING_ASCII_US) );
 const char* locale = aRefLocale.getStr();
-fprintf(m_f, "extern const OUString   SAL_CALL %s%s(sal_Int16& 
nStyles, sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
-fprintf(m_f, "const OUString   SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n", func, theLocale.c_str());
+fprintf(m_f, "extern const OUString ***  SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes);\n", func, locale);
+fprintf(m_f, "const OUString ***  SAL_CALL %s%s(sal_Int16& nStyles, 
sal_Int16& nLevels, sal_Int16& nAttributes)\n{\n", func, theLocale.c_str());
 fprintf(m_f, "\treturn %s%s(nStyles, nLevels, nAttributes);\n}\n", func, 
locale);
 }
 

[Libreoffice-commits] core.git: i18npool/source

[Andrea Gelmini (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ea00bc0aaa6543b3353d307c8ee399d56cc712dc
Author: Andrea Gelmini 
AuthorDate: Fri Jun 16 17:25:10 2023 +0200
Commit: Julien Nabet 
CommitDate: Fri Jun 16 18:41:48 2023 +0200

Fix typo

Change-Id: I914d0d62b1807daddea042ced173195d115f31e8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153186
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 1a6cc7796611..7bc4da873138 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -1459,7 +1459,7 @@ void LCIndexNode::generateCode (const OFileWriter ) 
const
 of.writeInt(nbOfPageWords);
 of.writeAsciiString(";\n\n");
 
-// MSVC doesnt like zero sized arrays
+// MSVC doesn't like zero sized arrays
 if (nbOfPageWords == 0)
 {
 // generate dummy array, reuse unicodeScript0 for dummy entry

[Libreoffice-commits] core.git: i18npool/source sw/qa sw/source

[Michael Stahl (via logerrit)]

 i18npool/source/characterclassification/cclass_unicode_parser.cxx |   10 +-
 sw/qa/extras/uiwriter/data/tdf125154.odt  |binary
 sw/qa/extras/uiwriter/uiwriter.cxx|   47 
++
 sw/source/core/bastyp/calc.cxx|2 
 4 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit 29f5742bc8ff36741baac5b71082b3daee70ac18
Author: Michael Stahl 
AuthorDate: Tue Jun 13 17:15:07 2023 +0200
Commit: Michael Stahl 
CommitDate: Fri Jun 16 16:22:22 2023 +0200

tdf#125154 i18npool,sw: fix group separators in numbers in formulas

Commit 776f7e7463de3e97f3056712ee567f49a314829d changed cclass_Unicode
to reject group separators in numbers by default, but users are
complaining that the neat "5.000" numbers in their existing documents
are now considered invalid.

* in SwCalc, use GROUP_SEPARATOR_IN_NUMBER
* in cclass_Unicode::parseText(), reject a group separator if it is not
  followed by at least 3 digits

With this, a number from tdf#42518 "0.19" is still considered invalid,
while "5.000" is now valid again.

Change-Id: If86f2ed4c27be16f866d7f4cee00789344e9ee2e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153047
Tested-by: Michael Stahl 
Reviewed-by: Michael Stahl 

diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx 
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index aed29ea1ce5b..9ed95e2f907a 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -827,8 +827,16 @@ void cclass_Unicode::parseText( ParseResult& r, const 
OUString& rText, sal_Int32
 {
 if (current == cGroupSep)
 {
-if (getFlags(nextChar, eState) & 
ParserFlags::VALUE_DIGIT)
+// accept only if it is followed by 3 digits
+sal_Int32 tempIndex(index);
+sal_uInt32 const nextChar2((tempIndex < 
rText.getLength()) ? rText.iterateCodePoints() : 0);
+sal_uInt32 const nextChar3((tempIndex < 
rText.getLength()) ? rText.iterateCodePoints() : 0);
+if (getFlags(nextChar, eState) & 
ParserFlags::VALUE_DIGIT
+&& getFlags(nextChar2, eState) & 
ParserFlags::VALUE_DIGIT
+&& getFlags(nextChar3, eState) & 
ParserFlags::VALUE_DIGIT)
+{
 nParseTokensType |= 
KParseTokens::GROUP_SEPARATOR_IN_NUMBER;
+}
 else
 {
 // Trailing group separator character is not a
diff --git a/sw/qa/extras/uiwriter/data/tdf125154.odt 
b/sw/qa/extras/uiwriter/data/tdf125154.odt
new file mode 100644
index ..81dee2be72cf
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf125154.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 4a84aeef9f44..58ebbcde09ff 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -375,6 +375,53 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testBookmarkCopy)
 }
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest, testFormulaNumberWithGroupSeparator)
+{
+createSwDoc("tdf125154.odt");
+dispatchCommand(mxComponent, ".uno:UpdateAll", {});
+SwDoc* pDoc = getSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->SttEndDoc(true);
+SwField const* pField;
+
+pField = pWrtShell->GetCurField();
+CPPUNIT_ASSERT_EQUAL(OUString("1000"), pField->GetFormula());
+CPPUNIT_ASSERT_EQUAL(OUString("1.000"), pField->ExpandField(true, 
nullptr));
+pWrtShell->GoNextCell();
+CPPUNIT_ASSERT_EQUAL(OUString("1"), 
pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
+pWrtShell->GoNextCell();
+pField = pWrtShell->GetCurField();
+CPPUNIT_ASSERT_EQUAL(OUString("test"), pField->GetFormula());
+CPPUNIT_ASSERT_EQUAL(OUString("1.000"), pField->ExpandField(true, 
nullptr));
+pWrtShell->GoNextCell();
+// the problem was that this was 0
+CPPUNIT_ASSERT_EQUAL(OUString("1"), 
pWrtShell->GetCursor()->GetPoint()->nNode.GetNode().GetTextNode()->GetText());
+pWrtShell->Down(false);
+pWrtShell->SttPara(false);
+pField = pWrtShell->GetCurField();
+CPPUNIT_ASSERT_EQUAL(OUString("1000*10%"), pField->GetFormula());
+CPPUNIT_ASSERT_EQUAL(OUString("100"), pField->ExpandField(true, nullptr));
+pWrtShell->Down(false);
+pField = pWrtShell->GetCurField();
+CPPUNIT_ASSERT_EQUAL(OUString("5.000*10%"), pField->GetFormula());
+// the problem was that this was 0
+CPPUNIT_ASSERT_EQUAL(OUString("500"), pField->ExpandField(true, 

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |   56 ---
 i18npool/source/localedata/LocaleNode.hxx |   15 
 i18npool/source/localedata/filewriter.cxx |  106 --
 3 files changed, 177 deletions(-)

New commits:
commit 42e156fd19659bead5eebd78c7bd6fd3d38901ad
Author: Noel Grandin 
AuthorDate: Thu Jun 15 12:52:53 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Jun 16 16:05:10 2023 +0200

remove dead code

Change-Id: Ia8523e992b30ba8674ca88374906cb3c671df5e4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153126
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 7531afa5aff2..1a6cc7796611 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -141,44 +141,6 @@ void LocaleNode::generateCode (const OFileWriter ) const
 }
 
 
-OUString LocaleNode::writeParameterCheckLen( const OFileWriter ,
-const char* pParameterName, const LocaleNode* pNode,
-sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
-{
-OUString aVal;
-if (pNode)
-aVal = pNode->getValue();
-else if (nMinLen >= 0)  // -1: optional => empty, 0: must be present, empty
-{
-++nError;
-fprintf( stderr, "Error: node NULL pointer for parameter %s.\n",
-pParameterName);
-}
-// write empty data if error
-of.writeParameter( pParameterName, aVal);
-sal_Int32 nLen = aVal.getLength();
-if (nLen < nMinLen)
-{
-++nError;
-fprintf( stderr, "Error: less than %" SAL_PRIdINT32 " character%s (%" 
SAL_PRIdINT32 ") in %s '%s'.\n",
-nMinLen, (nMinLen > 1 ? "s" : ""),
-nLen,
-(pNode ? OSTR( pNode->getName()) : ""),
-OSTR( aVal));
-}
-else if (nLen > nMaxLen && nMaxLen >= 0)
-{
-++nError;
-fprintf( stderr,
-"Error: more than %" SAL_PRIdINT32 " character%s (%" 
SAL_PRIdINT32 ") in %s '%s' not supported by application.\n",
-nMaxLen, (nMaxLen > 1 ? "s" : ""),
-nLen,
-(pNode ? OSTR( pNode->getName()) : ""),
-OSTR( aVal));
-}
-return aVal;
-}
-
 OUString LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter 
,
 const char* pParameterName, const LocaleNode* pNode,
 sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
@@ -217,24 +179,6 @@ OUString 
LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter 
 return aVal;
 }
 
-OUString LocaleNode::writeParameterCheckLen( const OFileWriter ,
-const char* pNodeName, const char* pParameterName,
-sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
-{
-OUString aVal;
-const LocaleNode * pNode = findNode( pNodeName);
-if (pNode || nMinLen < 0)
-aVal = writeParameterCheckLen( of, pParameterName, pNode, nMinLen, 
nMaxLen);
-else
-{
-++nError;
-fprintf( stderr, "Error: node %s not found.\n", pNodeName);
-// write empty data if error
-of.writeParameter( pParameterName, aVal);
-}
-return aVal;
-}
-
 OUString LocaleNode::writeOUStringLiteralParameterCheckLen( const OFileWriter 
,
 const char* pNodeName, const char* pParameterName,
 sal_Int32 nMinLen, sal_Int32 nMaxLen ) const
diff --git a/i18npool/source/localedata/LocaleNode.hxx 
b/i18npool/source/localedata/LocaleNode.hxx
index cedd3711fa78..e5d45f4cef42 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -43,33 +43,20 @@ public:
 void  writeHexInt(sal_Int16 nb) const;
 void  writeOUStringRefFunction(const char *func, std::u16string_view 
useLocale) const;
 void  writeOUStringRefFunction(const char *func, std::u16string_view 
useLocale, const char *to) const;
-void  writeFunction(const char *func, const char *count, const char 
*array) const;
 void  writeOUStringFunction(const char *func, const char *count, const 
char *array) const;
-void  writeRefFunction(const char *func, std::u16string_view useLocale) 
const;
-void  writeFunction(const char *func, const char *count, const char 
*array, const char *from, const char *to) const;
 void  writeOUStringFunction(const char *func, const char *count, const 
char *array, const char *from, const char *to) const;
-void  writeRefFunction(const char *func, std::u16string_view useLocale, 
const char *to) const;
-void  writeFunction2(const char *func, const char *style, const char* 
attr, const char *array) const;
 void  writeOUStringFunction2(const char *func, const char *style, const 
char* attr, const char *array) const;
-void  writeRefFunction2(const char *func, std::u16string_view useLocale) 
const;
 void  writeOUStringRefFunction2(const char *func, std::u16string_view 
useLocale) const;
-void  

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |   15 +++
 i18npool/source/localedata/LocaleNode.hxx |2 ++
 i18npool/source/localedata/filewriter.cxx |   18 ++
 i18npool/source/localedata/localedata.cxx |   10 +-
 4 files changed, 32 insertions(+), 13 deletions(-)

New commits:
commit e51b4fc8c278bfa0b0671bbdb0ab35346881ebb7
Author: Noel Grandin 
AuthorDate: Thu Jun 15 12:47:41 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Jun 16 12:41:43 2023 +0200

speed up startup time

by avoid conversion of static locale data from sal_Unicode to OUString
data - we can declare the data as OUStringConstExpr arrays and then
no conversion is necessary.

Change-Id: Idd27071c1200d6ced2c4f43e10310df786fbc8fe
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153125
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 7b7dbd56c446..7531afa5aff2 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -2294,7 +2294,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 OUString useLocale =   getAttr().getValueByName("ref");
 if (!useLocale.isEmpty()) {
 useLocale = useLocale.replace( '-', '_');
-of.writeRefFunction3("getOutlineNumberingLevels_", useLocale);
+of.writeOUStringRefFunction3("getOutlineNumberingLevels_", useLocale);
 return;
 }
 
@@ -2331,7 +2331,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 {
 const char* name = attr[k];
 OUString   value = q.getValueByName( name );
-of.writeParameter("outline", name, value,
+of.writeOUStringLiteralParameter("outline", name, value,
 sal::static_int_cast(i),
 sal::static_int_cast(j) );
 }
@@ -2372,7 +2372,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 {
 for( sal_Int32 j=0; j(i) );
 of.writeAsciiString("Level");
@@ -2387,7 +2387,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 of.writeInt( sal::static_int_cast(j) );
 of.writeAsciiString(", ");
 }
-of.writeAsciiString("NULL };\n");
+of.writeAsciiString(" };\n");
 }
 }
 
@@ -2396,8 +2396,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 
 for( sal_Int32 i=0; i(i) );
 of.writeAsciiString("[] = { ");
 
@@ -2413,7 +2412,7 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 }
 of.writeAsciiString("\n");
 
-of.writeAsciiString("static const sal_Unicode*** 
LCOutlineNumberingLevelsArray[] = {\n" );
+of.writeAsciiString("static constexpr rtl::OUStringConstExpr const * const 
* LCOutlineNumberingLevelsArray[] = {\n" );
 for( sal_Int32 i=0; i > aRet( nStyles );
 auto aRetRange = asNonConstRange(aRet);
-sal_Unicode const  pStyle = p0;
+OUString const *** pStyle = p0;
 for( i=0;  i level(new 
OutlineNumberingLevel_Impl[ nLevels+1 ]);
-sal_Unicode const *** pLevel = pStyle[i];
+OUString const ** pLevel = pStyle[i];
 for( j = 0;  j < nLevels;  j++ )
 {
-sal_Unicode const ** pAttribute = pLevel[j];
+OUString const * pAttribute = pLevel[j];
 for( int k=0; k

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |   12 ++--
 i18npool/source/localedata/LocaleNode.hxx |3 +++
 i18npool/source/localedata/filewriter.cxx |   24 
 i18npool/source/localedata/localedata.cxx |   20 +---
 4 files changed, 42 insertions(+), 17 deletions(-)

New commits:
commit b8b5e1e4149c409f42b02c09a7e4ff720af9873e
Author: Noel Grandin 
AuthorDate: Thu Jun 15 10:52:32 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Jun 16 08:32:21 2023 +0200

speed up startup time

by avoid conversion of static locale data from sal_Unicode to OUString
data - we can declare the data as OUStringConstExpr arrays and then
no conversion is necessary.

Change-Id: I652f02f6f1f354e2dab4f0ca866e8499cd3c50f5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153124
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index d89a7515c8da..7b7dbd56c446 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -2223,7 +2223,7 @@ void LCNumberingLevelNode::generateCode (const 
OFileWriter ) const
 OUString useLocale =   getAttr().getValueByName("ref");
 if (!useLocale.isEmpty()) {
 useLocale = useLocale.replace( '-', '_');
-of.writeRefFunction2("getContinuousNumberingLevels_", useLocale);
+of.writeOUStringRefFunction2("getContinuousNumberingLevels_", 
useLocale);
 return;
 }
 
@@ -2243,7 +2243,7 @@ void LCNumberingLevelNode::generateCode (const 
OFileWriter ) const
 {
 const char* name = attr[j];
 OUString   value = q.getValueByName( name );
-of.writeParameter("continuous", name, value, 
sal::static_int_cast(i) );
+of.writeOUStringLiteralParameter("continuous", name, value, 
sal::static_int_cast(i) );
 }
 }
 
@@ -2258,7 +2258,7 @@ void LCNumberingLevelNode::generateCode (const 
OFileWriter ) const
 // generate code. (intermediate arrays)
 for( i=0; i(i) );
 of.writeAsciiString("[] = {\n");
 for( sal_Int32 j=0; j(i));
 of.writeAsciiString(",\n");
 }
-of.writeAsciiString("\t0\n};\n\n");
+of.writeAsciiString("\t\n};\n\n");
 }
 
 // generate code. (top-level array)
 of.writeAsciiString("\n");
-of.writeAsciiString("static const sal_Unicode** 
LCContinuousNumberingLevelsArray[] = {\n" );
+of.writeAsciiString("static const rtl::OUStringConstExpr* 
LCContinuousNumberingLevelsArray[] = {\n" );
 for( i=0; i > pv( nStyles );
@@ -1228,20 +1228,18 @@ LocaleDataImpl::getContinuousNumberingLevels( const 
lang::Locale& rLocale )
 i = Sequence( nAttributes );
 }
 
-sal_Unicode const *** pStyle = p0;
+OUString const ** pStyle = p0;
 for( int i=0;  i

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |   16 
 i18npool/source/localedata/localedata.cxx |   15 +++
 2 files changed, 15 insertions(+), 16 deletions(-)

New commits:
commit 183e1f9eef4840689e81bbf4d7734df2c7e63c5d
Author: Noel Grandin 
AuthorDate: Thu Jun 15 10:31:59 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 15 21:02:59 2023 +0200

speed up startup time

by avoid conversion of static locale data from sal_Unicode to OUString
data - we can declare the data as OUStringConstExpr arrays and then
no conversion is necessary.

Change-Id: Ief35b1e3e08ed44c1b9161485a69ef504e1a1c89
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153123
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index d797c45c53b6..d89a7515c8da 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -296,8 +296,8 @@ void LCInfoNode::generateCode (const OFileWriter ) const
 aLanguage = languageNode->getChildAt(0)->getValue();
 if (aLanguage.getLength() != 2 && aLanguage.getLength() != 3)
 incErrorStr( "Error: langID '%s' not 2-3 characters\n", aLanguage);
-of.writeParameter("langID", aLanguage);
-of.writeParameter("langDefaultName", 
languageNode->getChildAt(1)->getValue());
+of.writeOUStringLiteralParameter("langID", aLanguage);
+of.writeOUStringLiteralParameter("langDefaultName", 
languageNode->getChildAt(1)->getValue());
 }
 else
 incError( "No Language node.");
@@ -306,8 +306,8 @@ void LCInfoNode::generateCode (const OFileWriter ) const
 OUString aCountry( countryNode->getChildAt(0)->getValue());
 if (!(aCountry.isEmpty() || aCountry.getLength() == 2))
 incErrorStr( "Error: countryID '%s' not empty or more than 2 
characters\n", aCountry);
-of.writeParameter("countryID", aCountry);
-of.writeParameter("countryDefaultName", 
countryNode->getChildAt(1)->getValue());
+of.writeOUStringLiteralParameter("countryID", aCountry);
+of.writeOUStringLiteralParameter("countryDefaultName", 
countryNode->getChildAt(1)->getValue());
 }
 else
 incError( "No Country node.");
@@ -319,18 +319,18 @@ void LCInfoNode::generateCode (const OFileWriter ) 
const
 incErrorStr( "Error: invalid Variant '%s'\n", aVariant);
 if (!(aVariant.isEmpty() || aLanguage == "qlt"))
 incErrorStrStr( "Error: Variant '%s' given but Language '%s' is 
not 'qlt'\n", aVariant, aLanguage);
-of.writeParameter("Variant", aVariant);
+of.writeOUStringLiteralParameter("Variant", aVariant);
 }
 else
-of.writeParameter("Variant", std::u16string_view());
-of.writeAsciiString("\nstatic const sal_Unicode* LCInfoArray[] = {\n");
+of.writeOUStringLiteralParameter("Variant", std::u16string_view());
+of.writeAsciiString("\nstatic constexpr rtl::OUStringConstExpr 
LCInfoArray[] = {\n");
 of.writeAsciiString("\tlangID,\n");
 of.writeAsciiString("\tlangDefaultName,\n");
 of.writeAsciiString("\tcountryID,\n");
 of.writeAsciiString("\tcountryDefaultName,\n");
 of.writeAsciiString("\tVariant\n");
 of.writeAsciiString("};\n\n");
-of.writeFunction("getLCInfo_", "SAL_N_ELEMENTS(LCInfoArray)", 
"LCInfoArray");
+of.writeOUStringFunction("getLCInfo_", "SAL_N_ELEMENTS(LCInfoArray)", 
"LCInfoArray");
 }
 
 
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 7316b66fce7f..89ee3d5a281d 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star::uno;
 using namespace com::sun::star::lang;
 using namespace com::sun::star;
 
-typedef sal_Unicode**   (* MyFunc_Type)( sal_Int16&);
 typedef OUString const * (* MyFuncOUString_Type)( sal_Int16&);
 typedef sal_Unicode const *** (* MyFunc_Type2)( sal_Int16&, sal_Int16& );
 typedef sal_Unicode const  (* MyFunc_Type3)( sal_Int16&, sal_Int16&, 
sal_Int16& );
@@ -1123,16 +1122,16 @@ LocaleDataImpl::getTransliterations( const Locale& 
rLocale )
 LanguageCountryInfo SAL_CALL
 LocaleDataImpl::getLanguageCountryInfo( const Locale& rLocale )
 {
-MyFunc_Type func = reinterpret_cast(getFunctionSymbol( 
rLocale, "getLCInfo" ));
+MyFuncOUString_Type func = 
reinterpret_cast(getFunctionSymbol( rLocale, "getLCInfo" 
));
 
 if ( func ) {
 sal_Int16 LCInfoCount = 0;
-sal_Unicode **LCInfoArray = func(LCInfoCount);
-LanguageCountryInfo info{OUString(LCInfoArray[0]),
-OUString(LCInfoArray[1]),
-OUString(LCInfoArray[2]),
-OUString(LCInfoArray[3]),
-OUString(LCInfoArray[4])};
+OUString const *LCInfoArray = func(LCInfoCount);
+

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed2ca47393d06786bc055c3c6fa7f84c0f952f14
Author: Noel Grandin 
AuthorDate: Wed Jun 14 11:17:29 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Wed Jun 14 14:02:12 2023 +0200

fix ubscan build

after
commit ee76ed70e97448082f4c00c5c4207a44e1a91617
Author: Noel Grandin 
Date:   Tue Jun 13 21:39:31 2023 +0200
speed up startup time

Change-Id: I577e29f17f417e7ae5ef0b8eaa5f90aed48c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153041
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 08bf772321ad..b17203b3a59b 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -967,7 +967,7 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 of.writeOUStringFunction("getAllFormats0_", 
"FormatElementsCount0", "FormatElementsArray0", "replaceFrom0", "replaceTo0");
 break;
 case 1:
-of.writeFunction("getAllFormats1_", "FormatElementsCount1", 
"FormatElementsArray1", "replaceFrom1", "replaceTo1");
+of.writeOUStringFunction("getAllFormats1_", 
"FormatElementsCount1", "FormatElementsArray1", "replaceFrom1", "replaceTo1");
 break;
 }
 

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |   24 ++---
 i18npool/source/localedata/LocaleNode.hxx |7 +++
 i18npool/source/localedata/filewriter.cxx |   54 ++
 i18npool/source/localedata/localedata.cxx |   19 +-
 i18npool/source/localedata/saxparser.cxx  |1 
 5 files changed, 83 insertions(+), 22 deletions(-)

New commits:
commit 3af9bd139458b534ae72e3e010c8725b826fd12c
Author: Noel Grandin 
AuthorDate: Tue Jun 13 21:10:01 2023 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 14 08:46:51 2023 +0200

speed up startup time

by avoid conversion of static locale data from sal_Unicode to OUString
data - we can declare the data as OUStringConstExpr arrays and then
no conversion is necessary.

Change-Id: I405806aef050e374b18a57cbf47e13a295821ccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/153004
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 14232338b9f1..0d24bc22e89a 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -562,11 +562,11 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 switch (mnSection)
 {
 case 0:
-of.writeRefFunction("getAllFormats0_", useLocale, 
"replaceTo0");
+of.writeOUStringRefFunction("getAllFormats0_", useLocale, 
"replaceTo0");
 of.writeRefFunction("getDateAcceptancePatterns_", useLocale);
 break;
 case 1:
-of.writeRefFunction("getAllFormats1_", useLocale, 
"replaceTo1");
+of.writeOUStringRefFunction("getAllFormats1_", useLocale, 
"replaceTo1");
 break;
 }
 ++mnSection;
@@ -610,17 +610,17 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 str = currNodeAttr.getValueByName("msgid");
 if (!aMsgIdSet.insert( str).second)
 incErrorStr( "Error: Duplicated msgid=\"%s\" in FormatElement.\n", 
str);
-of.writeParameter("FormatKey", str, formatCount);
+of.writeOUStringLiteralParameter("FormatKey", str, formatCount);
 
 str = currNodeAttr.getValueByName("default");
 bool bDefault = str == "true";
-of.writeDefaultParameter("FormatElement", str, formatCount);
+of.writeOUStringLiteralDefaultParameter("FormatElement", str, 
formatCount);
 
 aType = currNodeAttr.getValueByName("type");
-of.writeParameter("FormatType", aType, formatCount);
+of.writeOUStringLiteralParameter("FormatType", aType, formatCount);
 
 aUsage = currNodeAttr.getValueByName("usage");
-of.writeParameter("FormatUsage", aUsage, formatCount);
+of.writeOUStringLiteralParameter("FormatUsage", aUsage, formatCount);
 
 aFormatIndex = currNodeAttr.getValueByName("formatindex");
 sal_Int16 formatindex = static_cast(aFormatIndex.toInt32());
@@ -636,7 +636,7 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 incErrorInt( "Error: Duplicated formatindex=\"%d\" in 
FormatElement.\n", formatindex);
 bShowNextFreeFormatIndex = true;
 }
-of.writeIntParameter("Formatindex", formatCount, formatindex);
+of.writeOUStringLiteralIntParameter("Formatindex", formatCount, 
formatindex);
 
 // Ensure only one default per usage and type.
 if (bDefault)
@@ -652,7 +652,7 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 const LocaleNode * n = currNode -> findNode("FormatCode");
 if (n)
 {
-of.writeParameter("FormatCode", n->getValue(), formatCount);
+of.writeOUStringLiteralParameter("FormatCode", n->getValue(), 
formatCount);
 // Check separator usage for some FormatCode elements.
 const LocaleNode* pCtype = nullptr;
 switch (formatindex)
@@ -821,9 +821,9 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 incError( "No FormatCode in FormatElement.");
 n = currNode -> findNode("DefaultName");
 if (n)
-of.writeParameter("FormatDefaultName", n->getValue(), formatCount);
+of.writeOUStringLiteralParameter("FormatDefaultName", 
n->getValue(), formatCount);
 else
-of.writeParameter("FormatDefaultName", std::u16string_view(), 
formatCount);
+of.writeOUStringLiteralParameter("FormatDefaultName", 
std::u16string_view(), formatCount);
 
 }
 
@@ -918,7 +918,7 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 of.writeAsciiString(" = ");
 of.writeInt( formatCount - mnFormats);
 of.writeAsciiString(";\n");
-of.writeAsciiString("static const sal_Unicode* ");
+of.writeAsciiString("static constexpr rtl::OUStringConstExpr ");
 of.writeAsciiString("FormatElementsArray");
 

[Libreoffice-commits] core.git: i18npool/source i18nutil/source include/i18nutil offapi/com

[Khaled Hosny (via logerrit)]

 i18npool/source/characterclassification/unoscripttypedetector.cxx |   14 +-
 i18nutil/source/utility/scripttypedetector.cxx|   49 
--
 include/i18nutil/scripttypedetector.hxx   |3 
 offapi/com/sun/star/i18n/CTLScriptType.idl|1 
 offapi/com/sun/star/i18n/XScriptTypeDetector.idl  |3 
 5 files changed, 10 insertions(+), 60 deletions(-)

New commits:
commit d7ddac208516ce2350c84c434aad933b345c9509
Author: Khaled Hosny 
AuthorDate: Mon May 29 11:27:40 2023 +0300
Commit: خالد حسني 
CommitDate: Mon May 29 16:23:07 2023 +0200

Remove recently unused CTLScriptType code

This is now unused after:

commit 98f7ec383db74a6491e925e30125d3fbf270afc2
Author: Khaled Hosny 
Date:   Sun May 28 16:28:52 2023 +0300

tdf#139863, tdf#155514: Don’t split COMPLEX text portions

The code is also broken as it doesn’t handle surrogate pairs.

The UNO API now throws an exception.

Change-Id: I454ed741e3834e762a2731d671c21a3e73515da3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152359
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Reviewed-by: خالد حسني 

diff --git a/i18npool/source/characterclassification/unoscripttypedetector.cxx 
b/i18npool/source/characterclassification/unoscripttypedetector.cxx
index afcd2708ce90..1d48ed864724 100644
--- a/i18npool/source/characterclassification/unoscripttypedetector.cxx
+++ b/i18npool/source/characterclassification/unoscripttypedetector.cxx
@@ -43,23 +43,21 @@ UnoScriptTypeDetector::endOfScriptDirection( const 
OUString& Text, sal_Int32 nPo
 }
 
 sal_Int16 SAL_CALL
-UnoScriptTypeDetector::getCTLScriptType( const OUString& Text, sal_Int32 nPos )
+UnoScriptTypeDetector::getCTLScriptType( const OUString&, sal_Int32 )
 {
-return ScriptTypeDetector::getCTLScriptType(Text, nPos);
+throw css::uno::RuntimeException("not implemented");
 }
 
-// Begin of Script Type is inclusive.
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::beginOfCTLScriptType( const OUString& Text, sal_Int32 
nPos )
+UnoScriptTypeDetector::beginOfCTLScriptType( const OUString&, sal_Int32 )
 {
-return ScriptTypeDetector::beginOfCTLScriptType(Text, nPos);
+throw css::uno::RuntimeException("not implemented");
 }
 
-// End of the Script Type is exclusive, the return value pointing to the begin 
of next script type
 sal_Int32 SAL_CALL
-UnoScriptTypeDetector::endOfCTLScriptType( const OUString& Text, sal_Int32 
nPos )
+UnoScriptTypeDetector::endOfCTLScriptType( const OUString&, sal_Int32 )
 {
-return ScriptTypeDetector::endOfCTLScriptType(Text, nPos);
+throw css::uno::RuntimeException("not implemented");
 }
 
 OUString SAL_CALL
diff --git a/i18nutil/source/utility/scripttypedetector.cxx 
b/i18nutil/source/utility/scripttypedetector.cxx
index f096ecbde831..5bc3f9bb2aa1 100644
--- a/i18nutil/source/utility/scripttypedetector.cxx
+++ b/i18nutil/source/utility/scripttypedetector.cxx
@@ -17,7 +17,6 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include 
 #include 
 #include 
 #include 
@@ -82,52 +81,4 @@ sal_Int32 ScriptTypeDetector::endOfScriptDirection( 
std::u16string_view Text, sa
 return cPos == nPos ? -1 : cPos;
 }
 
-sal_Int16 ScriptTypeDetector::getCTLScriptType( std::u16string_view Text, 
sal_Int32 nPos )
-{
-static const ScriptTypeList typeList[] = {
-{ UnicodeScript_kHebrew,  UnicodeScript_kHebrew,  
CTLScriptType::CTL_HEBREW },// 10
-{ UnicodeScript_kArabic,  UnicodeScript_kArabic,  
CTLScriptType::CTL_ARABIC },// 11
-{ UnicodeScript_kDevanagari,  UnicodeScript_kDevanagari,  
CTLScriptType::CTL_INDIC }, // 14
-{ UnicodeScript_kThai,UnicodeScript_kThai,
CTLScriptType::CTL_THAI },  // 24
-{ UnicodeScript_kScriptCount, UnicodeScript_kScriptCount, 
CTLScriptType::CTL_UNKNOWN }// 88
-};
-
-return unicode::getUnicodeScriptType(Text[nPos], typeList);
-}
-
-// Begin of Script Type is inclusive.
-sal_Int32 ScriptTypeDetector::beginOfCTLScriptType( std::u16string_view Text, 
sal_Int32 nPos )
-{
-if (nPos < 0)
-return 0;
-else if (o3tl::make_unsigned(nPos) >= Text.size())
-return Text.size();
-else {
-sal_Int16 cType = getCTLScriptType(Text, nPos);
-for (nPos--; nPos >= 0; nPos--) {
-if (cType != getCTLScriptType(Text, nPos))
-break;
-}
-return nPos + 1;
-}
-}
-
-// End of the Script Type is exclusive, the return value pointing to the begin 
of next script type
-sal_Int32 ScriptTypeDetector::endOfCTLScriptType( std::u16string_view Text, 
sal_Int32 nPos )
-{
-if (nPos < 0)
-return 0;
-else if (o3tl::make_unsigned(nPos) >= Text.size())
-return Text.size();
-else {
-sal_Int16 cType = getCTLScriptType(Text, nPos);
-sal_Int32 len = Text.size();
-

[Libreoffice-commits] core.git: i18npool/source include/svx sw/qa

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml|   40 +--
 include/svx/strings.hrc  |   16 ---
 sw/qa/uitest/writer_tests2/formatBulletsNumbering.py |2 
 3 files changed, 31 insertions(+), 27 deletions(-)

New commits:
commit 293959d42c0eb19a5e953c6d2610b2c7b1908412
Author: Justin Luth 
AuthorDate: Sat Apr 22 07:13:27 2023 -0400
Commit: Andras Timar 
CommitDate: Tue Apr 25 20:44:59 2023 +0200

tdf#56258 i18npool en-US: re-arrange outline numbering suggestions

This patch brings order out of chaos,
organizing the outline choices into
academic, modern, simple numeric, and misc columns.

The very first suggestion should be the academic standard.
Next comes a distinctly different modern alternative
Simple numeric moves over to be above the other numeric,
followed by a demo of the kind of mixture that can be designed in LO.

Since the academic standard uses Roman numerals,
it is offset on the next row by the other one containing Roman numerals
followed by a modern classic,
and the all-numeric ISO standard retains it current position.
The bullet oddball logically remains as the last suggestion.

In this patch there was no change made to the actual suggestions
themselves. Earlier patches made changes to 3 definitions,
which allowed for the nice correlations.

I missed changing the descriptive "strings" in the earlier patches.
I had assumed earlier that these monotonous descriptions
were dynamically produced...

Since the English description should not be translated,
I added a comment that will be extracted to the PO as a comment.
(Thanks Andras).

I think it would be nice to use strings
"Academic MLA/CMOS/Turabian/OWL compliant outline"
"ISO 2145 outine"
but that could be made in a separate patch.

Let me just point out what happened with the strings
in case this helps with translation
NOTE: only languages that ultimately inherit from en_US need to 
re-translate:

old RID_SVXSTR_OUTLINENUM_DESCRIPTION_0
  -no string change
  -moved to _3
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_1
  -string changed / list modified earlier
  -moved to _5
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_2
  -string changed / list modified earlier
  -moved to _1
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_3
  -no string change
  -moved to _2
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_4
  -string changed / list modified earlier
  -moved to _0
old RID_SVXSTR_OUTLINENUM_DESCRIPTION_5
  -no string change
  -moved to _4
RID_SVXSTR_OUTLINENUM_DESCRIPTION_6
  -no change
RID_SVXSTR_OUTLINENUM_DESCRIPTION_7
  -no change

Suggested translation order:
-cut _3 and paste into _2
-cut _0 and paste into _3
-cut _4 and paste into _0 and fix definition
-cut _5 and paste into _4
-cut _1 and paste into _5 and re-define
-re-define _1

Change-Id: Ie4ec8423acddc24efefb270d9ed19ab77566e6e1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150805
Tested-by: Jenkins
Reviewed-by: Andras Timar 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index b6e0924c8e97..fed41b84d33b 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -568,20 +568,12 @@
 
   
   
-
-  
-  
-  
-  
-  
-  
-
- 
-  
-  
-  
-  
-  
+ 
+  
+  
+  
+  
+  
   
 
  
@@ -600,12 +592,12 @@
   
   
 
- 
-  
-  
-  
-  
-  
+
+  
+  
+  
+  
+  
   
 
  
@@ -616,6 +608,14 @@
   
   
 
+ 
+  
+  
+  
+  
+  
+  
+
  
   
   
diff --git a/include/svx/strings.hrc b/include/svx/strings.hrc
index 7799a69bca11..e0573c485d99 100644
--- a/include/svx/strings.hrc
+++ b/include/svx/strings.hrc
@@ -1377,6 +1377,8 @@
 #define RID_SVXSTR_BULLET_DESCRIPTION_5 
NC_("RID_SVXSTR_BULLET_DESCRIPTION_5", "Right pointing arrow bullets")
 #define RID_SVXSTR_BULLET_DESCRIPTION_6 
NC_("RID_SVXSTR_BULLET_DESCRIPTION_6", "Cross mark bullets")
 #define RID_SVXSTR_BULLET_DESCRIPTION_7 
NC_("RID_SVXSTR_BULLET_DESCRIPTION_7", "Check mark bullets")
+
+// do not translate this; instead describe the nth numbering style 
(LC_NumberingLevel) defined by your locale
 #define RID_SVXSTR_SINGLENUM_DESCRIPTION_0  
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_0", "Number 1) 2) 3)")
 #define RID_SVXSTR_SINGLENUM_DESCRIPTION_1  
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_1", "Number 1. 2. 3.")
 #define RID_SVXSTR_SINGLENUM_DESCRIPTION_2  
NC_("RID_SVXSTR_SINGLENUM_DESCRIPTION_2", "Number 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/bo_IN.xml |  212 +++---
 1 file changed, 106 insertions(+), 106 deletions(-)

New commits:
commit 5265892378ded9336e24199fe8260dde6be99156
Author: Eike Rathke 
AuthorDate: Tue Apr 25 01:13:38 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Apr 25 12:53:10 2023 +0200

Group sort bo_IN.xml LC_FORMAT FormatElement for better comparability

Change-Id: I6e17c01ce4d3a351a2cb49d214f73468d425b4a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150952
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/bo_IN.xml 
b/i18npool/source/localedata/data/bo_IN.xml
index 8d9133ae988d..bb364c53468b 100644
--- a/i18npool/source/localedata/data/bo_IN.xml
+++ b/i18npool/source/localedata/data/bo_IN.xml
@@ -53,55 +53,119 @@
   
   
 M-D
-
-  [NatNum1]YY-MM-DD
+
+  General
 
-
-  [NatNum1]NN YY-MMM DD
+
+  [NatNum1]0
 
-
-  [NatNum1]YY-MM
+
+  [NatNum1]0.00
 
-
-  [NatNum1]MMM-DD
+
+  [NatNum1]#,##0
 
-
-  
+
+  [NatNum1]#,##0.00
 
-
-  [NatNum1]QQ YY
+
+  [NatNum1]#,###.00
 
-
-  [NatNum1]-MM-DD
+
+  0
 
-
+
+  0.00
+
+
+  #,##0
+
+
+  #,##0.00
+
+
+  #,###.00
+
+
+  0.00E+000
+
+
+  0.00E+00
+
+
+  [NatNum1]0.00E+00
+
+
+  ##0.00E+00
+
+
+  
+  [NatNum1]0%
+
+
+  [NatNum1]0.00%
+
+
+  0%
+
+
+  0.00%
+
+
+  [CURRENCY]#,##0;-[CURRENCY]#,##0
+
+
+  [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
+
+
+  [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
+
+
+  [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
+
+
+  #,##0.00 CCC
+
+
+  [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
+
+
   [NatNum1]YY-MM-DD
 
 
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
+
+  [NatNum1]YY-MM-DD
+
+
+  [NatNum1]-MM-DD
+
 
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
 
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
+  [NatNum1]NN YY-MMM DD
+
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
 
@@ -114,117 +178,53 @@
   -MM-DD
   ISO 8601
 
+
+  [NatNum1]YY-MM
+
+
+  [NatNum1]MMM-DD
+
+
+  
+
+
+  [NatNum1]QQ YY
+
 
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD
 
 
 
-
+
   HH:MM
 
-
+
   HH:MM:SS
 
-
+
   [NatNum1]HH:MM AM/PM
 
-
+
   [NatNum1]HH:MM:SS AM/PM
 
-
+
   [HH]:MM:SS
 
-
+
   [NatNum1]HH:MM:SS.00
 
-
+
   [HH]:MM:SS.00
 
-
+
   [NatNum1]"སྤྱི་ལོ" YY "ཟླ་" M "ཚེས་" DD HH:MM 
AM/PM
 
 
   [NatNum1]DD-MM- HH:MM:SS
 
-
+
   [NatNum1]"སྤྱི་ལོ"  "ཟླ་" M "ཚེས་" DD HH:MM 
AM/PM
 
-
-  General
-
-
-  [NatNum1]0
-
-
-  [NatNum1]0.00
-
-
-  [NatNum1]#,##0
-
-
-  [NatNum1]#,##0.00
-
-
-  [NatNum1]#,###.00
-
-
-  0
-
-
-  0.00
-
-
-  #,##0
-
-
-  #,##0.00
-
-
-  #,###.00
-
-
-  [CURRENCY]#,##0;-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
-
-
-  [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
-
-
-  #,##0.00 CCC
-
-
-  [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
-
-
-  
-  [NatNum1]0%
-
-
-  [NatNum1]0.00%
-
-
-  0%
-
-
-  0.00%
-
-
-  0.00E+000
-
-
-  0.00E+00
-
-
-  [NatNum1]0.00E+00
-
-
-  ##0.00E+00
-
   
   
 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/ml_IN.xml |  192 +-
 1 file changed, 7 insertions(+), 185 deletions(-)

New commits:
commit 805343aa483f864f9fb55ea5a1086667eee8
Author: Eike Rathke 
AuthorDate: Tue Apr 25 01:40:09 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Apr 25 12:00:47 2023 +0200

Inherit ml_IN formats and numberings from hi_IN

Change-Id: Ied5f3f8e051d8d9292888d8831ae3e6a88270198
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150953
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/ml_IN.xml 
b/i18npool/source/localedata/data/ml_IN.xml
index 1fb10fef3559..e07dde467088 100644
--- a/i18npool/source/localedata/data/ml_IN.xml
+++ b/i18npool/source/localedata/data/ml_IN.xml
@@ -28,179 +28,10 @@
   India
 
   
-  
-
-  -
-  ,
-  .
-  :
-  .
-  ;
-   
-   
-   
-   
-
-
-  '
-  '
-  "
-  "
-
-AM
-PM
-metric
-  
-  
-D-M
-
-  Standard
-
-
-  0
-
-
-  0.00
-
-
-  #,##0
-
-
-  #,##0.00
-
-
-  #,###.00
-
-
-  0.00E+000
-
-
- 0.00E+00
-
-
-  ##0.00E+00
-
-
-  0%
-
-
-  0.00%
-
-
-  [CURRENCY]#,##0;-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
-
-
-  [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
-
-
-  #,##0.00 CCC
-
-
-  [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
-
-
-  D-M-YY
-
-
-  DD  GGGE
-
-
-  DD-MM-YY
-
-
-  DD-MM-
-
-
-  MMM D, YY
-
-
-  MMM, D 
-
-
-  D. MMM. 
-
-
-   D, 
-
-
-  D.  
-
-
-  NN, MMM D, YY
-
-
-  NN DD-MMM YY
-
-
-  NN,  D, 
-
-
-   D, 
-
-
-  MM-DD
-
-
-  YY-MM-DD
-
-
-  -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
-
-
-  MM-DD-YY HH:MM
-
-
-  MM-DD- HH:MM:SS
-
-
-  MM-DD- HH:MM
-
-  
-  
-  
+  
+  
+  
+  
   
 ംഃഅആഇഈഉഊഋഌഎഏഐഒഓഔകഖഗഘങചഛജഝഞടഠഡഢണതഥദധനപഫബഭമയരറലളഴവശഷസഹാിീുൂൃെേൈൊോൌ്ൗ
 14
@@ -342,7 +173,7 @@
   2
 
   
-  
+  
   
 
   അതെ
@@ -359,15 +190,6 @@
   Q4
 
   
-  
-
-
-
-
-
-
-
-
-  
-  
+  
+  
 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hi_IN.xml |  166 +++---
 1 file changed, 83 insertions(+), 83 deletions(-)

New commits:
commit a08e73d7ff477a4a0e3bce2a9e56a969d204203d
Author: Eike Rathke 
AuthorDate: Tue Apr 25 00:54:26 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Apr 25 12:00:28 2023 +0200

Group sort hi_IN.xml LC_FORMAT FormatElement for better comparability

... and eliminate doubled space.

Change-Id: I84229145072283975ff17e2db661784205fa9af9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150950
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hi_IN.xml 
b/i18npool/source/localedata/data/hi_IN.xml
index b5607a94171b..33d27757dd3d 100644
--- a/i18npool/source/localedata/data/hi_IN.xml
+++ b/i18npool/source/localedata/data/hi_IN.xml
@@ -53,57 +53,96 @@
   
   
 D-M
-
-  D-M-YY
+
+  Standard
 
-
-  NN DD-MMM YY
+
+  0
 
-
-  MM-YY
+
+  0.00
 
-
-  MMM DD
+
+  #,##0
 
-
-  
+
+  #,##0.00
 
-
-  QQ YY
+
+  #,###.00
 
-
-  DD-MM-
+
+  0.00E+000
 
-
-  DD-MM-YY
+
+ 0.00E+00
+
+
+  ##0.00E+00
+
+
+  0%
+
+
+  0.00%
+
+
+  [CURRENCY]#,##0;-[CURRENCY]#,##0
+
+
+  [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
+
+
+  [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
+
+
+  [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
+
+
+  #,##0.00 CCC
+
+
+  [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
+
+
+  D-M-YY
 
 
   DD  GGGE
 
+
+  DD-MM-YY
+
+
+  DD-MM-
+
 
   MMM D, YY
 
 
   MMM, D 
 
+
+  D. MMM. 
+
 
    D, 
 
+
+  D.  
+
 
   NN, MMM D, YY
 
+
+  NN DD-MMM YY
+
 
   NN,  D, 
 
 
    D, 
 
-
-  D. MMM. 
-
-
-  D.  
-
 
   MM-DD
 
@@ -114,90 +153,51 @@
   -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
 
-
+
   MM-DD-YY HH:MM
 
-
+
   MM-DD- HH:MM:SS
 
-
+
   MM-DD- HH:MM
 
-
-  Standard
-
-
-  0
-
-
-  0.00
-
-
-  #,##0
-
-
-  #,##0.00
-
-
-  #,###.00
-
-
-  [CURRENCY]#,##0;-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;-[CURRENCY]#,##0.00
-
-
-  [CURRENCY]#,##0;[RED]-[CURRENCY]#,##0
-
-
-  [CURRENCY]#,##0.00;[RED]-[CURRENCY]#,##0.00
-
-
-  #,##0.00 CCC
-
-
-  [CURRENCY]#,##0.--;[RED]-[CURRENCY]#,##0.--
-
-
-  0%
-
-
-  0.00%
-
-
-  0.00E+000
-
-
- 0.00E+00
-
-
-  ##0.00E+00
-
   
   
   

[Libreoffice-commits] core.git: i18npool/source

[Stephan Bergmann (via logerrit)]

 i18npool/source/calendar/calendar_gregorian.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4ad6228e0d1f153fda94104258709aa6a8ca570e
Author: Stephan Bergmann 
AuthorDate: Thu Apr 20 14:57:36 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Apr 21 09:12:47 2023 +0200

Fix some getImplementationName

...to match the corresponding .component entry

Change-Id: I56ac64be65740450df92f03aac4d2f4f447f08a2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150694
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index e586470a0c31..0dbe964e5ba0 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -219,7 +219,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, 
sal_Int16 idx, sal_Int16
 
 Calendar_hanja_yoil::Calendar_hanja_yoil()
 {
-cCalendar = "com.sun.star.i18n.Calendar_Calendar_hanja_yoil";
+cCalendar = "com.sun.star.i18n.Calendar_hanja_yoil";
 }
 
 OUString SAL_CALL

[Libreoffice-commits] core.git: i18npool/source

[Stephan Bergmann (via logerrit)]

 i18npool/source/transliteration/transliteration_body.cxx   |   10 
+-
 i18npool/source/transliteration/transliteration_caseignore.cxx |2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 6413e3060be3646279a50342df64eafa626552e7
Author: Stephan Bergmann 
AuthorDate: Thu Apr 20 14:58:26 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Thu Apr 20 16:47:02 2023 +0200

Fix some getImplementationName

...to match the corresponding .component entries

Change-Id: Ic5286d4969635bee5e606dcf186fbc7b297263c3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150695
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 8bf5d6bdd4b1..36c5ccc72f46 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -205,14 +205,14 @@ Transliteration_u2l::Transliteration_u2l()
 {
 nMappingType = MappingType::UpperToLower;
 transliterationName = "upper_to_lower(generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_u2l";
+implementationName = 
"com.sun.star.i18n.Transliteration.UPPERCASE_LOWERCASE";
 }
 
 Transliteration_l2u::Transliteration_l2u()
 {
 nMappingType = MappingType::LowerToUpper;
 transliterationName = "lower_to_upper(generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_l2u";
+implementationName = 
"com.sun.star.i18n.Transliteration.LOWERCASE_UPPERCASE";
 }
 
 Transliteration_togglecase::Transliteration_togglecase()
@@ -223,14 +223,14 @@ Transliteration_togglecase::Transliteration_togglecase()
 // a per character basis.
 nMappingType = MappingType::LowerToUpper | MappingType::UpperToLower;
 transliterationName = "toggle(generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_togglecase";
+implementationName = "com.sun.star.i18n.Transliteration.TOGGLE_CASE";
 }
 
 Transliteration_titlecase::Transliteration_titlecase()
 {
 nMappingType = MappingType::ToTitle;
 transliterationName = "title(generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_titlecase";
+implementationName = "com.sun.star.i18n.Transliteration.TITLE_CASE";
 }
 
 /// @throws RuntimeException
@@ -289,7 +289,7 @@ Transliteration_sentencecase::Transliteration_sentencecase()
 {
 nMappingType = MappingType::ToTitle;  // though only to be applied to the 
first word...
 transliterationName = "sentence(generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_sentencecase";
+implementationName = "com.sun.star.i18n.Transliteration.SENTENCE_CASE";
 }
 
 // this function expects to be called on a sentence-by-sentence basis,
diff --git a/i18npool/source/transliteration/transliteration_caseignore.cxx 
b/i18npool/source/transliteration/transliteration_caseignore.cxx
index dcd7b3b94be7..b5c8c24d10c8 100644
--- a/i18npool/source/transliteration/transliteration_caseignore.cxx
+++ b/i18npool/source/transliteration/transliteration_caseignore.cxx
@@ -38,7 +38,7 @@ Transliteration_caseignore::Transliteration_caseignore()
 nMappingType = MappingType::FullFolding;
 moduleLoaded = TransliterationFlags::NONE;
 transliterationName = "case ignore (generic)";
-implementationName = 
"com.sun.star.i18n.Transliteration.Transliteration_caseignore";
+implementationName = "com.sun.star.i18n.Transliteration.IGNORE_CASE";
 }
 
 void SAL_CALL

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/locale.dtd |   14 ++
 1 file changed, 10 insertions(+), 4 deletions(-)

New commits:
commit ea5f1533cb0ad95a03a0770e3e99fec356ee93e6
Author: Eike Rathke 
AuthorDate: Sun Apr 16 12:54:47 2023 +0200
Commit: Eike Rathke 
CommitDate: Sun Apr 16 15:50:11 2023 +0200

Document locale data ReservedWords

Change-Id: Ie7085e437f6c80a7d13c9d01a7259f97ab05649c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150454
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index a867215421bc..616351e19f8f 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -634,18 +634,24 @@
 
 
 
+
 
 
+
 
 
 
 
-
-
 
-
+ Like section "above" and section "below". -->
+
+
+
+
 
 
 

[Libreoffice-commits] core.git: i18npool/source include/editeng offapi/com svx/inc sw/source writerfilter/source

[Julien Nabet (via logerrit)]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   45 
++
 include/editeng/svxenum.hxx   |6 +
 offapi/com/sun/star/style/NumberingType.idl   |   29 
++
 svx/inc/numberingtype.hrc |4 
 sw/source/filter/ww8/docxattributeoutput.cxx  |4 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +
 6 files changed, 92 insertions(+), 2 deletions(-)

New commits:
commit 62b5dd31ffdad49f36aef2b7f6f1c54bcbf320ec
Author: Julien Nabet 
AuthorDate: Thu Mar 30 15:15:01 2023 +0200
Commit: Julien Nabet 
CommitDate: Wed Apr 5 13:57:03 2023 +0200

tdf#148906: Ukrainian letters miss in bullets and numbering dialog

Change-Id: Ieef2b2a7052da342709baf298b618d2c29fa3e43
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149768
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 29be9856a02d..1caca1b3d054 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -200,6 +200,24 @@ const sal_Unicode table_CyrillicLowerLetter_sr[] = {
 0x0444, 0x0445, 0x0446, 0x0447, 0x045F, 0x0448
 };
 
+// Ukrainian Cyrillic upper letters
+const sal_Unicode table_CyrillicUpperLetter_uk[] = {
+0x0410, 0x0411, 0x0412, 0x0413, 0x0490, 0x0414, 0x0415, 0x0404,
+0x0416, 0x0417, 0x0418, 0x0406, 0x0407, 0x0419, 0x041A, 0x041B,
+0x041C, 0x041D, 0x041E, 0x041F, 0x0420, 0x0421, 0x0422, 0x0423,
+0x0424, 0x0425, 0x0426, 0x0427, 0x0428, 0x0429, 0x042C, 0x042E,
+0x042F
+};
+
+// Ukrainian cyrillic lower letters
+const sal_Unicode table_CyrillicLowerLetter_uk[] = {
+0x0430, 0x0431, 0x0432, 0x0433, 0x0491, 0x0434, 0x0435, 0x0454,
+0x0436, 0x0437, 0x0438, 0x0456, 0x0457, 0x0439, 0x043A, 0x043B,
+0x043C, 0x043D, 0x043E, 0x043F, 0x0440, 0x0441, 0x0442, 0x0443,
+0x0444, 0x0445, 0x0446, 0x0447, 0x0448, 0x0449, 0x044C, 0x044E,
+0x044F
+};
+
 const sal_Unicode table_GreekUpperLetter[] = {
 0x0391, 0x0392, 0x0393, 0x0394, 0x0395, 0x03DB, 0x0396, 0x0397, 0x0398,
 0x0399, 0x039A, 0x039B, 0x039C, 0x039D, 0x039E, 0x039F, 0x03A0, 0x03DF,
@@ -958,6 +976,29 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequencea, 2=>b, ..., 27=>z, 28=>aa, 29=>bb, ...
   break;
 
+ case CHARS_CYRILLIC_UPPER_LETTER_UK:
+  lcl_formatChars2( table_CyrillicUpperLetter_uk,
+  table_CyrillicLowerLetter_uk,
+  SAL_N_ELEMENTS(table_CyrillicLowerLetter_uk), number-1,
+  result);
+  break;
+ case CHARS_CYRILLIC_LOWER_LETTER_UK:
+  lcl_formatChars( table_CyrillicLowerLetter_uk,
+  SAL_N_ELEMENTS(table_CyrillicLowerLetter_uk), number-1,
+  result);
+  break;
+ case CHARS_CYRILLIC_UPPER_LETTER_N_UK:
+  lcl_formatChars3( table_CyrillicUpperLetter_uk,
+  table_CyrillicLowerLetter_uk,
+  SAL_N_ELEMENTS(table_CyrillicLowerLetter_uk), number-1,
+  result);
+  break;
+ case CHARS_CYRILLIC_LOWER_LETTER_N_UK:
+  lcl_formatChars1( table_CyrillicLowerLetter_uk,
+  SAL_N_ELEMENTS(table_CyrillicLowerLetter_uk), number-1,
+  result);
+  break;
+
   case CHARS_GREEK_LOWER_LETTER:
   lcl_formatCharsGR( table_GreekLowerLetter, number, result);
   break;
@@ -1100,6 +1141,10 @@ const Supported_NumberingType aSupportedTypes[] =
 {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR,   S_CYR_A ", " 
S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (sr)", LANG_ALL},
 {style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR, C_CYR_A ", " 
C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
 {style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR, S_CYR_A ", " 
S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (sr)", LANG_ALL},
+{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_UK,   C_CYR_A ", " 
C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_A S_CYR_B ", ... (uk)", LANG_ALL},
+{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_UK,   S_CYR_A ", " 
S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_A S_CYR_B ", ... (uk)", LANG_ALL},
+{style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_UK, C_CYR_A ", " 
C_CYR_B ", .., " C_CYR_A S_CYR_A ", " C_CYR_B S_CYR_B ", ... (uk)", LANG_ALL},
+{style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_UK, S_CYR_A ", " 
S_CYR_B ", .., " S_CYR_A S_CYR_A ", " S_CYR_B S_CYR_B ", ... (uk)", 

[Libreoffice-commits] core.git: i18npool/source i18nutil/source idl/source include/comphelper jvmfwk/plugins slideshow/source unodevtools/source writerfilter/source xmlsecurity/source

[Noel Grandin (via logerrit)]

 i18npool/source/characterclassification/cclass_unicode_parser.cxx |   10 
+++--
 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |3 -
 i18nutil/source/utility/unicode.cxx   |3 -
 idl/source/prj/database.cxx   |   13 
+++---
 include/comphelper/traceevent.hxx |9 
+---
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx   |6 
+--
 slideshow/source/engine/rehearsetimingsactivity.cxx   |6 
+--
 unodevtools/source/skeletonmaker/cppcompskeleton.cxx  |   20 
--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |3 -
 writerfilter/source/rtftok/rtfsprm.cxx|4 --
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |3 -
 11 files changed, 32 insertions(+), 48 deletions(-)

New commits:
commit db7f33af1438538bb51b376242294ecd3bfcb055
Author: Noel Grandin 
AuthorDate: Thu Mar 30 16:10:11 2023 +0200
Commit: Noel Grandin 
CommitDate: Thu Mar 30 20:03:41 2023 +

loplugin:stringadd in various

when applying my upcoming patch to also consider O[U]StringBuffer

Change-Id: I8cf6a47ad357ddc73e2c430d966be72d5efd1485
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149767
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/characterclassification/cclass_unicode_parser.cxx 
b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
index 313e42a0f2fe..aed29ea1ce5b 100644
--- a/i18npool/source/characterclassification/cclass_unicode_parser.cxx
+++ b/i18npool/source/characterclassification/cclass_unicode_parser.cxx
@@ -906,8 +906,9 @@ void cclass_Unicode::parseText( ParseResult& r, const 
OUString& rText, sal_Int32
 {
 if ( cLast == '\\' )
 {   // escaped
-aSymbol.append(rText.subView(postSymbolIndex, 
nextCharIndex - postSymbolIndex - 2));
-aSymbol.append(OUString(, 1));
+aSymbol.append(
+
OUString::Concat(rText.subView(postSymbolIndex, nextCharIndex - postSymbolIndex 
- 2))
++ OUString(, 1));
 }
 else
 {
@@ -931,8 +932,9 @@ void cclass_Unicode::parseText( ParseResult& r, const 
OUString& rText, sal_Int32
 {
 if ( cLast == '\\' )
 {   // escaped
-aSymbol.append(rText.subView(postSymbolIndex, 
nextCharIndex - postSymbolIndex - 2));
-aSymbol.append(OUString(, 1));
+aSymbol.append(
+rText.subView(postSymbolIndex, nextCharIndex - 
postSymbolIndex - 2)
++ OUString(, 1));
 }
 else if (current == nextChar &&
 !(nContTypes & 
KParseTokens::TWO_DOUBLE_QUOTES_BREAK_STRING) )
diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 8ab363672f9e..29be9856a02d 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1129,8 +1129,7 @@ OUString 
DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
 aPropertiesRange[1].Name = "Value";
 for (sal_Int32 j = 1; j <= 3; j++) {
 aPropertiesRange[1].Value <<= j;
-result.append( makeNumberingString( aProperties, aLocale ) );
-result.append(", ");
+result.append( makeNumberingString( aProperties, aLocale ) + ", " 
);
 }
 result.append("...");
 // Make known duplicate generated identifiers unique.
diff --git a/i18nutil/source/utility/unicode.cxx 
b/i18nutil/source/utility/unicode.cxx
index 730b5105d52c..35bfb25f728f 100644
--- a/i18nutil/source/utility/unicode.cxx
+++ b/i18nutil/source/utility/unicode.cxx
@@ -1127,8 +1127,7 @@ OUString ToggleUnicodeCodepoint::ReplacementString()
 //pad with zeros - minimum length of 4.
 for( sal_Int32 i = 4 - aTmp.getLength(); i > 0; --i )
 aTmp.insert( 0,"0" );
-output.append( "U+" );
-output.append( aTmp );
+output.append( "U+" + aTmp );
 }
 }
 return output.makeStringAndClear();
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 9aba715edaf4..229696b021ec 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -417,8 +417,7 @@ void SvIdlDataBase::WriteError( SvTokenStream & rInStm )
 // error text
 if( 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/uk_UA.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 002f941ec20e594e9702c39fab9cf9f4cc392dab
Author: Eike Rathke 
AuthorDate: Tue Mar 28 22:24:22 2023 +0200
Commit: Eike Rathke 
CommitDate: Tue Mar 28 23:11:32 2023 +

Resolves: tdf#154433 Correct {uk-UA} quotation mark characters

Change-Id: Id5c251ee632d2da134ffbbb352844152f12c1f77
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149654
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/uk_UA.xml 
b/i18npool/source/localedata/data/uk_UA.xml
index f3642004dd8e..5912691c9501 100644
--- a/i18npool/source/localedata/data/uk_UA.xml
+++ b/i18npool/source/localedata/data/uk_UA.xml
@@ -42,10 +42,10 @@
р.
 
 
-  ‘
-  ’
-  “
-  ”
+  „
+  “
+  «
+  »
 
 AM
 PM

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/dsb_DE.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b8547e65e5807dce6bf66839548a4b8c20729515
Author: Eike Rathke 
AuthorDate: Fri Mar 17 14:24:28 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Mar 17 22:09:25 2023 +

Related: tdf#153842 {dsb-DE} remove confusing comment

The format is needed, even if not used / offered as default.

Change-Id: Ifd4e5114a1d763a9a7ef69046949dfb7cf96ef84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149055
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/dsb_DE.xml 
b/i18npool/source/localedata/data/dsb_DE.xml
index 84f8e0c25eae..83fb021505ed 100644
--- a/i18npool/source/localedata/data/dsb_DE.xml
+++ b/i18npool/source/localedata/data/dsb_DE.xml
@@ -178,7 +178,7 @@
   H:MM AM/PM
 
 
-  H:MM:SS AM/PM
+  H:MM:SS AM/PM
 
 
   [H]:MM:SS

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hsb_DE.xml |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 993e13768116dd3a1ac61b83520b3f6cdbb55e54
Author: Eike Rathke 
AuthorDate: Fri Mar 17 14:17:20 2023 +0100
Commit: Eike Rathke 
CommitDate: Fri Mar 17 15:44:53 2023 +

Related: tdf#153842 {hsb-DE} does not use AM/PM

Switch defaults and remove from 47 date+time edit format code.

Change-Id: I4832c26490adcc369a2d88e524fded724d01e996
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149054
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hsb_DE.xml 
b/i18npool/source/localedata/data/hsb_DE.xml
index 851c27bd9ff9..a82107a7a7f1 100644
--- a/i18npool/source/localedata/data/hsb_DE.xml
+++ b/i18npool/source/localedata/data/hsb_DE.xml
@@ -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

[Libreoffice-commits] core.git: i18npool/source

[Abdallah Elhdad (via logerrit)]

 i18npool/source/localedata/LocaleNode.hxx |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 83cd42f8e3f88e5161c5164c3494a01b2ff9f08c
Author: Abdallah Elhdad 
AuthorDate: Thu Mar 2 13:43:15 2023 +0200
Commit: Ilmari Lauhakangas 
CommitDate: Thu Mar 2 15:24:38 2023 +

tdf#143148 Use pragma once instead of include guards

Change-Id: Iddda2d30dce37fd90ce8c1834666f2baf8bd7fb3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148116
Tested-by: Ilmari Lauhakangas 
Reviewed-by: Ilmari Lauhakangas 

diff --git a/i18npool/source/localedata/LocaleNode.hxx 
b/i18npool/source/localedata/LocaleNode.hxx
index c8911aadef2d..e8c163c7e988 100644
--- a/i18npool/source/localedata/LocaleNode.hxx
+++ b/i18npool/source/localedata/LocaleNode.hxx
@@ -16,8 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
-#define INCLUDED_I18NPOOL_SOURCE_LOCALEDATA_LOCALENODE_HXX
+#pragma once
 
 #include 
 #include 
@@ -221,6 +220,4 @@ public:
 virtual void generateCode (const OFileWriter ) const override;
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/dsb_DE.xml |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 86942a85b32efeb0b7fee25f00991e69f4446ddc
Author: Eike Rathke 
AuthorDate: Wed Mar 1 00:18:32 2023 +0100
Commit: Eike Rathke 
CommitDate: Wed Mar 1 01:15:20 2023 +

Related: tdf#153842 {dsb-DE} group separator is '.' dot instead of NBSP

See also
https://icu4c-demos.unicode.org/icu-bin/locexp?d_=en&_=dsb_DE

Change-Id: I1f6797829812893aaab711ab670a722673a86a42
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148025
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/dsb_DE.xml 
b/i18npool/source/localedata/data/dsb_DE.xml
index bd96a17d8ab5..84f8e0c25eae 100644
--- a/i18npool/source/localedata/data/dsb_DE.xml
+++ b/i18npool/source/localedata/data/dsb_DE.xml
@@ -31,7 +31,7 @@
   
 
   .
-  
+  .
   ,
   :
   ,
@@ -63,13 +63,13 @@
   0,00
 
 
-  # ##0
+  #.##0
 
 
-  # ##0,00
+  #.##0,00
 
 
-  # ###,00
+  #.###,00
 
 
   0,00E+000
@@ -87,22 +87,22 @@
   0,00" "%
 
 
-  # ##0 [CURRENCY];-# ##0 [CURRENCY]
+  #.##0 [CURRENCY];-#.##0 [CURRENCY]
 
 
-  # ##0,00 [CURRENCY];-# ##0,00 [CURRENCY]
+  #.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]
 
 
-  # ##0 [CURRENCY];[RED]-# ##0 [CURRENCY]
+  #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]
 
 
-  # ##0,00 [CURRENCY];[RED]-# ##0,00 
[CURRENCY]
+  #.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]
 
 
-  CCC# ##0,00
+  #.##0,00 CCC
 
 
-  # ##0,-- [CURRENCY];[RED]-# ##0,-- 
[CURRENCY]
+  #.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]
 
 
   D.MM.YY

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hsb_DE.xml |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 1309e6332d7ff2bd1f9b6bf87385b8b570e59158
Author: Eike Rathke 
AuthorDate: Tue Feb 28 22:04:59 2023 +0100
Commit: Eike Rathke 
CommitDate: Tue Feb 28 23:25:52 2023 +

Resolves: tdf#153842 {hsb-DE} currency symbol follows amount with blank

Change-Id: Id8a86541d1f8299763274e048f36af95eee03d72
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148023
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hsb_DE.xml 
b/i18npool/source/localedata/data/hsb_DE.xml
index 3e150e96096a..851c27bd9ff9 100644
--- a/i18npool/source/localedata/data/hsb_DE.xml
+++ b/i18npool/source/localedata/data/hsb_DE.xml
@@ -87,22 +87,22 @@
   0,00" "%
 
 
-  [CURRENCY]#.##0;-[CURRENCY]#.##0
+  #.##0 [CURRENCY];-#.##0 [CURRENCY]
 
 
-  [CURRENCY]#.##0,00;-[CURRENCY]#.##0,00
+  #.##0,00 [CURRENCY];-#.##0,00 [CURRENCY]
 
 
-  [CURRENCY]#.##0;[RED]-[CURRENCY]#.##0
+  #.##0 [CURRENCY];[RED]-#.##0 [CURRENCY]
 
 
-  [CURRENCY]#.##0,00;[RED]-[CURRENCY]#.##0,00
+  #.##0,00 [CURRENCY];[RED]-#.##0,00 [CURRENCY]
 
 
-  CCC#.##0,00
+  #.##0,00 CCC
 
 
-  [CURRENCY]#.##0,--;[RED]-[CURRENCY]#.##0,--
+  #.##0,-- [CURRENCY];[RED]-#.##0,-- [CURRENCY]
 
 
   D.MM.YY

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 894efac210a3871214d95a52c322b0bee40f00ba
Author: Justin Luth 
AuthorDate: Mon Jan 9 10:22:13 2023 -0500
Commit: Justin Luth 
CommitDate: Tue Jan 10 01:09:27 2023 +

tdf#56258 i18npool en-US: partial revert 5th outline level

This reverts the change of A.I.a.i. -> A.I.a.i.1.
made by commit dd8ed1fdbc63499ac958d28536c3c5540455358b.

While it wasn't necessarily a bad change, it no longer has
any justification, since the complementary change in the
other outline definition was modified to become MLA compliant.

Rather than make any change at all, just revert back to the
original definition, and leave the level definition to the
normal 4 levels of numbering before the bullets start.

Change-Id: I88d792a6dd20bd519755349905975cf9028f9fa6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145236
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index b2b8bc0d67de..b6e0924c8e97 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -608,12 +608,12 @@
   
   
 
-
+ 
   
   
   
   
-  
+  
   
 
  

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9993ccab05dd95dd0de0dc74fc72e5aee8a8cb61
Author: Justin Luth 
AuthorDate: Fri Jan 6 10:03:40 2023 -0500
Commit: Justin Luth 
CommitDate: Tue Jan 10 01:09:04 2023 +

tdf#56258 i18npool en-US: extend outline 1.a) to 4 levels

Change 1. a) -> 1) a) 1) A)

This is intended as a clean, modern style of outline
that has good visual spacing in LibreOffice.

This differentiates it a bit more from the first option,
and extends the numbered level to the typical depth of 4,
while still keeping a logical suffix pattern
and maintaining the general "theme" of the previous definition.

Yes, it is a bit odd to have a capital A following
a smaller case a. However, this is at the fourth
level, which isn't reached very often,
and I wanted to keep a choice that focuses on a small a.

Surprisingly, with the default 12pt/Liberation font, a
10) still fits in the allotted space before the tabstop,
so in most cases this outline will have proper visual spacing
all the way up to 99).

There are plenty of choices that start with 1 followed by a dot,
so I used this opportunity to create the only list
that starts with a ")" suffix. Google docs for example has a
1) a) i) choice, but for modern lists I don't think
we want to use roman numerals.

Change-Id: I34725d6aa113831eaeaa88c295b3b3f1294f8998
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145155
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index fed97bfa97f1..b2b8bc0d67de 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -576,11 +576,11 @@
   
   
 
-
-  
+ 
+  
   
-  
-  
+  
+  
   
   
 

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2570eb7265fbae840bf9f2d83463b0bee09beaef
Author: Justin Luth 
AuthorDate: Fri Jan 6 12:20:55 2023 -0500
Commit: Justin Luth 
CommitDate: Mon Jan 9 15:06:12 2023 +

tdf#56258 i18npool en-US: document ISO 2145 compliant outline list format

Change-Id: I27c2c3621434a4dbbcdd032672c668632494
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145158
Tested-by: Jenkins
Reviewed-by: Vernon, Stuart Foote 
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index 154c8791a9d2..fed97bfa97f1 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -616,7 +616,7 @@
   
   
 
-
+ 
   
   
   

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 5297528b85652d3f5a85e75ff6bcb406ba9b34d3
Author: Justin Luth 
AuthorDate: Fri Jan 6 10:31:41 2023 -0500
Commit: Justin Luth 
CommitDate: Mon Jan 9 15:05:27 2023 +

tdf#56258 i18npool en-US: replace illogical outline 1.(a).i.A

Change 1.(a).i.A. -> A.1.a.1.

This is intended as a clean, modern style of outline
that has good visual spacing in LibreOffice.

It provides a simple alternative to the second style,
reversing the order while still keeping a logical suffix pattern.

This design will easily allow large/long lists
to fit in the allotted space before the tabstop.

There was no attempt to match the theme of the
previous definition, since it neither looked
good in LO's default spacing, nor was it consistent/logical.

Change-Id: If7de1302110a3c97922bd2eeba7a917444110b27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145156
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Vernon, Stuart Foote 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index 40d86de5bcf3..154c8791a9d2 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -584,11 +584,11 @@
   
   
 
-
-  
-  
-  
-  
+ 
+  
+  
+  
+  
   
   
 

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit c3964de14cb14099b49e1c55370a5f98e773e03d
Author: Justin Luth 
AuthorDate: Fri Jan 6 09:05:39 2023 -0500
Commit: Justin Luth 
CommitDate: Mon Jan 9 15:04:57 2023 +

tdf#56258 i18npool en-US: change outline order to match MLA style

Changed I.A.i.a) -> I.A.1.a.i.

The overwhelming result of a google search for
"official/correct outline list format"
indicates that the third level should be a 1, not an i.

MLA Handbook (according to wikipedia) uses the order
I.A.1.a.i. (a) (1) i)

Chicago Mode of Style is usually interpreted as
I.A.1.a) or I.A.1.a. with varying lower sublevels/suffixes.

Wikipedia also suggest the logical order of
I.A.1.a.i.I) A) 1) a) i) (I) (A) (1) (a) (i)

Change-Id: I7fcc8a1ee727d6cddca4bf0c6a8461538769cf5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145147
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index aaf853353985..40d86de5bcf3 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -600,12 +600,12 @@
   
   
 
-
+ 
   
   
-  
-  
-  
+  
+  
+  
   
 
 

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/locale.dtd |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6cabd7d9bfed37799a344f872d5f8fcf3214116a
Author: Justin Luth 
AuthorDate: Fri Jan 6 09:03:20 2023 -0500
Commit: Eike Rathke 
CommitDate: Fri Jan 6 15:14:59 2023 +

tdf#56258 i18npool: add "adjust" to locale.dtd for outline numbering

Although Adjust was already defined in all of the code structures,
it was not defined in the dtd file.
Thanks to Eike for pointing out this requirement.

Change-Id: I43ed0c26ed5bccb2309a255db79f5afa32f78c38
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145146
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index f713ccf6d8b4..a867215421bc 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -681,5 +681,6 @@
 
 
 
+
 
 

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/dv_MV.xml   |   59 
 i18npool/source/localedata/data/is_IS.xml   |   59 
 i18npool/source/localedata/data/kmr_Latn_TR.xml |   59 
 i18npool/source/localedata/data/lt_LT.xml   |   59 
 i18npool/source/localedata/data/mk_MK.xml   |   59 
 i18npool/source/localedata/data/shs_CA.xml  |   59 
 i18npool/source/localedata/data/sl_SI.xml   |   59 
 i18npool/source/localedata/data/vi_VN.xml   |   59 
 8 files changed, 8 insertions(+), 464 deletions(-)

New commits:
commit 87a4185fff1f9294fcdc6117761b1298632c95e5
Author: Justin Luth 
AuthorDate: Sat Dec 31 21:50:05 2022 -0500
Commit: Justin Luth 
CommitDate: Tue Jan 3 18:31:35 2023 +

NFC tdf#56258 i18npool OutLineNumberingLevel: use ref="en_US"

In preparing to see what improvements can be made to
list defaults, it is helpful to see what customizations
have been made to the US defaults. Those that match
identically were changed to simple refs.

Thanks to https://www.linuxtopia.org/online_books/
linux_tool_guides/the_sed_faq/sedfaq4_013.html

The script there helped to generate sed expressions.

sed -f ref.sed *.xml
- ref.sed -
\##,\## {
:ack
N;
\##! b ack
s#\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
\
  \
  \
  \
  \
  \
\
  ##;
}
---

Change-Id: I6853c09ed10a9d71b39e79fb665f7d056e945864
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144945
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/dv_MV.xml 
b/i18npool/source/localedata/data/dv_MV.xml
index 4e2a2ec7e653..f15b7ac0d1e9 100644
--- a/i18npool/source/localedata/data/dv_MV.xml
+++ b/i18npool/source/localedata/data/dv_MV.xml
@@ -529,62 +529,5 @@
 
   
   
-  
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-  
+  
 
diff --git a/i18npool/source/localedata/data/is_IS.xml 
b/i18npool/source/localedata/data/is_IS.xml
index 4651fab38bab..26a534877105 100644
--- a/i18npool/source/localedata/data/is_IS.xml
+++ b/i18npool/source/localedata/data/is_IS.xml
@@ -359,62 +359,5 @@
 
 
   
-  
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-  
+  
 
diff --git a/i18npool/source/localedata/data/kmr_Latn_TR.xml 
b/i18npool/source/localedata/data/kmr_Latn_TR.xml
index 356aa36090e4..f60e4732f653 100644
--- a/i18npool/source/localedata/data/kmr_Latn_TR.xml
+++ b/i18npool/source/localedata/data/kmr_Latn_TR.xml
@@ -385,62 +385,5 @@
 
   
   
-  
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-  
+  
 
diff --git a/i18npool/source/localedata/data/lt_LT.xml 
b/i18npool/source/localedata/data/lt_LT.xml
index 36196e32d3b8..2c5b94bc4a7e 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -489,62 +489,5 @@
 
 
   
-  
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-  
-
-
-  
-  
-  
-  
-   

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/localedata.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit b1226e1f225de4fa67a0d4f5a6aa4017284c7deb
Author: Justin Luth 
AuthorDate: Mon Jan 2 10:48:33 2023 -0500
Commit: Justin Luth 
CommitDate: Tue Jan 3 18:29:41 2023 +

tdf#56258 i18npool: should be a SvxAdjust, not a HoriOrient

Although this is unused AFAICS, lets at least use the correct
enum, because these two do not match up.
HoriOrient::LEFT = 3, while SvxAdjust::Left = 0 (3 is Center)

Change-Id: I1cd8cce6d4e223ac272d8d4ba5e22c52c7657499
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144977
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 4291df4809e9..933c9224a1eb 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -23,10 +23,10 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1487,7 +1487,6 @@ LocaleDataImpl::getAllInstalledLocaleNames()
 
 using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
-using namespace ::com::sun::star::text;
 
 OutlineNumbering::OutlineNumbering(std::unique_ptr pOutlnLevels, int nLevels) :
 m_pOutlineLevels(std::move(pOutlnLevels)),
@@ -1529,7 +1528,7 @@ Any OutlineNumbering::getByIndex( sal_Int32 nIndex )
 pValues[8].Name = "FirstLineOffset";
 pValues[8].Value <<= pTemp->nFirstLineOffset;
 pValues[9].Name = "Adjust";
-pValues[9].Value <<= sal_Int16(HoriOrientation::LEFT);
+pValues[9].Value <<= sal_Int16(SvxAdjust::Left);
 pValues[10].Name = "Transliteration";
 pValues[10].Value <<= pTemp->sTransliteration;
 pValues[11].Name = "NatNum";

[Libreoffice-commits] core.git: i18npool/source

[Justin Luth (via logerrit)]

 i18npool/source/localedata/data/ak_GH.xml  |   11 +--
 i18npool/source/localedata/data/an_ES.xml  |   11 +--
 i18npool/source/localedata/data/ast_ES.xml |   11 +--
 i18npool/source/localedata/data/bm_ML.xml  |   11 +--
 i18npool/source/localedata/data/bs_BA.xml  |   11 +--
 i18npool/source/localedata/data/dv_MV.xml  |   11 +--
 i18npool/source/localedata/data/ee_GH.xml  |   11 +--
 i18npool/source/localedata/data/en_GH.xml  |   11 +--
 i18npool/source/localedata/data/fr_BF.xml  |   11 +--
 i18npool/source/localedata/data/fur_IT.xml |   11 +--
 i18npool/source/localedata/data/fy_NL.xml  |   11 +--
 i18npool/source/localedata/data/gd_GB.xml  |   11 +--
 i18npool/source/localedata/data/gsc_FR.xml |   11 +--
 i18npool/source/localedata/data/gug_PY.xml |   11 +--
 i18npool/source/localedata/data/ha_Latn_GH.xml |   11 +--
 i18npool/source/localedata/data/haw_US.xml |   11 +--
 i18npool/source/localedata/data/hil_PH.xml |   11 +--
 i18npool/source/localedata/data/hr_HR.xml  |   11 +--
 i18npool/source/localedata/data/ht_HT.xml  |   11 +--
 i18npool/source/localedata/data/jbo.xml|   11 +--
 i18npool/source/localedata/data/kab_DZ.xml |   11 +--
 i18npool/source/localedata/data/kk_KZ.xml  |   11 +--
 i18npool/source/localedata/data/kmr_Latn_TR.xml|   11 +--
 i18npool/source/localedata/data/lg_UG.xml  |   11 +--
 i18npool/source/localedata/data/lgr_SB.xml |   11 +--
 i18npool/source/localedata/data/lld_IT.xml |   11 +--
 i18npool/source/localedata/data/ln_CD.xml  |   11 +--
 i18npool/source/localedata/data/mk_MK.xml  |   11 +--
 i18npool/source/localedata/data/mos_BF.xml |   11 +--
 i18npool/source/localedata/data/mt_MT.xml  |   11 +--
 i18npool/source/localedata/data/myv_RU.xml |   11 +--
 i18npool/source/localedata/data/ny_MW.xml  |   11 +--
 i18npool/source/localedata/data/oc_FR_lengadoc.xml |   11 +--
 i18npool/source/localedata/data/om_ET.xml  |   11 +--
 i18npool/source/localedata/data/pap_CW.xml |   11 +--
 i18npool/source/localedata/data/plt_MG.xml |   11 +--
 i18npool/source/localedata/data/rue_SK.xml |   11 +--
 i18npool/source/localedata/data/sc_IT.xml  |   11 +--
 i18npool/source/localedata/data/sg_CF.xml  |   11 +--
 i18npool/source/localedata/data/shs_CA.xml |   11 +--
 i18npool/source/localedata/data/sid_ET.xml |   11 +--
 i18npool/source/localedata/data/so_SO.xml  |   11 +--
 i18npool/source/localedata/data/ti_ET.xml  |   11 +--
 i18npool/source/localedata/data/tk_TM.xml  |   11 +--
 i18npool/source/localedata/data/tpi_PG.xml |   11 +--
 i18npool/source/localedata/data/ug_CN.xml  |   11 +--
 i18npool/source/localedata/data/ur_PK.xml  |   11 +--
 i18npool/source/localedata/data/vi_VN.xml  |   11 +--
 48 files changed, 48 insertions(+), 480 deletions(-)

New commits:
commit ef3b7b7118c854d8ca67cc2249b6c08ddc1885eb
Author: Justin Luth 
AuthorDate: Sat Dec 31 17:52:34 2022 -0500
Commit: Justin Luth 
CommitDate: Mon Jan 2 22:53:58 2023 +

NFC tdf#56258 i18npool NumberingLevel: use ref="en_US"

In preparing to see what improvements can be made to
list defaults, it is helpful to see what customizations
have been made to the US defaults. Those that match
identically were changed to simple refs.

Thanks to https://www.linuxtopia.org/online_books/
linux_tool_guides/the_sed_faq/sedfaq4_013.html
The script there helped to generate sed expressions.

sed -f ref.sed *.xml
- ref.sed -
\##,\## {
:ack
N;
\##! b ack
s#\
\
\
\
\
\
\
\
\
  ##;
}
---

- ref2.sed -
\##,\## {
:ack
N;
\##! b ack
s#\
\
\
\
\
\
\
\
\
  ##;
}



Change-Id: I85d8a8ed095f19d08b035d7f2c4e2cd94ff08c76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144890
Tested-by: Justin Luth 
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/localedata/data/ak_GH.xml 
b/i18npool/source/localedata/data/ak_GH.xml
index 8a380241adf3..2c42a3d9f37b 100644
--- a/i18npool/source/localedata/data/ak_GH.xml
+++ b/i18npool/source/localedata/data/ak_GH.xml

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/data/oc_FR_lengadoc.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ec1acb45021fee2259028e4ee830c11b61c25fac
Author: Julien Nabet 
AuthorDate: Sun Jan 1 18:59:49 2023 +0100
Commit: Julien Nabet 
CommitDate: Sun Jan 1 21:42:43 2023 +

tdf#152785: typo "disabte" instead of "dissabte" for Saturday in occitan

Refs:
1) 
https://locongres.org/oc/aplicacions/dicodoc-oc/dicodoc-recerca?option=com_dicodoc=search=168=fr-oc%5B%5D=BASIC%5B%5D=LAUS%5B%5D=LAGA=samedi==Cercar
2) https://en.wiktionary.org/wiki/Appendix:Days_of_the_week

like this since the beginning 5b7b4e81144619c8350b5c59d9d17ba7f75aeccb
"
INTEGRATION: CWS locales23 (1.1.2); FILE ADDED
2007/04/25 19:14:54 er 1.1.2.1: #i76044# add Occitan_France (oc_FR) locale 
data; contributed by Bruno Gallart 
"

Thank you to quentinanto...@free.fr for having spotted this + provided refs!

Change-Id: I8b81e561885bc2e1eea6c5f88a3924ea58141791
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144926
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/data/oc_FR_lengadoc.xml 
b/i18npool/source/localedata/data/oc_FR_lengadoc.xml
index bec03a7128a6..ce8afc7b6a99 100644
--- a/i18npool/source/localedata/data/oc_FR_lengadoc.xml
+++ b/i18npool/source/localedata/data/oc_FR_lengadoc.xml
@@ -255,8 +255,8 @@
 
 
   sat
-  disabte
-  disabte
+  dissabte
+  dissabte
 
   
   

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/transliteration/transliteration_body.cxx |   11 +++
 1 file changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 6f7bc75dc1d0fe8227f30afc5eccdd7a9a9c4006
Author: Julien Nabet 
AuthorDate: Sat Dec 17 11:58:17 2022 +0100
Commit: Noel Grandin 
CommitDate: Sat Dec 17 12:35:34 2022 +

tdf#152520: Crash when using TITLE_CASE/SENTENCE_CASE in Transliteration 
module

relevant part of bt:
7  0x7f50c85b3796 in com::sun::star::uno::Sequence::realloc(int) 
(this=0x0, nSize=11) at include/com/sun/star/uno/Sequence.hxx:215
8  0x7f50c85d9240 in 
i18npool::transliterate_titlecase_Impl(std::basic_string_view >, int, int, com::sun::star::lang::Locale const&, 
com::sun::star::uno::Sequence*) (inStr=u"AB cd. eF. ", startPos=0, 
nCount=11, rLocale=..., pOffset=0x0) at 
i18npool/source/transliteration/transliteration_body.cxx:267
9  0x7f50c85d955b in 
i18npool::Transliteration_sentencecase::transliterateImpl(rtl::OUString const&, 
int, int, com::sun::star::uno::Sequence*)
(this=0x557834ea0bb0, inStr="AB cd. eF. ", startPos=0, nCount=11, 
pOffset=0x0) at i18npool/source/transliteration/transliteration_body.cxx:298
10 0x7f50c85dcc10 in 
i18npool::transliteration_commonclass::transliterateString2String(rtl::OUString 
const&, int, int) (this=0x557834ea0bb0, inStr="AB cd. eF. ", startPos=0, 
nCount=11)
at i18npool/source/transliteration/transliteration_commonclass.cxx:109
11 0x7f50c85dcc5d in non-virtual thunk to 
i18npool::transliteration_commonclass::transliterateString2String(rtl::OUString 
const&, int, int) ()
at i18npool/source/transliteration/transliteration_commonclass.cxx:109
12 0x7f50c85e0d89 in 
i18npool::TransliterationImpl::transliterateString2String(rtl::OUString const&, 
int, int) (this=0x557834854dc0, inStr="AB cd. eF. ", startPos=0, nCount=11)
at i18npool/source/transliteration/transliterationImpl.cxx:395

full bt here:
https://bugs.documentfoundation.org/attachment.cgi?id=184205

Regression from:
c7551e8a46e2f9f8142aa7921a0494221ae096e8 (speedup 
CharacterClassificationImpl::toUpper)

Change-Id: I40e383fc87213d88fbde50876f61947b04190a90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/144375
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 69ba0c236714..8bf5d6bdd4b1 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -264,11 +264,14 @@ static OUString transliterate_titlecase_Impl(
 // The rest of the text should just become lowercase.
 aRes = xCharClassImpl->toTitle( aResolvedLigature, 0, nResolvedLen, 
rLocale ) +
xCharClassImpl->toLower( aText, 1, aText.getLength() - 1, 
rLocale );
-pOffset->realloc( aRes.getLength() );
+if (pOffset)
+{
+pOffset->realloc( aRes.getLength() );
 
-auto [begin, end] = asNonConstRange(*pOffset);
-sal_Int32* pOffsetInt = std::fill_n(begin, nResolvedLen, 0);
-std::iota(pOffsetInt, end, 1);
+auto [begin, end] = asNonConstRange(*pOffset);
+sal_Int32* pOffsetInt = std::fill_n(begin, nResolvedLen, 0);
+std::iota(pOffsetInt, end, 1);
+}
 }
 return aRes;
 }

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/pt_AO.xml |   40 +++---
 1 file changed, 20 insertions(+), 20 deletions(-)

New commits:
commit 0deb57a1e8d5e85a364fdb5678b46f6fdd7d345b
Author: Eike Rathke 
AuthorDate: Sun Nov 27 18:20:57 2022 +0100
Commit: Eike Rathke 
CommitDate: Sun Nov 27 20:10:17 2022 +0100

{pt-AO} change to untranslated YY, keywords, translated AA never worked

Apparently copied from {pt-PT} year AA and  format codes
should not had made it across but also never worked as
LANGUAGE_USER_PORTUGUESE_ANGOLA was missing in
ImpSvNumberformatScan::SetDependentKeywords() so date codes
displayed literal AA instead. Seems no one is using that locale
with dates..

Since

commit 5d833d37851597c1fb9076710d9eb03e4c94ca07
CommitDate: Fri Apr 8 20:51:13 2011 +0200

add pt_AO locale data (edited version of Mandrake's patch)

Change-Id: Icd5f81d0a49462ad2514655742d6c05f069f55fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143354
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/pt_AO.xml 
b/i18npool/source/localedata/data/pt_AO.xml
index 138c401a6659..2ad917a1d622 100644
--- a/i18npool/source/localedata/data/pt_AO.xml
+++ b/i18npool/source/localedata/data/pt_AO.xml
@@ -66,13 +66,13 @@
   [NatNum12 upper CURRENCY]0,00
 
 
-  DD-MM-
+  DD-MM-
 
 
-  NN DD-MMM AA
+  NN DD-MMM YY
 
 
-  MM-AA
+  MM-YY
 
 
   DD-MMM
@@ -81,49 +81,49 @@
   
 
 
-  QQ AA
+  QQ YY
 
 
-  DD-MM-
+  DD-MM-
 
 
-  DD-MM-AA
+  DD-MM-YY
 
 
-  D "de"  "de" 
+  D "de"  "de" 
 
 
-  D "de" MMM "de" AA
+  D "de" MMM "de" YY
 
 
-  D "de" MMM "de" 
+  D "de" MMM "de" 
 
 
-  D "de"  "de" 
+  D "de"  "de" 
 
 
-  NN, D "de" MMM "de" AA
+  NN, D "de" MMM "de" YY
 
 
-  NN, D "de"  "de" 
+  NN, D "de"  "de" 
 
 
-  D "de"  "de" 
+  D "de"  "de" 
 
 
-  D. MMM. 
+  D. MMM. 
 
 
-  D.  
+  D.  
 
 
   MM-DD
 
 
-  AA-MM-DD
+  YY-MM-DD
 
 
-  -MM-DD
+  -MM-DD
   ISO 8601 (EN 28601)
 
 
@@ -151,13 +151,13 @@
   [HH]:MM:SS,00
 
 
-  DD-MM-AA HH:MM
+  DD-MM-YY HH:MM
 
 
-  DD-MM- HH:MM:SS
+  DD-MM- HH:MM:SS
 
 
-  DD-MM- HH:MM
+  DD-MM- HH:MM
 
 
   Geral

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hr_HR.xml |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit c58bc31ece80ccdfc88bd043787869c5e460dbd8
Author: Eike Rathke 
AuthorDate: Sun Nov 27 17:11:49 2022 +0100
Commit: Eike Rathke 
CommitDate: Sun Nov 27 19:10:49 2022 +0100

Resolves: tdf#150011 Switch default currency HRK Croatian Kuna to EUR Euro

HR will join Euro area on 2023-01-01.

Change-Id: I3836804ff68419550091826ea2414bc0edd55a84
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143346
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hr_HR.xml 
b/i18npool/source/localedata/data/hr_HR.xml
index ab21d19cd32b..bf55bc47aea7 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -435,15 +435,14 @@
 
   
   
-
+
   HRK
   kn
   HRK
   Hrvatska Kuna
   2
 
-
-
+
   EUR
   €
   EUR

[Libreoffice-commits] core.git: i18npool/source

[László Németh (via logerrit)]

 i18npool/source/localedata/data/fa_IR.xml |3 +++
 i18npool/source/localedata/data/is_IS.xml |   18 --
 2 files changed, 3 insertions(+), 18 deletions(-)

New commits:
commit 099d5d22b38bb0ea91faaed14ecc0edfa010ff11
Author: László Németh 
AuthorDate: Sun Nov 13 14:27:23 2022 +0100
Commit: László Németh 
CommitDate: Mon Nov 14 09:28:28 2022 +0100

tdf#115007 i18npool: add NatNum12 support to Persian, fix Hebrew

Add NatNum12 cardinal support for new Persian (Farsi) module
of libnumbertext 1.0.11.

Hebrew has no uppercase letters, also currency support is broken yet,
so remove bad number formats.

Follow-up to commit b7d53247eb2fab04f5f6d82d405f1ac0c73542b2
"tdf#115007 i18npool: add NatNum12 formats to locale" and
commit 6064b3382102bcbc153156f5874fbc8dfde97b98
"tdf#115007 tdf#148672 bump libnumbertext 1.0.11".

Change-Id: I9a2a40e7485d4d4ff150d9946e58aed0d7526678
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142658
Tested-by: László Németh 
Reviewed-by: László Németh 

diff --git a/i18npool/source/localedata/data/fa_IR.xml 
b/i18npool/source/localedata/data/fa_IR.xml
index 5199c1efdaf3..0b45e5b33a5f 100644
--- a/i18npool/source/localedata/data/fa_IR.xml
+++ b/i18npool/source/localedata/data/fa_IR.xml
@@ -72,6 +72,9 @@
 
   [NatNum1]#٬###٫00
 
+
+  [NatNum12 cardinal]0
+
 
   [NatNum1]0٫00E+000
 
diff --git a/i18npool/source/localedata/data/is_IS.xml 
b/i18npool/source/localedata/data/is_IS.xml
index daae783af108..4651fab38bab 100644
--- a/i18npool/source/localedata/data/is_IS.xml
+++ b/i18npool/source/localedata/data/is_IS.xml
@@ -60,12 +60,6 @@
 
   [NatNum12 cardinal]0
 
-
-  [NatNum12 capitalize cardinal]0
-
-
-  [NatNum12 upper cardinal]0
-
 
   0,00E+000
 
@@ -99,18 +93,6 @@
 
   #.##0,-- [$kr.-40F];[RED]-#.##0,-- [$kr.-40F]
 
-
-  [NatNum12 CURRENCY]0
-
-
-  [NatNum12 CURRENCY]0,00
-
-
-  [NatNum12 upper CURRENCY]0
-
-
-  [NatNum12 upper CURRENCY]0,00
-
 
   D.MM.
 

[Libreoffice-commits] core.git: i18npool/source

[Stephan Bergmann (via logerrit)]

 i18npool/source/calendar/calendar_gregorian.cxx |   39 
 1 file changed, 27 insertions(+), 12 deletions(-)

New commits:
commit b6fbcac6f6933858db53a54e7505ff3a83465960
Author: Stephan Bergmann 
AuthorDate: Sat Nov 5 16:00:01 2022 +0100
Commit: Stephan Bergmann 
CommitDate: Sun Nov 6 01:14:25 2022 +0100

-Werror,-Wdeprecated-declarations (sprintf, macOS 13 SDK): i18npool

Change-Id: Id5c9892df6dd3f4e66098a312a79e91bd6b9e8ea
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/142328
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index 53fe9b1c70bd..e586470a0c31 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -926,24 +927,31 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 
nCalendarDisplayCode, sal_In
 // The "#100211# - checked" comments serve for detection of "use of
 // sprintf is safe here" conditions. An sprintf encountered without
 // having that comment triggers alarm ;-)
-char aStr[12];  // "-2147483648" and \0
 switch( nCalendarDisplayCode ) {
 case CalendarDisplayCode::SHORT_MONTH:
 value += 1; // month is zero based
 [[fallthrough]];
 case CalendarDisplayCode::SHORT_DAY:
-sprintf(aStr, "%" SAL_PRIdINT32, value); // #100211# - 
checked
+aOUStr = OUString::number(value);
 break;
 case CalendarDisplayCode::LONG_YEAR:
 if ( aCalendar.Name == "gengou" )
-sprintf(aStr, "%02" SAL_PRIdINT32, value); // #100211# 
- checked
+{
+char aStr[12];  // "-2147483648" and \0
+o3tl::sprintf(aStr, "%02" SAL_PRIdINT32, value); // 
#100211# - checked
+aOUStr = OUString::createFromAscii(aStr);
+}
 else
-sprintf(aStr, "%" SAL_PRIdINT32, value); // #100211# - 
checked
+aOUStr = OUString::number(value);
 break;
 case CalendarDisplayCode::LONG_MONTH:
-value += 1; // month is zero based
-sprintf(aStr, "%02" SAL_PRIdINT32, value);   // #100211# - 
checked
-break;
+{
+value += 1; // month is zero based
+char aStr[12];  // "-2147483648" and \0
+o3tl::sprintf(aStr, "%02" SAL_PRIdINT32, value);   // 
#100211# - checked
+aOUStr = OUString::createFromAscii(aStr);
+break;
+}
 case CalendarDisplayCode::SHORT_YEAR:
 // Take last 2 digits, or only one if value<10, for example,
 // in case of the Gengou calendar. For combined era+year always
@@ -957,13 +965,21 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 
nCalendarDisplayCode, sal_In
 // the only calendar using this.
 // See i#116701 and fdo#60915
 if (value < 100 || bEraMode || (eraArray && (eraArray[0].flags 
& kDisplayEraForcedLongYear)))
-sprintf(aStr, "%" SAL_PRIdINT32, value); // #100211# - 
checked
+aOUStr = OUString::number(value);
 else
-sprintf(aStr, "%02" SAL_PRIdINT32, value % 100); // 
#100211# - checked
+{
+char aStr[12];  // "-2147483648" and \0
+o3tl::sprintf(aStr, "%02" SAL_PRIdINT32, value % 100); // 
#100211# - checked
+aOUStr = OUString::createFromAscii(aStr);
+}
 break;
 case CalendarDisplayCode::LONG_DAY:
-sprintf(aStr, "%02" SAL_PRIdINT32, value);   // #100211# - 
checked
-break;
+{
+char aStr[12];  // "-2147483648" and \0
+o3tl::sprintf(aStr, "%02" SAL_PRIdINT32, value);   // 
#100211# - checked
+aOUStr = OUString::createFromAscii(aStr);
+break;
+}
 
 case CalendarDisplayCode::SHORT_DAY_NAME:
 return getDisplayName(CalendarDisplayIndex::DAY, value, 0);
@@ -1005,7 +1021,6 @@ Calendar_gregorian::getDisplayStringImpl( sal_Int32 
nCalendarDisplayCode, sal_In
 default:
 throw RuntimeException();
 }
-aOUStr = OUString::createFromAscii(aStr);
 }
 // NatNum12 used only for selected parts
 if (nNativeNumberMode > 0 && nNativeNumberMode != 12) {

[Libreoffice-commits] core.git: i18npool/source

[László Németh (via logerrit)]

 i18npool/source/localedata/data/bg_BG.xml |   21 +
 i18npool/source/localedata/data/ca_ES.xml |   21 +
 i18npool/source/localedata/data/cs_CZ.xml |   21 +
 i18npool/source/localedata/data/da_DK.xml |   21 +
 i18npool/source/localedata/data/de_AT.xml |   21 +
 i18npool/source/localedata/data/de_CH.xml |   21 +
 i18npool/source/localedata/data/de_DE.xml |   21 +
 i18npool/source/localedata/data/de_LI.xml |   21 +
 i18npool/source/localedata/data/de_LU.xml |   21 +
 i18npool/source/localedata/data/el_GR.xml |   21 +
 i18npool/source/localedata/data/en_AU.xml |   24 
 i18npool/source/localedata/data/en_CA.xml |   24 
 i18npool/source/localedata/data/en_DK.xml |   24 
 i18npool/source/localedata/data/en_GB.xml |   24 
 i18npool/source/localedata/data/en_GH.xml |   24 
 i18npool/source/localedata/data/en_IE.xml |   15 ++-
 i18npool/source/localedata/data/en_JM.xml |   24 
 i18npool/source/localedata/data/en_NA.xml |   24 
 i18npool/source/localedata/data/en_ZA.xml |   24 
 i18npool/source/localedata/data/eo.xml|9 +
 i18npool/source/localedata/data/es_AR.xml |   21 +
 i18npool/source/localedata/data/es_BO.xml |   21 +
 i18npool/source/localedata/data/es_CL.xml |   21 +
 i18npool/source/localedata/data/es_CO.xml |   21 +
 i18npool/source/localedata/data/es_CR.xml |   21 +
 i18npool/source/localedata/data/es_DO.xml |   21 +
 i18npool/source/localedata/data/es_EC.xml |   21 +
 i18npool/source/localedata/data/es_ES.xml |   21 +
 i18npool/source/localedata/data/es_GT.xml |   21 +
 i18npool/source/localedata/data/es_PE.xml |   21 +
 i18npool/source/localedata/data/es_SV.xml |   21 +
 i18npool/source/localedata/data/et_EE.xml |   21 +
 i18npool/source/localedata/data/fi_FI.xml |   21 +
 i18npool/source/localedata/data/fr_BE.xml |   21 +
 i18npool/source/localedata/data/fr_BF.xml |   21 +
 i18npool/source/localedata/data/fr_CA.xml |   21 +
 i18npool/source/localedata/data/fr_CH.xml |   21 +
 i18npool/source/localedata/data/fr_FR.xml |   21 +
 i18npool/source/localedata/data/fr_LU.xml |   21 +
 i18npool/source/localedata/data/fr_TG.xml |   21 +
 i18npool/source/localedata/data/gl_ES.xml |   21 +
 i18npool/source/localedata/data/he_IL.xml |   21 +
 i18npool/source/localedata/data/hr_HR.xml |   21 +
 i18npool/source/localedata/data/hu_HU.xml |   21 +
 i18npool/source/localedata/data/id_ID.xml |   21 +
 i18npool/source/localedata/data/is_IS.xml |   21 +
 i18npool/source/localedata/data/it_CH.xml |   21 +
 i18npool/source/localedata/data/it_IT.xml |   21 +
 i18npool/source/localedata/data/lb_LU.xml |   21 +
 i18npool/source/localedata/data/lg_UG.xml |   21 +
 i18npool/source/localedata/data/lt_LT.xml |   21 +
 i18npool/source/localedata/data/lv_LV.xml |   21 +
 i18npool/source/localedata/data/mt_MT.xml |9 +
 i18npool/source/localedata/data/nl_BE.xml |   21 +
 i18npool/source/localedata/data/nl_NL.xml |   21 +
 i18npool/source/localedata/data/no_NO.xml |   21 +
 i18npool/source/localedata/data/pl_PL.xml |   21 +
 i18npool/source/localedata/data/pt_AO.xml |   21 +
 i18npool/source/localedata/data/pt_BR.xml |   21 +
 i18npool/source/localedata/data/pt_PT.xml |   21 +
 i18npool/source/localedata/data/ro_RO.xml |   21 +
 i18npool/source/localedata/data/ru_RU.xml |   21 +
 i18npool/source/localedata/data/sl_SI.xml |   21 +
 i18npool/source/localedata/data/sr_RS.xml |9 +
 i18npool/source/localedata/data/sv_FI.xml |   21 +
 i18npool/source/localedata/data/sv_SE.xml |   21 +
 i18npool/source/localedata/data/tr_TR.xml |   21 +
 i18npool/source/localedata/data/uk_UA.xml |   21 +
 i18npool/source/localedata/data/vi_VN.xml |9 +
 69 files changed, 1418 insertions(+), 1 deletion(-)

New 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/list-dateacceptancepattern.awk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2b1d34679d8a5128bc13d932466c2a6464525627
Author: Eike Rathke 
AuthorDate: Thu Oct 13 18:43:32 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Oct 13 21:51:53 2022 +0200

Change split regexp from \~ to ~

gawk: ./list-dateacceptancepattern.awk:70: warning: regexp escape 
sequence `\~' is not a known regexp operator

Also set the executable bit again..

Change-Id: Icdf45979d6fb19d207dcf5475845767438c3ef6b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141340
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/list-dateacceptancepattern.awk 
b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
old mode 100644
new mode 100755
index 3c86923e2b84..e47f101d4af0
--- a/i18npool/source/localedata/data/list-dateacceptancepattern.awk
+++ b/i18npool/source/localedata/data/list-dateacceptancepattern.awk
@@ -67,7 +67,7 @@ file != FILENAME {
 {
 formatelement = 0
 split( $0, a, /<|>/ )
-split( a[3], b, /[0-9A-Za-z\[\~\]]+/ )
+split( a[3], b, /[0-9A-Za-z\[~\]]+/ )
 datesep = b[2]
 dateformat = a[3]
 }

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/locale.dtd |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 5d80971d8bc2027d78e1f6120bea7c388138d2d7
Author: Eike Rathke 
AuthorDate: Thu Oct 6 17:51:41 2022 +0200
Commit: Eike Rathke 
CommitDate: Thu Oct 6 20:48:05 2022 +0200

Do not use double hyphen in DTD comment to satisfy xmllint

Change-Id: I0358abf107c2c80aa142627dd37819c55023be10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141028
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/locale.dtd 
b/i18npool/source/localedata/data/locale.dtd
index 60006d87f439..f713ccf6d8b4 100644
--- a/i18npool/source/localedata/data/locale.dtd
+++ b/i18npool/source/localedata/data/locale.dtd
@@ -31,7 +31,13 @@
 current locale.dtd file at hand, you can download the locale.dtd file from
 
https://cgit.freedesktop.org/libreoffice/core/plain/i18npool/source/localedata/data/locale.dtd
 
-xmllint --dtdvalid locale.dtd --noout your_data.xml
+xmllint -dtdvalid locale.dtd -noout your_data.xml
+
+(Note that instead of one - hyphen minus two consecutive hyphen minus
+characters should be given to start an option, but a double hyphen in a XML
+comment technically ends a comment (though parsers look for a matching
+closing one with > as well) and let xmllint complain already about the .dtd
+itself. Some versions of xmllint also accept a single hyphen minus).
 
 
 Second, using a validating parser. A validating parser, for example, may 
be found at

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/transliteration/fullwidthToHalfwidth.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 222e56157c6317435088e09e52a0705bc6a1a83a
Author: Noel Grandin 
AuthorDate: Sat Sep 24 12:49:03 2022 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 24 13:39:05 2022 +0200

tdf#151148 Finding KATAKANA which has voice consonant mark wrong

regression from
commit c7551e8a46e2f9f8142aa7921a0494221ae096e8
Author: Noel Grandin 
Date:   Thu Sep 16 10:36:48 2021 +0200
speedup CharacterClassificationImpl::toUpper

Change-Id: I0309dec3d08220b9616be185360013869598fa1c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/140541
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx 
b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
index 6a90a957f038..fbd2624e149b 100644
--- a/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
+++ b/i18npool/source/transliteration/fullwidthToHalfwidth.cxx
@@ -50,7 +50,7 @@ fullwidthToHalfwidth::transliterateImpl( const OUString& 
inStr, sal_Int32 startP
 const OUString& newStr = 
i18nutil::widthfolding::decompose_ja_voiced_sound_marks (inStr, startPos, 
nCount, pOffset);
 
 // One to One mapping
-return transliteration_OneToOne::transliterateImpl( newStr, 0, 
newStr.getLength(), pOffset);
+return transliteration_OneToOne::transliterateImpl( newStr, 0, 
newStr.getLength(), nullptr);
 }
 
 sal_Unicode SAL_CALL

[Libreoffice-commits] core.git: i18npool/source sw/qa

[Andreas Heinisch (via logerrit)]

 i18npool/source/breakiterator/breakiteratorImpl.cxx |4 +--
 i18npool/source/breakiterator/breakiterator_unicode.cxx |   15 +++-
 sw/qa/core/crsr/crsr.cxx|   19 
 3 files changed, 30 insertions(+), 8 deletions(-)

New commits:
commit 70c99eef1643a17b2c1f0dba38b55a58cdb9aafc
Author: Andreas Heinisch 
AuthorDate: Fri Jul 29 09:29:33 2022 +0200
Commit: Andreas Heinisch 
CommitDate: Sun Aug 21 14:12:43 2022 +0200

tdf#135451 - Change the skipSpace implementation of the break iterator

Change the ICU whitespace function of the break iterator from 
u_isWhitespace to u_isUWhiteSpace to include no-break spaces.

u_isWhitespace includes Java isWhitespace; Z + whitespace ISO controls but 
excludes no-break spaces
u_isUWhiteSpace includes all code points with the Unicode White_Space 
property; most of general categories "Z" (separators) + most whitespace ISO 
controls (including no-break spaces, but excluding IS1..IS4)

See https://unicode-org.github.io/icu-docs/apidoc/dev/icu4c/uchar_8h.html 
for further details.

Change-Id: I21fddefaf2149096824908f644310a59d6e2f38d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137582
Tested-by: Jenkins
Reviewed-by: Andreas Heinisch 

diff --git a/i18npool/source/breakiterator/breakiteratorImpl.cxx 
b/i18npool/source/breakiterator/breakiteratorImpl.cxx
index 71f371a7eddc..71d794e2c9d4 100644
--- a/i18npool/source/breakiterator/breakiteratorImpl.cxx
+++ b/i18npool/source/breakiterator/breakiteratorImpl.cxx
@@ -82,7 +82,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 
nPos, sal_Int32 len,
 while (nPos < len)
 {
 ch = Text.iterateCodePoints();
-if (!u_isWhitespace(ch) && !isZWSP(ch))
+if (!u_isUWhiteSpace(ch) && !isZWSP(ch))
 break;
 nPos = pos;
 }
@@ -90,7 +90,7 @@ static sal_Int32 skipSpace(const OUString& Text, sal_Int32 
nPos, sal_Int32 len,
 while (nPos > 0)
 {
 ch = Text.iterateCodePoints(, -1);
-if (!u_isWhitespace(ch) && !isZWSP(ch))
+if (!u_isUWhiteSpace(ch) && !isZWSP(ch))
 break;
 nPos = pos;
 }
diff --git a/i18npool/source/breakiterator/breakiterator_unicode.cxx 
b/i18npool/source/breakiterator/breakiterator_unicode.cxx
index a4a00c46a1ad..cfac4ddea89d 100644
--- a/i18npool/source/breakiterator/breakiterator_unicode.cxx
+++ b/i18npool/source/breakiterator/breakiterator_unicode.cxx
@@ -379,9 +379,10 @@ Boundary SAL_CALL BreakIterator_Unicode::nextWord( const 
OUString& Text, sal_Int
 if( rv.startPos >= Text.getLength() || rv.startPos == 
icu::BreakIterator::DONE )
 rv.endPos = result.startPos;
 else {
-if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
-rWordType == WordType::DICTIONARY_WORD ) &&
-u_isWhitespace(Text.iterateCodePoints(, 0)) )
+if ((rWordType == WordType::ANYWORD_IGNOREWHITESPACES
+ && u_isUWhiteSpace(Text.iterateCodePoints(, 0)))
+|| (rWordType == WordType::DICTIONARY_WORD
+&& u_isWhitespace(Text.iterateCodePoints(, 0
 rv.startPos = 
icuBI->mpValue->mpBreakIterator->following(rv.startPos);
 
 rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
@@ -402,9 +403,11 @@ Boundary SAL_CALL 
BreakIterator_Unicode::previousWord(const OUString& Text, sal_
 if( rv.startPos < 0)
 rv.endPos = rv.startPos;
 else {
-if ( (rWordType == WordType::ANYWORD_IGNOREWHITESPACES ||
-rWordType == WordType::DICTIONARY_WORD) &&
-u_isWhitespace(Text.iterateCodePoints(, 0)) )
+
+if ((rWordType == WordType::ANYWORD_IGNOREWHITESPACES
+ && u_isUWhiteSpace(Text.iterateCodePoints(, 0)))
+|| (rWordType == WordType::DICTIONARY_WORD
+&& u_isWhitespace(Text.iterateCodePoints(, 0
 rv.startPos = 
icuBI->mpValue->mpBreakIterator->preceding(rv.startPos);
 
 rv.endPos = icuBI->mpValue->mpBreakIterator->following(rv.startPos);
diff --git a/sw/qa/core/crsr/crsr.cxx b/sw/qa/core/crsr/crsr.cxx
index c0713389bec3..759b236d16ac 100644
--- a/sw/qa/core/crsr/crsr.cxx
+++ b/sw/qa/core/crsr/crsr.cxx
@@ -164,6 +164,25 @@ CPPUNIT_TEST_FIXTURE(SwCoreCrsrTest, 
testContentControlReadOnly)
 CPPUNIT_ASSERT(pWrtShell->HasReadonlySel());
 }
 
+CPPUNIT_TEST_FIXTURE(SwCoreCrsrTest, testTdf135451)
+{
+SwDoc* pDoc = createSwDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+
+// Insert narrow no-break space and move the cursor right before it
+pWrtShell->Insert(u"a" + OUStringChar(CHAR_NNBSP) + "b");
+pWrtShell->EndPara(/*bSelect=*/false);
+

[Libreoffice-commits] core.git: i18npool/source officecfg/registry sc/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hr_HR.xml  |8 
 officecfg/registry/data/org/openoffice/Office/Calc.xcu |   11 +++
 sc/source/core/tool/interpr2.cxx   |3 ++-
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 7c4b2db21ef77b37daf234ac1ab9989234606a22
Author: Eike Rathke 
AuthorDate: Fri Jul 22 22:12:02 2022 +0200
Commit: Eike Rathke 
CommitDate: Fri Jul 22 23:04:58 2022 +0200

Resolves: tdf#150011 Add HRK Croatian Kuna conversion to EUR Euro

TODO: switch defaults before 2023-01-01 in
i18npool/source/localedata/data/hr_HR.xml

Change-Id: Ifc62aefbc8c9fe8bbf044f61ae4fd6eeff692185
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/137371
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hr_HR.xml 
b/i18npool/source/localedata/data/hr_HR.xml
index 0c493131e16b..4de83e5535cd 100644
--- a/i18npool/source/localedata/data/hr_HR.xml
+++ b/i18npool/source/localedata/data/hr_HR.xml
@@ -421,6 +421,14 @@
   Hrvatska Kuna
   2
 
+
+
+  EUR
+  €
+  EUR
+  Euro
+  2
+
   
   
 
diff --git a/officecfg/registry/data/org/openoffice/Office/Calc.xcu 
b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
index a62d06512704..eda60fe6c434 100644
--- a/officecfg/registry/data/org/openoffice/Office/Calc.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Calc.xcu
@@ -228,6 +228,17 @@
 3.45280
   
 
+
+  
+EUR
+  
+  
+HRK
+  
+  
+7.53450
+  
+
   
   
 
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index 31c42a4b728a..67fcd9f787f8 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -3235,7 +3235,8 @@ static bool lclConvertMoney( const OUString& aSearchUnit, 
double& rfRate, int& r
 { "SKK", 30.1260,  2 },
 { "EEK", 15.6466,  2 },
 { "LVL", 0.702804, 2 },
-{ "LTL", 3.45280,  2 }
+{ "LTL", 3.45280,  2 },
+{ "HRK", 7.53450,  2 }
 };
 
 for (const auto & i : aConvertTable)

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |6 
+++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dbef922b7ac63c56bd534c1475790198a64131b1
Author: Eike Rathke 
AuthorDate: Mon Jul 11 15:36:44 2022 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 11 16:49:40 2022 +0200

Resolves: tdf#141565 Correct character sequence for Devanagari unique ID

A copy-paste error of the Farsi sequence.

Change-Id: Ib19f97f0bc3bf018d659f8e998d0daa71e1d5c24
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/136958
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index bb1303ad8844..64325b43ca6f 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -63,9 +63,9 @@
 #define S_FA_THREE "\xDB\xB3"
 
 // Indic Devanagari
-#define S_HI_ONE "\xDB\xB1"
-#define S_HI_TWO "\xDB\xB2"
-#define S_HI_THREE "\xDB\xB3"
+#define S_HI_ONE "\xE0\xA5\xA7"
+#define S_HI_TWO "\xE0\xA5\xA8"
+#define S_HI_THREE "\xE0\xA5\xA9"
 
 // Chicago footnote symbols
 #define S_DAGGER "\xE2\x80\xA0"

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/transliteration/transliteration_body.cxx |   18 +++
 1 file changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 636a22ffd7769c5f31844e66579c78928434df81
Author: Noel Grandin 
AuthorDate: Wed Jun 15 11:28:14 2022 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 15 19:37:53 2022 +0200

use stack buffer in transliterateImpl

Change-Id: I7c3e24f3974dafeb9abb2af9e2a986003af7bfc1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135873
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 605a3bb64284..69ba0c236714 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -121,8 +121,17 @@ Transliteration_body::transliterateImpl(
 // Yes, on massive use even such small things do count.
 if ( pOffset )
 {
-std::vector aVec;
-aVec.reserve(std::max(nLocalBuf, nCount) * NMAPPINGMAX);
+sal_Int32* offsetData;
+std::unique_ptr pOffsetHeapBuf;
+sal_Int32 nOffsetCount = std::max(nLocalBuf, nCount);
+if (nOffsetCount <= nLocalBuf)
+offsetData = static_cast(alloca(nOffsetCount * 
NMAPPINGMAX * sizeof(sal_Int32)));
+else
+{
+pOffsetHeapBuf.reset(new sal_Int32[ nOffsetCount * NMAPPINGMAX ]);
+offsetData = pOffsetHeapBuf.get();
+}
+sal_Int32* offsetDataEnd = offsetData;
 
 for (sal_Int32 i = 0; i < nCount; i++)
 {
@@ -130,12 +139,13 @@ Transliteration_body::transliterateImpl(
 MappingType nTmpMappingType = lcl_getMappingTypeForToggleCase( 
nMappingType, in[i] );
 
 const i18nutil::Mapping  = i18nutil::casefolding::getValue( 
in, i, nCount, aLocale, nTmpMappingType );
-std::fill_n(std::back_inserter(aVec), map.nmap, i + startPos);
+std::fill_n(offsetDataEnd, map.nmap, i + startPos);
+offsetDataEnd += map.nmap;
 std::copy_n(map.map, map.nmap, out + j);
 j += map.nmap;
 }
 
-*pOffset = comphelper::containerToSequence(aVec);
+*pOffset = css::uno::Sequence< sal_Int32 >(offsetData, offsetDataEnd - 
offsetData);
 }
 else
 {

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/transliteration/transliterationImpl.cxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 06c3bd93379053862e57221a550e4e07129bff49
Author: Noel Grandin 
AuthorDate: Wed Jun 15 11:27:58 2022 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 15 19:37:25 2022 +0200

unnecessary realloc

the transliterate functions will realloc the Sequence, no need to do it
here

Change-Id: Ia53e79b7586679b5c8a2a47c11b86e336195a4cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135872
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index d397279435ce..dc9e5a234e5b 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -295,8 +295,6 @@ TransliterationImpl::transliterate( const OUString& inStr, 
sal_Int32 startPos, s
 if (numCascade == 0)
 return inStr;
 
-if (offset.getLength() != nCount)
-offset.realloc(nCount);
 if (numCascade == 1)
 {
 if ( startPos == 0 && nCount == inStr.getLength() )

[Libreoffice-commits] core.git: i18npool/source

[Stephan Bergmann (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 6400c23d6a37617f92dbe4f514c0691e4e50fa05
Author: Stephan Bergmann 
AuthorDate: Tue Apr 12 10:23:10 2022 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Apr 12 11:50:35 2022 +0200

Pick better type for a variable

Change-Id: I30916b188c7f8de06aec0719e79aa134a3250aef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132890
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 0f5c74f8bd56..01f2382713db 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -669,7 +670,7 @@ OUString 
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 { std::u16string_view(u"title"), TITLE }
 };
 
-sal_Int32 nStripCase = 0;
+std::size_t nStripCase = 0;
 size_t nCasing;
 for (nCasing = 0; nCasing < SAL_N_ELEMENTS(Casings); ++nCasing)
 {
@@ -680,7 +681,7 @@ OUString 
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 }
 }
 
-if (nStripCase > 0 && 
(static_cast(rNativeNumberParams.size()) == nStripCase ||
+if (nStripCase > 0 && (rNativeNumberParams.size() == nStripCase ||
 rNativeNumberParams[nStripCase++] == ' '))
 {
 OUString aStr = getNumberText(rLocale, aNumberString, 
rNativeNumberParams.substr(nStripCase));

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/data/an_ES.xml |4 ++--
 i18npool/source/localedata/data/es_AR.xml |4 ++--
 i18npool/source/localedata/data/es_BO.xml |4 ++--
 i18npool/source/localedata/data/es_CL.xml |4 ++--
 i18npool/source/localedata/data/es_CO.xml |4 ++--
 i18npool/source/localedata/data/es_CR.xml |4 ++--
 i18npool/source/localedata/data/es_DO.xml |4 ++--
 i18npool/source/localedata/data/es_EC.xml |4 ++--
 i18npool/source/localedata/data/es_ES.xml |4 ++--
 i18npool/source/localedata/data/es_GT.xml |4 ++--
 i18npool/source/localedata/data/es_PE.xml |4 ++--
 11 files changed, 22 insertions(+), 22 deletions(-)

New commits:
commit d582bc9735022996a317ed661388621edabf78cc
Author: Julien Nabet 
AuthorDate: Thu Feb 10 17:46:37 2022 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 13 09:49:30 2022 +0100

tdf#147343: Wrong typo for AM/PM indicator in Spanish locales

Change-Id: I0cc077a94b6f11f67436981033e024e3097c635a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129793
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/data/an_ES.xml 
b/i18npool/source/localedata/data/an_ES.xml
index f6063c06e206..217acd57ddc4 100644
--- a/i18npool/source/localedata/data/an_ES.xml
+++ b/i18npool/source/localedata/data/an_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a. m.
-p. m.
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_AR.xml 
b/i18npool/source/localedata/data/es_AR.xml
index 84cc34e3bb70..60473d5cd289 100644
--- a/i18npool/source/localedata/data/es_AR.xml
+++ b/i18npool/source/localedata/data/es_AR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_BO.xml 
b/i18npool/source/localedata/data/es_BO.xml
index 317ab9406abc..9d9a13047f11 100644
--- a/i18npool/source/localedata/data/es_BO.xml
+++ b/i18npool/source/localedata/data/es_BO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CL.xml 
b/i18npool/source/localedata/data/es_CL.xml
index 3b1605b98ed3..95a865b0589c 100644
--- a/i18npool/source/localedata/data/es_CL.xml
+++ b/i18npool/source/localedata/data/es_CL.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CO.xml 
b/i18npool/source/localedata/data/es_CO.xml
index f7962ec6f169..cca72c41d169 100644
--- a/i18npool/source/localedata/data/es_CO.xml
+++ b/i18npool/source/localedata/data/es_CO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_CR.xml 
b/i18npool/source/localedata/data/es_CR.xml
index 23c204fac6c8..d0e33e911d26 100644
--- a/i18npool/source/localedata/data/es_CR.xml
+++ b/i18npool/source/localedata/data/es_CR.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_DO.xml 
b/i18npool/source/localedata/data/es_DO.xml
index 446219719b8a..5c80546c89b9 100644
--- a/i18npool/source/localedata/data/es_DO.xml
+++ b/i18npool/source/localedata/data/es_DO.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_EC.xml 
b/i18npool/source/localedata/data/es_EC.xml
index eea5b1b73173..df07087a1740 100644
--- a/i18npool/source/localedata/data/es_EC.xml
+++ b/i18npool/source/localedata/data/es_EC.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_ES.xml 
b/i18npool/source/localedata/data/es_ES.xml
index 15b25d937aab..c9c99979f748 100644
--- a/i18npool/source/localedata/data/es_ES.xml
+++ b/i18npool/source/localedata/data/es_ES.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-AM
-PM
+a. m.
+p. m.
 metric
   
   
diff --git a/i18npool/source/localedata/data/es_GT.xml 
b/i18npool/source/localedata/data/es_GT.xml
index 5ef3985d0d30..9332399a75b8 100644
--- a/i18npool/source/localedata/data/es_GT.xml
+++ b/i18npool/source/localedata/data/es_GT.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   
diff --git a/i18npool/source/localedata/data/es_PE.xml 
b/i18npool/source/localedata/data/es_PE.xml
index cf50595b913f..f1bfd15f1bef 100644
--- a/i18npool/source/localedata/data/es_PE.xml
+++ b/i18npool/source/localedata/data/es_PE.xml
@@ -47,8 +47,8 @@
   “
   ”
 
-a.m.
-p.m.
+a. m.
+p. m.
 Metric
   
   

[Libreoffice-commits] core.git: i18npool/source

[Jan-Marek Glogowski (via logerrit)]

 i18npool/source/transliteration/textToPronounce_zh.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9db03b879b912d79060ab06f03a54d4a59e6ac65
Author: Jan-Marek Glogowski 
AuthorDate: Wed Feb 9 20:49:03 2022 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Thu Feb 10 14:03:50 2022 +0100

i18npool: fix wrong static function symbols

I build a full-language WASM build and the WASM linker was
complaining about mismatching function signatures for
get_zh_zhuyin and get_zh_pinyin.

Turns out LO has two exported functions with the same name
but different signatures. For a static build, these collator
functions are renamed, so they don't clash, and this was
silently calling the wrong functions from
i18npool/source/indexentry.

Change-Id: I6afe1c3a289dfccea5a5fec41a9a6db37f4e19bb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129741
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/i18npool/source/transliteration/textToPronounce_zh.cxx 
b/i18npool/source/transliteration/textToPronounce_zh.cxx
index ad33bdf31dca..7848c935cfab 100644
--- a/i18npool/source/transliteration/textToPronounce_zh.cxx
+++ b/i18npool/source/transliteration/textToPronounce_zh.cxx
@@ -126,8 +126,8 @@ TextToPronounce_zh::equals( const OUString & str1, 
sal_Int32 pos1, sal_Int32 nCo
 
 extern "C" {
 
-sal_uInt16** get_zh_zhuyin();
-sal_uInt16** get_zh_pinyin();
+sal_uInt16** get_collator_data_zh_zhuyin();
+sal_uInt16** get_collator_data_zh_pinyin();
 
 }
 
@@ -137,7 +137,7 @@ TextToPinyin_zh_CN::TextToPinyin_zh_CN() :
 #ifndef DISABLE_DYNLOADING
 TextToPronounce_zh("get_zh_pinyin")
 #else
-TextToPronounce_zh(get_zh_pinyin)
+TextToPronounce_zh(get_collator_data_zh_pinyin)
 #endif
 {
 transliterationName = "ChineseCharacterToPinyin";
@@ -148,7 +148,7 @@ TextToChuyin_zh_TW::TextToChuyin_zh_TW() :
 #ifndef DISABLE_DYNLOADING
 TextToPronounce_zh("get_zh_zhuyin")
 #else
-TextToPronounce_zh(get_zh_zhuyin)
+TextToPronounce_zh(get_collator_data_zh_zhuyin)
 #endif
 {
 transliterationName = "ChineseCharacterToChuyin";

[Libreoffice-commits] core.git: i18npool/source

[Kevin Suo (via logerrit)]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   10 
++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 24e6217c0abdaed703a077e77881ad6e8b4f6f0e
Author: Kevin Suo 
AuthorDate: Sat Jan 29 16:35:12 2022 +0800
Commit: Eike Rathke 
CommitDate: Mon Feb 7 18:52:40 2022 +0100

tdf#77803: Use NATNUM12 and NATNUM4 for Chinese Numberring

For Chinese, format code NATNUM7 and NATNUM8 are "short lower
case text" and "short upper case text", respectively, see [1].
We need full lower and full upper here for numbering purpose, not
"short" form. E.g. for number 100, we need "一百" (lower case)
and "壹佰" (upper case), rather than "百" which is in short form.

Use NATNUM12 for chinese lower, and NATNUM5 for Chinese upper.
See bug 147054 for the reason why we do not use NATNUM4 for Chinese lower.

[1] https://help.libreoffice.org/latest/en-US/text/shared/01/05020301.html

Change-Id: I69c93d62f1026117a6d403ade63a9abfbe5c73f4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/129143
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index 831b502a2771..bb1303ad8844 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -752,15 +752,15 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/list-locales.awk |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit fbdea6633be4c613b73278006f030c87440731aa
Author: Eike Rathke 
AuthorDate: Fri Jan 21 00:06:53 2022 +0100
Commit: Eike Rathke 
CommitDate: Fri Jan 21 03:06:41 2022 +0100

Output full non-iso locale names, not just language_script

Change-Id: I3639dfff2da10afd711be37b6bfede44266c307f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128713
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/list-locales.awk 
b/i18npool/source/localedata/data/list-locales.awk
old mode 100644
new mode 100755
index b8a7f73f14de..52f02ba64986
--- a/i18npool/source/localedata/data/list-locales.awk
+++ b/i18npool/source/localedata/data/list-locales.awk
@@ -83,8 +83,14 @@ function printEntry() {
 tmp = file
 gsub( /.*\//, "", tmp )
 gsub( /\.xml/, "", tmp )
-split( tmp, iso, /_/ )
-if ( iso[2] )
+n = split( tmp, iso, /_/ )
+if ( n > 2 )
+{
+if (length(iso[1]) == 2)
+printf(" ")
+printf( "%s: %s - %s\n", tmp, language, country )
+}
+else if ( n == 2 )
 printf( "%3s_%2s: %s - %s\n", iso[1], iso[2], language, country )
 else
 printf( "%3s %2s: %s   %s\n", iso[1], iso[2], language, country )

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/localedata.cxx |7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 1dc917b86cc1ae68dd9469e89c6f6aa2f9da5347
Author: Noel Grandin 
AuthorDate: Sat Dec 18 20:45:05 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Dec 20 17:52:48 2021 +0100

osl::Mutex->std::mutex in lcl_LookupTableHelper

Change-Id: I76989e1f52be35fad63a090809da950ceed8fc69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127113
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index c85476e01231..acb0f781f863 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -18,6 +18,7 @@
  */
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -475,7 +476,7 @@ public:
 std::optional& rOutCachedItem );
 
 private:
-::osl::Mutex maMutex;
+std::mutex maMutex;
 ::std::vector< LocaleDataLookupTableItem >  maLookupTable;
 };
 
@@ -525,7 +526,7 @@ oslGenericFunction 
lcl_LookupTableHelper::getFunctionSymbolByName(
 {
 #ifndef DISABLE_DYNLOADING
 {
-::osl::MutexGuard aGuard( maMutex );
+std::unique_lock aGuard( maMutex );
 for (LocaleDataLookupTableItem & rCurrent : maLookupTable)
 {
 if (rCurrent.dllName == i.pLib)
@@ -550,7 +551,7 @@ oslGenericFunction 
lcl_LookupTableHelper::getFunctionSymbolByName(
 std::unique_ptr module(new osl::Module());
 if ( module->loadRelative(, sModuleName.getStr()) )
 {
-::osl::MutexGuard aGuard( maMutex );
+std::unique_lock aGuard( maMutex );
 auto pTmpModule = module.get();
 maLookupTable.emplace_back(i.pLib, module.release(), 
i.pLocale);
 rOutCachedItem.emplace( maLookupTable.back() );

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/localedata.cxx |   44 ++
 1 file changed, 16 insertions(+), 28 deletions(-)

New commits:
commit 24ea26f55ee4e8a3c69b6dc9911a8c42e56f1eb2
Author: Noel Grandin 
AuthorDate: Sat Dec 18 20:38:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Mon Dec 20 11:00:27 2021 +0100

pass by ref in lcl_LookupTableStatic

rather than passing by pointer and then asserting that the
pointer is not null

Change-Id: I8df464ca2ae770ab343417fe1b15c378c88110d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127111
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 6b02040efc0a..666858fcb3cf 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -488,7 +488,7 @@ public:
 
 oslGenericFunction getFunctionSymbolByName(
 const OUString& localeName, const char* pFunction,
-std::unique_ptr* pOutCachedItem );
+std::unique_ptr& rOutCachedItem );
 
 private:
 ::osl::Mutex maMutex;
@@ -519,7 +519,7 @@ lcl_LookupTableHelper::~lcl_LookupTableHelper()
 
 oslGenericFunction lcl_LookupTableHelper::getFunctionSymbolByName(
 const OUString& localeName, const char* pFunction,
-std::unique_ptr* pOutCachedItem )
+std::unique_ptr& rOutCachedItem )
 {
 OUString aFallback;
 bool bFallback = (localeName.indexOf( cUnder) < 0);
@@ -546,18 +546,12 @@ oslGenericFunction 
lcl_LookupTableHelper::getFunctionSymbolByName(
 {
 if (rCurrent.dllName == i.pLib)
 {
-OSL_ASSERT( pOutCachedItem );
-if( pOutCachedItem )
-{
-(*pOutCachedItem).reset(new 
LocaleDataLookupTableItem( rCurrent ));
-(*pOutCachedItem)->localeName = i.pLocale;
-OString sSymbolName = OString::Concat(pFunction) + 
"_" +
-(*pOutCachedItem)->localeName;
-return 
(*pOutCachedItem)->module->getFunctionSymbol(
-sSymbolName.getStr());
-}
-else
-return nullptr;
+rOutCachedItem.reset(new LocaleDataLookupTableItem( 
rCurrent ));
+rOutCachedItem->localeName = i.pLocale;
+OString sSymbolName = OString::Concat(pFunction) + "_" 
+
+rOutCachedItem->localeName;
+return rOutCachedItem->module->getFunctionSymbol(
+sSymbolName.getStr());
 }
 }
 }
@@ -575,20 +569,14 @@ oslGenericFunction 
lcl_LookupTableHelper::getFunctionSymbolByName(
 ::osl::MutexGuard aGuard( maMutex );
 auto pTmpModule = module.get();
 maLookupTable.emplace_back(i.pLib, module.release(), 
i.pLocale);
-OSL_ASSERT( pOutCachedItem );
-if( pOutCachedItem )
-{
-pOutCachedItem->reset(new LocaleDataLookupTableItem( 
maLookupTable.back() ));
-OString sSymbolName = OString::Concat(pFunction) + "_" + 
(*pOutCachedItem)->localeName;
-return pTmpModule->getFunctionSymbol(sSymbolName.getStr());
-}
-else
-return nullptr;
+rOutCachedItem.reset(new LocaleDataLookupTableItem( 
maLookupTable.back() ));
+OString sSymbolName = OString::Concat(pFunction) + "_" + 
rOutCachedItem->localeName;
+return pTmpModule->getFunctionSymbol(sSymbolName.getStr());
 }
 else
 module.reset();
 #else
-(void) pOutCachedItem;
+(void) rOutCachedItem;
 
 if( strcmp(pFunction, "getAllCalendars") == 0 )
 return i.getAllCalendars;
@@ -1452,13 +1440,13 @@ oslGenericFunction LocaleDataImpl::getFunctionSymbol( 
const Locale& rLocale, con
 // Load function with name __ or _ and
 // fallbacks.
 pSymbol = rLookupTable.getFunctionSymbolByName( 
LocaleDataImpl::getFirstLocaleServiceName( rLocale),
-pFunction, );
+pFunction, pCachedItem);
 if (!pSymbol)
 {
 ::std::vector< OUString > aFallbacks( 
LocaleDataImpl::getFallbackLocaleServiceNames( rLocale));
 for (const auto& rFallback : aFallbacks)
 {
-pSymbol = rLookupTable.getFunctionSymbolByName(rFallback, 
pFunction, );
+pSymbol = rLookupTable.getFunctionSymbolByName(rFallback, 
pFunction, pCachedItem);
 if (pSymbol)
 break;
 }
@@ -1466,7 +1454,7 @@ oslGenericFunction 

[Libreoffice-commits] core.git: i18npool/source

[Kevin Suo (via logerrit)]

 i18npool/source/localedata/data/zh_CN.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 918b62bea6cf82ce952c8d225dcabd4d08a2abf7
Author: Kevin Suo 
AuthorDate: Fri Nov 19 16:13:09 2021 +0800
Commit: Eike Rathke 
CommitDate: Sat Nov 20 23:09:40 2021 +0100

Change aboveWord and belowWord for Simplified Chinese locale

Per Wechat discussion by our Simplified Chinese l10n team.

上方 and 下方 are written languages which are more suitable for
cross-reference context, while 上面 and 下面 are spoken languages.
Also in this way they are consistent with MS Word.

Change-Id: Iccf8c330b2e5a04be3916b810a29ea0d62f26225
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125533
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/zh_CN.xml 
b/i18npool/source/localedata/data/zh_CN.xml
index 814c6db9ba48..1f33090d0ced 100644
--- a/i18npool/source/localedata/data/zh_CN.xml
+++ b/i18npool/source/localedata/data/zh_CN.xml
@@ -418,8 +418,8 @@
   第2季度
   第3季度
   第4季度
-  上面
-  下面
+  上方
+  下方
   Q1
   Q2
   Q3

[Libreoffice-commits] core.git: i18npool/source

[Mihail Balabanov (via logerrit)]

 i18npool/source/localedata/data/bg_BG.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 7193ed4401e98a6b5154d4718a3ca4761fe28c45
Author: Mihail Balabanov 
AuthorDate: Sun Nov 7 17:03:20 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat Nov 20 23:02:33 2021 +0100

Fix the above/below words for Bulgarian

Change-Id: Ib81da535411b07596785b06d7a5dac36a8a2ee28
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124704
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/bg_BG.xml 
b/i18npool/source/localedata/data/bg_BG.xml
index 78dc17cc22b1..7cf84513bc77 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -355,8 +355,8 @@
   2-ро тримесечие
   3-то тримесечие
   4-то тримесечие
-  над
-  под
+  по-горе
+  по-долу
   1. трим.
   2. трим.
   3. трим.

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/localedata/localedata.cxx   |   12 +++-
 i18npool/source/transliteration/transliterationImpl.cxx |5 ++---
 2 files changed, 9 insertions(+), 8 deletions(-)

New commits:
commit 8b98f44b9643bdd873919185a617f530c04203e1
Author: Noel Grandin 
AuthorDate: Wed Nov 10 18:09:11 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 11 15:49:33 2021 +0100

rtl::Static to thread-safe static

Change-Id: I98909614d4a8d4317867036678c7202e28dcf285
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125001
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 5e8f1dee2f79..4caa7a05176a 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -31,7 +31,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 namespace com::sun::star::uno { class XComponentContext; }
@@ -505,8 +504,11 @@ private:
 // locking pattern correctly.
 // usage:  lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
 // retrieves the singleton lookup table instance
-struct lcl_LookupTableStatic : public ::rtl::Static< lcl_LookupTableHelper, 
lcl_LookupTableStatic >
-{};
+lcl_LookupTableHelper& lcl_LookupTableStatic()
+{
+static lcl_LookupTableHelper SINGLETON;
+return SINGLETON;
+}
 
 lcl_LookupTableHelper::lcl_LookupTableHelper()
 {
@@ -1439,7 +1441,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const 
lang::Locale& rLocale )
 
 oslGenericFunction LocaleDataImpl::getFunctionSymbol( const Locale& rLocale, 
const char* pFunction )
 {
-lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic::get();
+lcl_LookupTableHelper & rLookupTable = lcl_LookupTableStatic();
 
 if (cachedItem && cachedItem->equals(rLocale))
 {
@@ -1496,7 +1498,7 @@ LocaleDataImpl::getAllInstalledLocaleNames()
 // Check if the locale is really available and not just in the table,
 // don't allow fall backs.
 std::unique_ptr pCachedItem;
-if (lcl_LookupTableStatic::get().getFunctionSymbolByName( name, 
"getLocaleItem",  )) {
+if (lcl_LookupTableStatic().getFunctionSymbolByName( name, 
"getLocaleItem",  )) {
 if( pCachedItem )
 cachedItem = std::move( pCachedItem );
 seqRange[nInstalled++] = LanguageTag::convertToLocale( 
name.replace( cUnder, cHyphen), false);
diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index 54305126c640..09e791c33e71 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -27,7 +27,6 @@
 
 #include 
 #include 
-#include 
 #include 
 
 #include 
@@ -582,13 +581,13 @@ namespace
 OUString Name;
 css::uno::Reference< css::i18n::XExtendedTransliteration > Body;
 };
-class theTransBodyMutex : public rtl::Static {};
 }
 
 void TransliterationImpl::loadBody( OUString const , 
Reference& body )
 {
 assert(!implName.isEmpty());
-::osl::MutexGuard guard(theTransBodyMutex::get());
+static osl::Mutex transBodyMutex;
+::osl::MutexGuard guard(transBodyMutex);
 static TransBody lastTransBody;
 if (implName != lastTransBody.Name)
 {

[Libreoffice-commits] core.git: i18npool/source

[Jan-Marek Glogowski (via logerrit)]

 i18npool/source/registerservices/registerservices.cxx |  437 +++---
 1 file changed, 176 insertions(+), 261 deletions(-)

New commits:
commit b34a8f977cf043153dd56a7f83b25e0b11b7a523
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 28 13:10:37 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Mon Nov 1 13:34:45 2021 +0100

Group per-locale functions instead by type

... and also sort them.

Gets rid of a lot of #ifdef cpp macro lines.

Also unifies the macros as "MACRO( id )" for easier readability.

Additionally drops the "// add here new services !!" comment at
the end of the transliteration instance list, as items were added
all other the place in various patches.

Change-Id: I040b3b0952ec2aef2d1d10e7282cfd11afa6b702
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124441
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/i18npool/source/registerservices/registerservices.cxx 
b/i18npool/source/registerservices/registerservices.cxx
index f382caadd038..18695c70a443 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -104,219 +104,154 @@ i18npool_##ImplName##_get_implementation( \
 // -Wl,--gc_sections. It's mainly for iOS and Android that the
 // --with-locales option is intended anyway.
 
-IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier )
-IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier_asian )
-#if WITH_LOCALE_ALL || WITH_LOCALE_ja
-IMPL_UNO_CONSTRUCTOR_CTX( 
IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_syllable )
-IMPL_UNO_CONSTRUCTOR_CTX( 
IndexEntrySupplier_ja_phonetic_alphanumeric_first_by_consonant )
-IMPL_UNO_CONSTRUCTOR_CTX( 
IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_syllable )
-IMPL_UNO_CONSTRUCTOR_CTX( 
IndexEntrySupplier_ja_phonetic_alphanumeric_last_by_consonant )
-#endif
-IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier_Unicode )
-IMPL_UNO_CONSTRUCTOR_CTX( CalendarImpl )
+IMPL_CREATEINSTANCE( ignoreDiacritics_CTL )
+IMPL_CREATEINSTANCE( ignoreKashida_CTL )
+IMPL_CREATEINSTANCE( NumToCharIndic_ar )
+IMPL_CREATEINSTANCE( NumToTextCircledNumber )
+IMPL_CREATEINSTANCE( Transliteration_l2u )
+IMPL_CREATEINSTANCE( Transliteration_sentencecase )
+IMPL_CREATEINSTANCE( Transliteration_titlecase )
+IMPL_CREATEINSTANCE( Transliteration_togglecase )
+IMPL_CREATEINSTANCE( Transliteration_u2l )
+IMPL_UNO_CONSTRUCTOR( Calendar_buddhist )
+IMPL_UNO_CONSTRUCTOR( Calendar_dangi )
+IMPL_UNO_CONSTRUCTOR( Calendar_gengou )
 IMPL_UNO_CONSTRUCTOR( Calendar_gregorian )
 IMPL_UNO_CONSTRUCTOR( Calendar_hanja )
 IMPL_UNO_CONSTRUCTOR( Calendar_hanja_yoil )
-IMPL_UNO_CONSTRUCTOR( Calendar_gengou )
-IMPL_UNO_CONSTRUCTOR( Calendar_ROC )
-IMPL_UNO_CONSTRUCTOR( Calendar_dangi )
 IMPL_UNO_CONSTRUCTOR( Calendar_hijri )
 IMPL_UNO_CONSTRUCTOR( Calendar_jewish )
-IMPL_UNO_CONSTRUCTOR( Calendar_buddhist )
-#if WITH_LOCALE_ALL || WITH_LOCALE_ja
-IMPL_UNO_CONSTRUCTOR( BreakIterator_ja )
-#endif
-#if WITH_LOCALE_ALL || WITH_LOCALE_zh
-IMPL_UNO_CONSTRUCTOR( BreakIterator_zh )
-IMPL_UNO_CONSTRUCTOR( BreakIterator_zh_TW )
-#endif
-#if WITH_LOCALE_ALL || WITH_LOCALE_ko
-IMPL_UNO_CONSTRUCTOR( BreakIterator_ko )
-#endif
-#if WITH_LOCALE_ALL || WITH_LOCALE_th
-IMPL_UNO_CONSTRUCTOR( BreakIterator_th )
-#endif
-IMPL_UNO_CONSTRUCTOR_CTX( ChapterCollator )
+IMPL_UNO_CONSTRUCTOR( Calendar_ROC )
+IMPL_UNO_CONSTRUCTOR( CharToNumEastIndic_ar )
+IMPL_UNO_CONSTRUCTOR( CharToNumIndic_ar )
 IMPL_UNO_CONSTRUCTOR( Collator_Unicode )
+IMPL_UNO_CONSTRUCTOR_CTX( CalendarImpl )
+IMPL_UNO_CONSTRUCTOR_CTX( ChapterCollator )
+IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier )
+IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier_asian )
+IMPL_UNO_CONSTRUCTOR_CTX( IndexEntrySupplier_Unicode )
+IMPL_UNO_CONSTRUCTOR( NumToCharEastIndic_ar )
 
-#if WITH_LOCALE_ALL || WITH_LOCALE_th
-IMPL_UNO_CONSTRUCTOR( InputSequenceChecker_th )
-#endif
 #if WITH_LOCALE_ALL || WITH_LOCALE_hi
+IMPL_CREATEINSTANCE( NumToCharIndic_hi )
+IMPL_UNO_CONSTRUCTOR( CharToNumIndic_hi )
 IMPL_UNO_CONSTRUCTOR( InputSequenceChecker_hi )
 #endif
-#if WITH_LOCALE_ALL || WITH_LOCALE_ko
-IMPL_UNO_CONSTRUCTOR_CTX( TextConversion_ko )
-#endif
-#if WITH_LOCALE_ALL || WITH_LOCALE_zh
-IMPL_UNO_CONSTRUCTOR_CTX( TextConversion_zh )
-#endif
 
-IMPL_CREATEINSTANCE( Transliteration_u2l )
-IMPL_CREATEINSTANCE( Transliteration_l2u )
-IMPL_CREATEINSTANCE( Transliteration_sentencecase )
-IMPL_CREATEINSTANCE( Transliteration_titlecase )
-IMPL_CREATEINSTANCE( Transliteration_togglecase )
 #if WITH_LOCALE_ALL || WITH_LOCALE_ja
-IMPL_CREATEINSTANCE( hiraganaToKatakana )
-IMPL_CREATEINSTANCE( katakanaToHiragana )
 IMPL_CREATEINSTANCE( fullwidthToHalfwidth )
 IMPL_CREATEINSTANCE( halfwidthToFullwidth )
-#endif
-
-#if WITH_LOCALE_ALL || WITH_LOCALE_ja
-IMPL_CREATEINSTANCE( smallToLarge_ja_JP)
-IMPL_CREATEINSTANCE( largeToSmall_ja_JP)
-IMPL_CREATEINSTANCE( ignoreTraditionalKanji_ja_JP)
-IMPL_CREATEINSTANCE( ignoreTraditionalKana_ja_JP)

[Libreoffice-commits] core.git: i18npool/source

[Jan-Marek Glogowski (via logerrit)]

 i18npool/source/registerservices/registerservices.cxx |   32 ++
 1 file changed, 32 insertions(+)

New commits:
commit b8d17d754830ab57099dcdfa72a96bfad404ab1a
Author: Jan-Marek Glogowski 
AuthorDate: Thu Oct 28 12:48:19 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Sun Oct 31 22:36:29 2021 +0100

Prevent many -Wunused-function in i18npool service

... registration.

Change-Id: Ice406aa6e8817b4281cc3905d2ba2703ce482c18
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124440
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/i18npool/source/registerservices/registerservices.cxx 
b/i18npool/source/registerservices/registerservices.cxx
index 878fc3c3de50..f382caadd038 100644
--- a/i18npool/source/registerservices/registerservices.cxx
+++ b/i18npool/source/registerservices/registerservices.cxx
@@ -157,11 +157,14 @@ IMPL_CREATEINSTANCE( Transliteration_l2u )
 IMPL_CREATEINSTANCE( Transliteration_sentencecase )
 IMPL_CREATEINSTANCE( Transliteration_titlecase )
 IMPL_CREATEINSTANCE( Transliteration_togglecase )
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( hiraganaToKatakana )
 IMPL_CREATEINSTANCE( katakanaToHiragana )
 IMPL_CREATEINSTANCE( fullwidthToHalfwidth )
 IMPL_CREATEINSTANCE( halfwidthToFullwidth )
+#endif
 
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( smallToLarge_ja_JP)
 IMPL_CREATEINSTANCE( largeToSmall_ja_JP)
 IMPL_CREATEINSTANCE( ignoreTraditionalKanji_ja_JP)
@@ -180,27 +183,40 @@ IMPL_CREATEINSTANCE( ignoreSize_ja_JP)
 IMPL_CREATEINSTANCE( ignoreProlongedSoundMark_ja_JP)
 IMPL_CREATEINSTANCE( ignoreMiddleDot_ja_JP)
 IMPL_CREATEINSTANCE( ignoreSpace_ja_JP)
+#endif
 IMPL_CREATEINSTANCE( ignoreDiacritics_CTL)
 IMPL_CREATEINSTANCE( ignoreKashida_CTL)
 
+#if WITH_LOCALE_ALL || WITH_LOCALE_zh
 IMPL_CREATEINSTANCE( TextToChuyin_zh_TW )
 IMPL_CREATEINSTANCE( TextToPinyin_zh_CN )
+#endif
 
+#if WITH_LOCALE_ALL || WITH_LOCALE_zh
 IMPL_CREATEINSTANCE( NumToCharLower_zh_CN )
 IMPL_CREATEINSTANCE( NumToCharUpper_zh_CN )
 IMPL_CREATEINSTANCE( NumToCharLower_zh_TW )
 IMPL_CREATEINSTANCE( NumToCharUpper_zh_TW )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( NumToCharHalfwidth )
 IMPL_CREATEINSTANCE( NumToCharFullwidth )
 IMPL_CREATEINSTANCE( NumToCharKanjiShort_ja_JP )
 IMPL_CREATEINSTANCE( NumToCharKanjiTraditional_ja_JP )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ko
 IMPL_CREATEINSTANCE( NumToCharHangul_ko )
 IMPL_CREATEINSTANCE( NumToCharLower_ko )
 IMPL_CREATEINSTANCE( NumToCharUpper_ko )
+#endif
 IMPL_CREATEINSTANCE( NumToCharIndic_ar )
 IMPL_UNO_CONSTRUCTOR( NumToCharEastIndic_ar )
+#if WITH_LOCALE_ALL || WITH_LOCALE_hi
 IMPL_CREATEINSTANCE( NumToCharIndic_hi )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_th
 IMPL_CREATEINSTANCE( NumToChar_th )
+#endif
 
 #if WITH_LOCALE_ALL || WITH_LOCALE_zh
 IMPL_UNO_CONSTRUCTOR (CharToNumUpper_zh_CN)
@@ -235,12 +251,18 @@ IMPL_UNO_CONSTRUCTOR( NumToTextUpper_zh_TW )
 IMPL_UNO_CONSTRUCTOR( NumToTextFullwidth_zh_CN )
 IMPL_UNO_CONSTRUCTOR( NumToTextFullwidth_zh_TW )
 #endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( NumToTextFullwidth_ja_JP )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ko
 IMPL_CREATEINSTANCE( NumToTextFullwidth_ko )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( NumToTextKanjiLongModern_ja_JP )
 IMPL_CREATEINSTANCE( NumToTextKanjiLongTraditional_ja_JP )
 IMPL_CREATEINSTANCE( NumToTextKanjiShortModern_ja_JP )
 IMPL_CREATEINSTANCE( NumToTextKanjiShortTraditional_ja_JP )
+#endif
 #if WITH_LOCALE_ALL || WITH_LOCALE_ko
 IMPL_UNO_CONSTRUCTOR (NumToTextInformalHangul_ko)
 IMPL_UNO_CONSTRUCTOR (NumToTextInformalLower_ko)
@@ -250,20 +272,28 @@ IMPL_UNO_CONSTRUCTOR (NumToTextFormalLower_ko)
 IMPL_UNO_CONSTRUCTOR (NumToTextFormalUpper_ko)
 #endif
 
+#if WITH_LOCALE_ALL || WITH_LOCALE_zh
 IMPL_CREATEINSTANCE( TextToNumLower_zh_CN )
 IMPL_CREATEINSTANCE( TextToNumUpper_zh_CN )
 IMPL_CREATEINSTANCE( TextToNumLower_zh_TW )
 IMPL_CREATEINSTANCE( TextToNumUpper_zh_TW )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_CREATEINSTANCE( TextToNumKanjiLongModern_ja_JP )
 IMPL_CREATEINSTANCE( TextToNumKanjiLongTraditional_ja_JP )
+#endif
+#if WITH_LOCALE_ALL || WITH_LOCALE_ko
 IMPL_CREATEINSTANCE( TextToNumFormalHangul_ko )
 IMPL_CREATEINSTANCE( TextToNumFormalLower_ko )
 IMPL_CREATEINSTANCE( TextToNumFormalUpper_ko )
 IMPL_CREATEINSTANCE( TextToNumInformalHangul_ko )
 IMPL_CREATEINSTANCE( TextToNumInformalUpper_ko )
 IMPL_CREATEINSTANCE( TextToNumInformalLower_ko )
+#endif
 
+#if WITH_LOCALE_ALL || WITH_LOCALE_zh
 IMPL_CREATEINSTANCE( NumToTextDate_zh )
+#endif
 #if WITH_LOCALE_ALL || WITH_LOCALE_ja
 IMPL_UNO_CONSTRUCTOR (NumToTextAIUFullWidth_ja_JP)
 IMPL_UNO_CONSTRUCTOR (NumToTextAIUHalfWidth_ja_JP)
@@ -277,8 +307,10 @@ IMPL_UNO_CONSTRUCTOR (NumToTextHangulSyllable_ko)
 IMPL_UNO_CONSTRUCTOR (NumToTextHangulCircledJamo_ko)
 IMPL_UNO_CONSTRUCTOR (NumToTextHangulCircledSyllable_ko)
 #endif
+#if 

[Libreoffice-commits] core.git: i18npool/source

[Mike Kaganski (via logerrit)]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |9 -
 i18npool/source/localedata/LocaleNode.cxx |6 
 i18npool/source/localedata/localedata.cxx |   52 
--
 i18npool/source/nativenumber/nativenumbersupplier.cxx |   69 

 i18npool/source/search/textsearch.cxx |   84 
+-
 i18npool/source/textconversion/textconversion_ko.cxx  |6 
 i18npool/source/textconversion/textconversion_zh.cxx  |   11 -
 i18npool/source/transliteration/textToPronounce_zh.cxx|9 -
 i18npool/source/transliteration/transliterationImpl.cxx   |   18 +-
 i18npool/source/transliteration/transliteration_Numeric.cxx   |   17 +-
 10 files changed, 154 insertions(+), 127 deletions(-)

New commits:
commit 45de43ce9f1441735817fa82924ddc4508d221cd
Author: Mike Kaganski 
AuthorDate: Fri Oct 29 09:46:05 2021 +0300
Commit: Mike Kaganski 
CommitDate: Sat Oct 30 10:55:23 2021 +0200

Prepare for removal of non-const operator[] from Sequence in i18npool

Change-Id: Ib4c59c45098376f2e0a610a8ffefb4af5306bd6d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124372
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index e5d631e3e1e5..831b502a2771 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -1121,11 +1121,12 @@ OUString 
DefaultNumberingProvider::makeNumberingIdentifier(sal_Int16 index)
 OUStringBuffer result;
 Locale aLocale("en", OUString(), OUString());
 Sequence aProperties(2);
-aProperties[0].Name = "NumberingType";
-aProperties[0].Value <<= aSupportedTypes[index].nType;
-aProperties[1].Name = "Value";
+auto aPropertiesRange = asNonConstRange(aProperties);
+aPropertiesRange[0].Name = "NumberingType";
+aPropertiesRange[0].Value <<= aSupportedTypes[index].nType;
+aPropertiesRange[1].Name = "Value";
 for (sal_Int32 j = 1; j <= 3; j++) {
-aProperties[1].Value <<= j;
+aPropertiesRange[1].Value <<= j;
 result.append( makeNumberingString( aProperties, aLocale ) );
 result.append(", ");
 }
diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index 86fc96495bd4..f4c0aaefdc94 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -2364,10 +2364,12 @@ void LCOutlineNumberingLevelNode::generateCode (const 
OFileWriter ) const
 Attr::Attr (const Reference< XAttributeList > & attr) {
 sal_Int16 len = attr->getLength();
 name.realloc (len);
+auto pName = name.getArray();
 value.realloc (len);
+auto pValue = value.getArray();
 for (sal_Int16 i =0; i< len;i++) {
-name[i] = attr->getNameByIndex(i);
-value[i] = attr -> getValueByIndex(i);
+pName[i] = attr->getNameByIndex(i);
+pValue[i] = attr -> getValueByIndex(i);
 }
 }
 
diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 5aecfa32a7fd..5e8f1dee2f79 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -758,6 +758,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale )
 allCalendars = func(calendarsCount);
 
 Sequence< Calendar2 > calendarsSeq(calendarsCount);
+auto calendarsSeqRange = asNonConstRange(calendarsSeq);
 sal_Int16 offset = REF_OFFSET_COUNT;
 for(sal_Int16 i = 0; i < calendarsCount; i++) {
 OUString calendarID(allCalendars[offset]);
@@ -780,7 +781,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale )
 offset++;
 Calendar2 aCalendar(days, months, gmonths, pmonths, eras, 
startOfWeekDay,
 minimalDaysInFirstWeek, defaultCalendar, calendarID);
-calendarsSeq[i] = aCalendar;
+calendarsSeqRange[i] = aCalendar;
 }
 return calendarsSeq;
 }
@@ -812,6 +813,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale )
 sal_Unicode **allCurrencies = func(currencyCount);
 
 Sequence< Currency2 > seq(currencyCount);
+auto seqRange = asNonConstRange(seq);
 for(int i = 0, nOff = 0; i < currencyCount; i++, nOff += 8 ) {
 Currency2 cur(
 OUString(allCurrencies[nOff]), // string ID
@@ -823,7 +825,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale )
 allCurrencies[nOff+6][0],   // short DecimalPlaces
 allCurrencies[nOff+7][0] != 0 // 

[Libreoffice-commits] core.git: i18npool/source

[Luboš Luňák (via logerrit)]

 i18npool/source/breakiterator/xdictionary.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5b38b5744af1e896892df708c16b83e1b551d2c7
Author: Luboš Luňák 
AuthorDate: Fri Oct 29 14:20:57 2021 +0200
Commit: Luboš Luňák 
CommitDate: Fri Oct 29 23:53:19 2021 +0200

fix comparison when searching cache

This made the cache always fail and re-cache, making CJK text layout
slower over time. A mistake from ef513fd4b049b214a03fbe6e that
converted !strcmp() to != instead of ==.

Change-Id: Ib70579cd36d7b1df062e4d067e03f5c65e34b142
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124432
Reviewed-by: Noel Grandin 
Reviewed-by: Luboš Luňák 
Tested-by: Luboš Luňák 

diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 9134fbc4be13..dd1f83f8baa7 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -151,7 +151,7 @@ void xdictionary::initDictionaryData(const char *pLang)
 osl::MutexGuard aGuard( osl::Mutex::getGlobalMutex() );
 for(const datacache & i : aLoadedCache)
 {
-if( i.maLang != pLang )
+if( i.maLang == pLang )
 {
 data = i.maData;
 return;

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/he_IL.xml |  176 --
 1 file changed, 95 insertions(+), 81 deletions(-)

New commits:
commit 607bc9fe13741d034ed2638e70b3ea0429fff039
Author: Eike Rathke 
AuthorDate: Tue Oct 19 21:55:30 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 19 23:01:05 2021 +0200

Related: tdf#145173 Sort he_IL by formatindex and split NatNum to 
LC_FORMAT_1

... keeping all LC_FORMAT as non-NatNum elements and separating
all NatNum into LC_FORMAT_1, to be able to separately inherit
LC_FORMAT.

Change-Id: I42387432205862ca6416e6a3d020a923408c7b8c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123844
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/he_IL.xml 
b/i18npool/source/localedata/data/he_IL.xml
index 277485badef4..171a8851b5fb 100644
--- a/i18npool/source/localedata/data/he_IL.xml
+++ b/i18npool/source/localedata/data/he_IL.xml
@@ -53,57 +53,96 @@
   
   
 D/M
-
-  D/M/YY
+
+  General
 
-
-  NN DD/MMM YY
+
+  0
 
-
-  MM/YY
+
+  0.00
 
-
-  DD MMM
+
+  #,##0
 
-
-  [NatNum2][~jewish]
+
+  #,##0.00
 
-
-  QQ YY
+
+  #,###.00
 
-
-  DD/MM/
+
+  0.00E+000
 
-
-  DD/MM/YY
+
+  0.00E+00
+
+
+  ##0.00E+00
+
+
+  0%
+
+
+  0.00%
+
+  
+  [CURRENCY] #,##0;[CURRENCY] -#,##0
+
+
+  [CURRENCY] #,##0.00;[CURRENCY] -#,##0.00
+
+
+  [CURRENCY] #,##0;[RED][CURRENCY] -#,##0
+
+
+  [CURRENCY] #,##0.00;[RED][CURRENCY] -#,##0.00
+
+
+  #,##0.00 CCC
+
+
+  [CURRENCY] #,##0.--;[RED][CURRENCY] -#,##0.--
+
+
+  D/M/YY
 
 
   DD , 
 
+
+  DD/MM/YY
+
+
+  DD/MM/
+
 
   D MMM, YY
 
 
   D MMM, 
 
+
+  D. MMM. 
+
 
-  [NatNum2][~jewish] YY
+   YY
+
+
+  DD  YY
 
 
   NN, D MMM, YY
 
+
+  NN DD/MMM YY
+
 
-  [NatNum2][~jewish]NN DD  YY
+  NN DD  YY
 
 
   D , 
 
-
-  D. MMM. 
-
-
-  [NatNum2][~jewish]DD  YY
-
 
   DD-MM
 
@@ -114,17 +153,20 @@
   -MM-DD
   ISO 8601
 
-
-  WW
+
+  MM/YY
 
-
-  [NatNum2][~jewish]YY
+
+  DD MMM
 
-
-  [NatNum2][~jewish]NNN DD  YY
+
+  
 
-
-  [NatNum2][~jewish]"יום "NN"׳ "DD  YY
+
+  QQ YY
+
+
+  WW
 
 
   HH:MM
@@ -156,64 +198,36 @@
 
   DD/MM/ HH:MM
 
-
-  General
-
-
-  0
-
-
-  0.00
-
-
-  #,##0
-
-
-  #,##0.00
-
-
-  #,###.00
-
-
-  [natnum1]0
-
-
-  [natnum2]0
-
-  
-  [CURRENCY] #,##0;[CURRENCY] -#,##0
-
-
-  [CURRENCY] #,##0.00;[CURRENCY] -#,##0.00
+  
+  
+
+  [NatNum1]0
 
-
-  [CURRENCY] #,##0;[RED][CURRENCY] -#,##0
+
+  [NatNum2]0
 
-
-  [CURRENCY] #,##0.00;[RED][CURRENCY] -#,##0.00
-
-
-  #,##0.00 CCC
+
+  [NatNum2][~jewish] YY
 
-
-  [CURRENCY] #,##0.--;[RED][CURRENCY] -#,##0.--
+
+  [NatNum2][~jewish]DD  YY
 
-
-  0%
+
+  [NatNum2][~jewish]NN DD  YY
 
-
-  0.00%
+
+  [NatNum2][~jewish]
 
-
-  0.00E+000
+
+  [NatNum2][~jewish]YY
 
-
-  0.00E+00
+
+  [NatNum2][~jewish]NNN DD  YY
 
-
-  ##0.00E+00
+
+  [NatNum2][~jewish]"יום "NN"׳ "DD  YY
 
-  
+  
   
   
   

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/LocaleNode.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 5a92f17d293d2b0b1beee5d16d0b2b1ee7fc6ce3
Author: Eike Rathke 
AuthorDate: Tue Oct 19 21:46:29 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Oct 19 23:00:47 2021 +0200

Related: tdf#145173 Handle two independent ref=... for LC_FORMAT...

Change-Id: I6313d9e573e653c9a97171ca8c2f6176d7ad6a3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123843
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/LocaleNode.cxx 
b/i18npool/source/localedata/LocaleNode.cxx
index e1443b1e1d0f..86fc96495bd4 100644
--- a/i18npool/source/localedata/LocaleNode.cxx
+++ b/i18npool/source/localedata/LocaleNode.cxx
@@ -562,12 +562,13 @@ void LCFormatNode::generateCode (const OFileWriter ) 
const
 {
 case 0:
 of.writeRefFunction("getAllFormats0_", useLocale, 
"replaceTo0");
+of.writeRefFunction("getDateAcceptancePatterns_", useLocale);
 break;
 case 1:
 of.writeRefFunction("getAllFormats1_", useLocale, 
"replaceTo1");
 break;
 }
-of.writeRefFunction("getDateAcceptancePatterns_", useLocale);
+++mnSection;
 return;
 }
 

[Libreoffice-commits] core.git: i18npool/source svl/source

[Eike Rathke (via logerrit)]

 i18npool/source/calendar/calendar_gregorian.cxx |   53 
 svl/source/numbers/zforlist.cxx |   20 -
 svl/source/numbers/zformat.cxx  |   32 --
 3 files changed, 83 insertions(+), 22 deletions(-)

New commits:
commit ebc454ad4eb1f4cd4d84a7db367bb71a457c4e5c
Author: Eike Rathke 
AuthorDate: Wed Sep 29 23:14:18 2021 +0200
Commit: Eike Rathke 
CommitDate: Thu Sep 30 02:04:01 2021 +0200

Resolves: tdf#144697 Format out-of-bounds date(+time) as #FMT error

i.e. < -32768-01-01 or > 32767-12-31
They couldn't be input or stored as proleptic Gregorian in file
formats anyway.

Additionally in i18npool handle the absolute year values casting
conversion int32 <-> int16 where era 0 BCE year 32768 is fielded as
-32768 but still is a valid year for our proleptic Gregorian, so
it isn't displayed as --32768.

Change-Id: Ifdd482f07e04c2a4296fd0556bbef7f1d3e15676
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122835
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index 6a1dad685309..df998b3c6cf3 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -127,6 +127,22 @@ using namespace ::com::sun::star::lang;
 
 namespace i18npool {
 
+// Cast positive int32 values to signed int16, needed for
+// fieldValue[CalendarFieldIndex::YEAR] where absolute value of an era year may
+// be 32768 that with static_cast becomes -32768, which we also
+// do here but indicating places in a controlled way to map back.
+static inline sal_Int16 cast32To16( sal_Int32 a )
+{
+// More than uint16 can't be handled, should not occur.
+assert(a >= 0 && a < static_cast(SAL_MAX_INT16) - 
static_cast(SAL_MIN_INT16));
+return static_cast(a);
+}
+// And back.
+static inline sal_Int32 cast16To32( sal_Int16 i )
+{
+return static_cast(static_cast(i));
+}
+
 Calendar_gregorian::Calendar_gregorian()
 : mxNatNum(new NativeNumberSupplierService)
 {
@@ -409,10 +425,11 @@ void Calendar_gregorian::mapFromGregorian()
 if (!eraArray)
 return;
 
-sal_Int16 e, y, m, d;
+sal_Int16 e, m, d;
+sal_Int32 y;
 
 e = fieldValue[CalendarFieldIndex::ERA];
-y = fieldValue[CalendarFieldIndex::YEAR];
+y = cast16To32(fieldValue[CalendarFieldIndex::YEAR]);
 m = fieldValue[CalendarFieldIndex::MONTH] + 1;
 d = fieldValue[CalendarFieldIndex::DAY_OF_MONTH];
 
@@ -427,7 +444,7 @@ void Calendar_gregorian::mapFromGregorian()
 
 fieldValue[CalendarFieldIndex::ERA] = e;
 fieldValue[CalendarFieldIndex::YEAR] =
-sal::static_int_cast( (e == 0) ? (eraArray[0].year - y) : 
(y - eraArray[e-1].year + 1) );
+cast32To16( (e == 0) ? (eraArray[0].year - y) : (y - 
eraArray[e-1].year + 1) );
 }
 
 #define FIELDS  ((1 << CalendarFieldIndex::ERA) | (1 << 
CalendarFieldIndex::YEAR))
@@ -436,14 +453,15 @@ void Calendar_gregorian::mapFromGregorian()
 void Calendar_gregorian::mapToGregorian()
 {
 if (eraArray && (fieldSet & FIELDS)) {
-sal_Int16 y, e = fieldValue[CalendarFieldIndex::ERA];
+sal_Int16 e = fieldValue[CalendarFieldIndex::ERA];
+sal_Int32 y;
 if (e == 0)
-y = sal::static_int_cast( eraArray[0].year - 
fieldValue[CalendarFieldIndex::YEAR] );
+y = eraArray[0].year - 
cast16To32(fieldValue[CalendarFieldIndex::YEAR]);
 else
-y = sal::static_int_cast( eraArray[e-1].year + 
fieldValue[CalendarFieldIndex::YEAR] - 1 );
+y = eraArray[e-1].year + 
cast16To32(fieldValue[CalendarFieldIndex::YEAR] - 1);
 
 fieldSetValue[CalendarFieldIndex::ERA] = y <= 0 ? 0 : 1;
-fieldSetValue[CalendarFieldIndex::YEAR] = (y <= 0 ? 1 - y : y);
+fieldSetValue[CalendarFieldIndex::YEAR] = cast32To16(y <= 0 ? 1 - y : 
y);
 fieldSet |= FIELDS;
 }
 }
@@ -664,7 +682,7 @@ Calendar_gregorian::isValid()
 // NatNum4  
NatNum9/9/11/11
 
 static sal_Int16 NatNumForCalendar(const css::lang::Locale& aLocale,
-sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int16 
value )
+sal_Int32 nCalendarDisplayCode, sal_Int16 nNativeNumberMode, sal_Int32 
value )
 {
 bool isShort = ((nCalendarDisplayCode == CalendarDisplayCode::SHORT_YEAR ||
 nCalendarDisplayCode == CalendarDisplayCode::LONG_YEAR) && value >= 
100) ||
@@ -883,7 +901,8 @@ Calendar_gregorian::getDisplayString( sal_Int32 
nCalendarDisplayCode, sal_Int16
 OUString
 Calendar_gregorian::getDisplayStringImpl( sal_Int32 nCalendarDisplayCode, 
sal_Int16 nNativeNumberMode, bool bEraMode )
 {
-sal_Int16 value = getValue(sal::static_int_cast( 
DisplayCode2FieldIndex(nCalendarDisplayCode) ));
+sal_Int32 value = cast16To32( getValue( sal::static_int_cast(
+

[Libreoffice-commits] core.git: i18npool/source

[Stephan Bergmann (via logerrit)]

 i18npool/source/transliteration/transliteration_body.cxx |5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

New commits:
commit 061f7ba80efe621503531ca9512b194ad8cefcd3
Author: Stephan Bergmann 
AuthorDate: Fri Sep 17 09:24:22 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Sep 17 11:24:46 2021 +0200

Fix calculation of alloca'ed memory size

...after 16d645e5b8f11b4ddb49a2b58bde388b28960abc "speedup
Transliteration_body::transliterateImpl", which caused
dynamic-stack-buffer-overflow 
( ==4003==ERROR: AddressSanitizer: dynamic-stack-buffer-overflow on address 
0x7fffe890f7d2 at pc 0x004b1c2d bp 0x7fffe890f490 sp 0x7fffe890ec40
> WRITE of size 2 at 0x7fffe890f7d2 thread T0
> #0 0x4b1c2c in __asan_memmove 
/home/tdf/lode/packages/llvm-llvmorg-9.0.1.src/compiler-rt/lib/asan/asan_interceptors_memintrinsics.cc:30
> #1 0x2b8b4222ef65 in char16_t* std::__copy_move::__copy_m(char16_t const*, char16_t 
const*, char16_t*) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algobase.h:368:6
> #2 0x2b8b4222eec0 in char16_t* std::__copy_move_a(char16_t const*, char16_t const*, char16_t*) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algobase.h:385:14
> #3 0x2b8b4222d9be in char16_t* std::__copy_move_a2(char16_t const*, char16_t const*, char16_t*) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algobase.h:422:18
> #4 0x2b8b4222d2be in char16_t* std::copy(char16_t const*, char16_t const*, char16_t*) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algobase.h:454:15
> #5 0x2b8b4222cf43 in char16_t* std::__copy_n(char16_t const*, signed char, char16_t*, 
std::random_access_iterator_tag) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algo.h:782:14
> #6 0x2b8b4222b495 in char16_t* std::copy_n(char16_t const*, signed char, char16_t*) 
/home/tdf/lode/opt_private/gcc-7.3.0/lib/gcc/x86_64-pc-linux-gnu/7.3.0/../../../../include/c++/7.3.0/bits/stl_algo.h:806:14
> #7 0x2b8b42225872 in 
i18npool::Transliteration_body::transliterateImpl(rtl::OUString const&, int, 
int, com::sun::star::uno::Sequence*) 
/i18npool/source/transliteration/transliteration_body.cxx:145:13
> #8 0x2b8b42236f35 in 
i18npool::transliteration_commonclass::transliterateString2String(rtl::OUString 
const&, int, int) 
/i18npool/source/transliteration/transliteration_commonclass.cxx:109:12
> #9 0x2b8b41fbc740 in i18npool::cclass_Unicode::toUpper(rtl::OUString 
const&, int, int, com::sun::star::lang::Locale const&) 
/i18npool/source/characterclassification/cclass_unicode.cxx:67:19
> #10 0x2b8b41fbc7b2 in non-virtual thunk to 
i18npool::cclass_Unicode::toUpper(rtl::OUString const&, int, int, 
com::sun::star::lang::Locale const&) 
/i18npool/source/characterclassification/cclass_unicode.cxx
> #11 0x2b8b41ff1335 in 
i18npool::CharacterClassificationImpl::toUpper(rtl::OUString const&, int, int, 
com::sun::star::lang::Locale const&) 
/i18npool/source/characterclassification/characterclassificationImpl.cxx:47:63
[...]

Change-Id: I5273e234c8921f635e31c414cb0e427ee8b04a95
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122234
Reviewed-by: Noel Grandin 
Reviewed-by: Stephan Bergmann 
Tested-by: Jenkins

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 3581212af8b3..1f4541082435 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -104,9 +104,8 @@ Transliteration_body::transliterateImpl(
 constexpr sal_Int32 nLocalBuf = 2048;
 sal_Unicode* out;
 std::unique_ptr pHeapBuf;
-size_t nBytes = (nCount + 1) * sizeof(sal_Unicode);
-if (nBytes <= nLocalBuf * NMAPPINGMAX)
-out = static_cast(alloca(nBytes));
+if (nCount <= nLocalBuf)
+out = static_cast(alloca(nCount * NMAPPINGMAX * 
sizeof(sal_Unicode)));
 else
 {
 pHeapBuf.reset(new sal_Unicode[ nCount * NMAPPINGMAX ]);

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/calendar/calendar_gregorian.cxx |   60 +++-
 i18npool/source/transliteration/transliterationImpl.cxx |   16 +---
 2 files changed, 36 insertions(+), 40 deletions(-)

New commits:
commit 922b8420071989026bf7cc2a973714788e0211dd
Author: Noel Grandin 
AuthorDate: Thu Sep 16 14:28:52 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 20:16:50 2021 +0200

expand out unnecessary macro

Change-Id: Id812b720413bfe9ea678910fc8d9d0a64dd32d92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122195
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/calendar/calendar_gregorian.cxx 
b/i18npool/source/calendar/calendar_gregorian.cxx
index 1da80995b1d1..6a1dad685309 100644
--- a/i18npool/source/calendar/calendar_gregorian.cxx
+++ b/i18npool/source/calendar/calendar_gregorian.cxx
@@ -127,8 +127,6 @@ using namespace ::com::sun::star::lang;
 
 namespace i18npool {
 
-#define ERROR RuntimeException()
-
 Calendar_gregorian::Calendar_gregorian()
 : mxNatNum(new NativeNumberSupplierService)
 {
@@ -174,7 +172,7 @@ Calendar_gregorian::init(const Era *_eraArray)
  */
 UErrorCode status = U_ZERO_ERROR;
 body.reset( icu::Calendar::createInstance( aIcuLocale, status) );
-if (!body || !U_SUCCESS(status)) throw ERROR;
+if (!body || !U_SUCCESS(status)) throw RuntimeException();
 eraArray=_eraArray;
 }
 
@@ -195,7 +193,7 @@ Calendar_hanja::getDisplayName( sal_Int16 displayIndex, 
sal_Int16 idx, sal_Int16
 css::lang::Locale jaLocale("ja", OUString(), OUString());
 if (idx == 0) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timeAM;
 else if (idx == 1) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timePM;
-else throw ERROR;
+else throw RuntimeException();
 }
 else
 return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType 
);
@@ -215,7 +213,7 @@ Calendar_hanja_yoil::getDisplayName( sal_Int16 
displayIndex, sal_Int16 idx, sal_
 css::lang::Locale jaLocale("ja", OUString(), OUString());
 if (idx == 0) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timeAM;
 else if (idx == 1) return 
LocaleDataImpl::get()->getLocaleItem(jaLocale).timePM;
-else throw ERROR;
+else throw RuntimeException();
 }
 else
 return Calendar_gregorian::getDisplayName( displayIndex, idx, nameType 
);
@@ -295,7 +293,7 @@ Calendar_gregorian::loadCalendar( const OUString& uniqueID, 
const css::lang::Loc
 }
 }
 // Calendar is not for the locale
-throw ERROR;
+throw RuntimeException();
 }
 
 
@@ -333,7 +331,7 @@ Calendar_gregorian::setDateTime( double fTimeInDays )
 "Calendar_gregorian::setDateTime: " << std::fixed << fM << " 
rounded to " << fR);
 UErrorCode status = U_ZERO_ERROR;
 body->setTime( fR, status);
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 getValue();
 }
 
@@ -346,7 +344,7 @@ Calendar_gregorian::getDateTime()
 }
 UErrorCode status = U_ZERO_ERROR;
 double fR = body->getTime(status);
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 return fR / U_MILLIS_PER_DAY;
 }
 
@@ -362,10 +360,10 @@ Calendar_gregorian::setLocalDateTime( double fTimeInDays )
 UErrorCode status = U_ZERO_ERROR;
 body->getTimeZone().getOffset( fR, true, nZoneOffset, nDSTOffset, status );
 
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 body->setTime( fR - (nZoneOffset + nDSTOffset), status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 getValue();
 }
 
@@ -378,13 +376,13 @@ Calendar_gregorian::getLocalDateTime()
 }
 UErrorCode status = U_ZERO_ERROR;
 double fTime = body->getTime( status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 int32_t nZoneOffset = body->get( UCAL_ZONE_OFFSET, status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 status = U_ZERO_ERROR;
 int32_t nDSTOffset = body->get( UCAL_DST_OFFSET, status );
-if ( !U_SUCCESS(status) ) throw ERROR;
+if ( !U_SUCCESS(status) ) throw RuntimeException();
 return (fTime + (nZoneOffset + nDSTOffset)) / U_MILLIS_PER_DAY;
 }
 
@@ -471,7 +469,7 @@ static UCalendarDateFields fieldNameConverter(sal_Int16 
fieldIndex)
 case CalendarFieldIndex::YEAR:  f = UCAL_YEAR; break;
 case CalendarFieldIndex::MONTH: f = UCAL_MONTH; break;
 case CalendarFieldIndex::ERA:   f = UCAL_ERA; break;
-default: throw ERROR;
+default: throw RuntimeException();
 }
 return f;
 }
@@ -480,7 +478,7 @@ void SAL_CALL
 

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/transliteration/transliteration_body.cxx |7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 16d645e5b8f11b4ddb49a2b58bde388b28960abc
Author: Noel Grandin 
AuthorDate: Thu Sep 16 10:38:04 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Sep 16 12:09:23 2021 +0200

speedup Transliteration_body::transliterateImpl

use alloca in Transliteration_body::transliterateImpl to avoid
over-allocating stack-space (which tends to unnecessarily flush some
cache)

Change-Id: I1843fdcb830a3e948a8bbd0a9c7eb143b21a804c
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122184
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/transliteration/transliteration_body.cxx 
b/i18npool/source/transliteration/transliteration_body.cxx
index 9fd89df75e42..3581212af8b3 100644
--- a/i18npool/source/transliteration/transliteration_body.cxx
+++ b/i18npool/source/transliteration/transliteration_body.cxx
@@ -102,9 +102,12 @@ Transliteration_body::transliterateImpl(
 // Allocate the max possible buffer. Try to use stack instead of heap,
 // which would have to be reallocated most times anyways.
 constexpr sal_Int32 nLocalBuf = 2048;
-sal_Unicode aLocalBuf[ nLocalBuf * NMAPPINGMAX ], *out = aLocalBuf;
+sal_Unicode* out;
 std::unique_ptr pHeapBuf;
-if (nCount > nLocalBuf)
+size_t nBytes = (nCount + 1) * sizeof(sal_Unicode);
+if (nBytes <= nLocalBuf * NMAPPINGMAX)
+out = static_cast(alloca(nBytes));
+else
 {
 pHeapBuf.reset(new sal_Unicode[ nCount * NMAPPINGMAX ]);
 out = pHeapBuf.get();

[Libreoffice-commits] core.git: i18npool/source include/i18nutil include/oox include/osl include/svx include/toolkit include/unotools include/vcl jvmfwk/source l10ntools/source linguistic/source lotus

[Noel Grandin (via logerrit)]

 i18npool/source/breakiterator/breakiterator_th.cxx  |3 --
 i18npool/source/breakiterator/xdictionary.cxx   |1 
 include/i18nutil/searchopt.hxx  |6 
 include/oox/dump/dumperbase.hxx |4 +--
 include/osl/diagnose.hxx|2 -
 include/svx/ClassificationField.hxx |3 --
 include/svx/ShapeTypeHandler.hxx|3 --
 include/svx/svdmark.hxx |4 ---
 include/svx/svdpage.hxx |2 -
 include/toolkit/controls/unocontrolbase.hxx |4 +--
 include/unotools/confignode.hxx |2 -
 include/vcl/pdfextoutdevdata.hxx|1 
 include/vcl/pdfwriter.hxx   |1 
 jvmfwk/source/elements.cxx  |6 
 l10ntools/source/po.cxx |   21 +++-
 l10ntools/source/propmerge.cxx  |3 --
 l10ntools/source/xrmmerge.cxx   |6 +---
 linguistic/source/gciterator.cxx|1 
 linguistic/source/lngprophelp.cxx   |1 
 lotuswordpro/source/filter/lwp9reader.cxx   |1 
 lotuswordpro/source/filter/lwpfilehdr.cxx   |1 
 lotuswordpro/source/filter/lwpobjhdr.cxx|1 
 oox/source/core/relations.cxx   |3 --
 oox/source/crypto/CryptTools.cxx|5 ---
 oox/source/drawingml/diagram/diagramfragmenthandler.cxx |2 -
 oox/source/drawingml/shape.cxx  |5 ---
 oox/source/drawingml/textbodyproperties.cxx |1 
 27 files changed, 24 insertions(+), 69 deletions(-)

New commits:
commit 9c9ff9e89fd50223b28f327d3a7e416ab0ae831f
Author: Noel Grandin 
AuthorDate: Tue Aug 31 18:06:01 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 1 10:01:44 2021 +0200

clang-tidy:readability-redundant-member-init

Change-Id: I78339f1df1f0c55c7edaa552940b07d1ada3aeb5
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/121386
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/breakiterator/breakiterator_th.cxx 
b/i18npool/source/breakiterator/breakiterator_th.cxx
index df78aeab3afe..d7accc160f7d 100644
--- a/i18npool/source/breakiterator/breakiterator_th.cxx
+++ b/i18npool/source/breakiterator/breakiterator_th.cxx
@@ -33,8 +33,7 @@ namespace i18npool {
 /**
  * Constructor.
  */
-BreakIterator_th::BreakIterator_th() :
-cachedText()
+BreakIterator_th::BreakIterator_th()
 {
 cBreakIterator = "com.sun.star.i18n.BreakIterator_th";
 // to improve performance, alloc big enough memory in construct.
diff --git a/i18npool/source/breakiterator/xdictionary.cxx 
b/i18npool/source/breakiterator/xdictionary.cxx
index 25dc8bb0ee9b..86a703db0440 100644
--- a/i18npool/source/breakiterator/xdictionary.cxx
+++ b/i18npool/source/breakiterator/xdictionary.cxx
@@ -61,7 +61,6 @@ sal_Unicode* getDataArea_zh();
 #endif
 
 xdictionary::xdictionary(const char *lang) :
-boundary(),
 japaneseWordBreak( false )
 {
 
diff --git a/include/i18nutil/searchopt.hxx b/include/i18nutil/searchopt.hxx
index 56bfaa3f87a6..817014af8d96 100644
--- a/include/i18nutil/searchopt.hxx
+++ b/include/i18nutil/searchopt.hxx
@@ -60,9 +60,6 @@ struct SAL_WARN_UNUSED SearchOptions {
 SearchOptions()
 : algorithmType(::css::util::SearchAlgorithms_ABSOLUTE)
 , searchFlag(0)
-, searchString()
-, replaceString()
-, Locale()
 , changedChars(0)
 , deletedChars(0)
 , insertedChars(0)
@@ -117,8 +114,7 @@ struct SAL_WARN_UNUSED SearchOptions2 : public 
SearchOptions {
 }
 
 SearchOptions2()
-: SearchOptions()
-, AlgorithmType2(0)
+: AlgorithmType2(0)
 , WildcardEscapeCharacter(0)
 {}
 
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 81c3a2fcb21e..53a35775ce9d 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -742,8 +742,8 @@ private:
 ::std::map< sal_Int64, ItemFormat > maMap;
 
 public:
-ItemFormatMap() : maMap() {}
-explicit ItemFormatMap( const NameListRef& rxNameList ) { 
insertFormats( rxNameList ); }
+ItemFormatMap() {}
+explicit ItemFormatMap( const NameListRef& rxNameList ) { insertFormats( 
rxNameList ); }
 
 ::std::map< sal_Int64, ItemFormat >::const_iterator end() const { return 
maMap.end(); }
 ::std::map< sal_Int64, ItemFormat >::const_iterator find(sal_Int64 nId) 
const
diff --git a/include/osl/diagnose.hxx b/include/osl/diagnose.hxx
index 7cd0c106a584..71d49f3d8a98 100644
--- a/include/osl/diagnose.hxx
+++ b/include/osl/diagnose.hxx
@@ -93,7 +93,7 @@ typedef ::std::unordered_set 
VoidPointerSet;
 
 struct 

[Libreoffice-commits] core.git: i18npool/source sw/qa

[Xisco Fauli (via logerrit)]

 dev/null  |binary
 i18npool/source/search/textsearch.cxx |4 ++--
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   32 
 3 files changed, 2 insertions(+), 34 deletions(-)

New commits:
commit e73c3942de474004b04c1d538c89354183d44ae9
Author: Xisco Fauli 
AuthorDate: Wed Aug 25 19:38:50 2021 +0200
Commit: Xisco Fauli 
CommitDate: Thu Aug 26 00:39:48 2021 +0200

tdf#144089: Revert "tdf#137737 i18n search: don't expand start/end with 
regex ^ or $"

This reverts commit a511bffd67a9cebfdc878766581ac08c79d7ff51.

Reason for revert: See https://gerrit.libreoffice.org/c/core/+/120981

Change-Id: If8a445448976a9963f76623d3d968b8d5e3d74dd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120990
Tested-by: Xisco Fauli 
Reviewed-by: Xisco Fauli 

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index e6ddd93c5be6..dcb31762e6c2 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -333,7 +333,7 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 // apply normal transliteration (1<->1, 1<->0)
 
 sal_Int32 nInStartPos = startPos;
-if (pRegexMatcher && startPos > 0 && 
!aSrchPara.searchString.startsWith("^"))
+if (pRegexMatcher && startPos > 0)
 {
 // tdf#89665, tdf#75806: An optimization to avoid transliterating 
the whole string, yet
 // transliterate enough of the leading text to allow sensible 
look-behind assertions.
@@ -345,7 +345,7 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 nInStartPos -= std::min(nMaxLeadingLen, startPos);
 }
 sal_Int32 nInEndPos = endPos;
-if (pRegexMatcher && endPos < searchStr.getLength() && 
!aSrchPara.searchString.endsWith("$"))
+if (pRegexMatcher && endPos < searchStr.getLength())
 {
 // tdf#65038: ditto for look-ahead assertions
 const sal_Int32 nMaxTrailingLen = 
aSrchPara.searchString.endsWith(")") ? 100 : 3;
diff --git a/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx 
b/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx
deleted file mode 100644
index 42914ce3feaa..
Binary files a/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx and 
/dev/null differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index c3ad147713bf..70d63e36871a 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -48,7 +48,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -4002,37 +4001,6 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf118311)
 assertXPath(pXmlDoc, "//page[1]//body/tab", 0);
 }
 
-CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137737_FindReplace)
-{
-createSwDoc(DATA_DIRECTORY, "tdf137737_FindReplace.docx");
-
-// Replace straight quotes with something (opening quotes in real life, 
but X is adequate here)
-uno::Sequence 
aArgs(comphelper::InitPropertySequence({
-{ "SearchItem.SearchString", uno::makeAny(OUString("^\"")) },
-{ "SearchItem.ReplaceString", uno::makeAny(OUString("X")) },
-{ "SearchItem.Command", 
uno::makeAny(static_cast(SvxSearchCmd::REPLACE)) },
-{ "SearchItem.AlgorithmType", uno::makeAny(static_cast(1)) 
}, //REGEX
-{ "SearchItem.AlgorithmType2", uno::makeAny(static_cast(2)) 
}, //REGEX
-}));
-// Find the first match.
-dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-// Replace the first match.
-dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-
-// Replace straight quotes with something (closing quotes in real life)
-aArgs[0].Value <<= OUString("\"$");
-dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
-
-//Finding the searched string via XReplaceable
-uno::Reference xReplace(mxComponent, uno::UNO_QUERY);
-uno::Reference xReplaceDes = 
xReplace->createReplaceDescriptor();
-xReplaceDes->setSearchString("\"");
-//There should not be any straight quotes left.
-uno::Reference 
xIndex(xReplace->findAll(xReplaceDes));
-CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndex->getCount());
-}
-
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineTableRowDeletion)
 {
 // load a 1-row table, and delete the row with enabled change tracking:

[Libreoffice-commits] core.git: i18npool/source sw/qa

[Justin Luth (via logerrit)]

 i18npool/source/search/textsearch.cxx |4 +-
 sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx   |   32 ++
 3 files changed, 34 insertions(+), 2 deletions(-)

New commits:
commit a511bffd67a9cebfdc878766581ac08c79d7ff51
Author: Justin Luth 
AuthorDate: Thu Aug 12 21:29:42 2021 +0200
Commit: Justin Luth 
CommitDate: Wed Aug 25 09:28:57 2021 +0200

tdf#137737 i18n search: don't expand start/end with regex ^ or $

If the regex starts with ^, that means that it
matches only at the beginning of the content.
So don't expand the beginning of the content
or else it won't match anymore.
Similarly, $ indicates matching at the end of the content.

For the unit test I just randomly guessed at SearchItem.AlgorithmType,
and it kinda worked. I love black boxes...
I hope I remember what i learned about TransformParameters()
which was parsed in sfx2/source/appl/appuno.cxx,
splitting the "variable" into Item.PropName = PropValue.
That is definite black magic.

Change-Id: Ie1640821a7a430e78dbe72c57a92aeaa9b5272a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120410
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/i18npool/source/search/textsearch.cxx 
b/i18npool/source/search/textsearch.cxx
index dcb31762e6c2..e6ddd93c5be6 100644
--- a/i18npool/source/search/textsearch.cxx
+++ b/i18npool/source/search/textsearch.cxx
@@ -333,7 +333,7 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 // apply normal transliteration (1<->1, 1<->0)
 
 sal_Int32 nInStartPos = startPos;
-if (pRegexMatcher && startPos > 0)
+if (pRegexMatcher && startPos > 0 && 
!aSrchPara.searchString.startsWith("^"))
 {
 // tdf#89665, tdf#75806: An optimization to avoid transliterating 
the whole string, yet
 // transliterate enough of the leading text to allow sensible 
look-behind assertions.
@@ -345,7 +345,7 @@ SearchResult TextSearch::searchForward( const OUString& 
searchStr, sal_Int32 sta
 nInStartPos -= std::min(nMaxLeadingLen, startPos);
 }
 sal_Int32 nInEndPos = endPos;
-if (pRegexMatcher && endPos < searchStr.getLength())
+if (pRegexMatcher && endPos < searchStr.getLength() && 
!aSrchPara.searchString.endsWith("$"))
 {
 // tdf#65038: ditto for look-ahead assertions
 const sal_Int32 nMaxTrailingLen = 
aSrchPara.searchString.endsWith(")") ? 100 : 3;
diff --git a/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx 
b/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx
new file mode 100644
index ..42914ce3feaa
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data/tdf137737_FindReplace.docx differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 70d63e36871a..4b717b47c27e 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -48,6 +48,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -4001,6 +4002,37 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf118311)
 assertXPath(pXmlDoc, "//page[1]//body/tab", 0);
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf137737_FindReplace)
+{
+createSwDoc(DATA_DIRECTORY, "tdf137737_FindReplace.docx");
+
+// Replace staight quotes with something (opening quotes in real life, but 
X is adequate here)
+uno::Sequence 
aArgs(comphelper::InitPropertySequence({
+{ "SearchItem.SearchString", uno::makeAny(OUString("^\"")) },
+{ "SearchItem.ReplaceString", uno::makeAny(OUString("X")) },
+{ "SearchItem.Command", 
uno::makeAny(static_cast(SvxSearchCmd::REPLACE)) },
+{ "SearchItem.AlgorithmType", uno::makeAny(static_cast(1)) 
}, //REGEX
+{ "SearchItem.AlgorithmType2", uno::makeAny(static_cast(2)) 
}, //REGEX
+}));
+// Find the first match.
+dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
+// Replace the first match.
+dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
+
+// Replace staight quotes with something (closing quotes in real life)
+aArgs[0].Value <<= OUString("\"$");
+dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
+dispatchCommand(mxComponent, ".uno:ExecuteSearch", aArgs);
+
+//Finding the searched string via XReplaceable
+uno::Reference xReplace(mxComponent, uno::UNO_QUERY);
+uno::Reference xReplaceDes = 
xReplace->createReplaceDescriptor();
+xReplaceDes->setSearchString("\"");
+//There should not be any straight quotes left.
+uno::Reference 
xIndex(xReplace->findAll(xReplaceDes));
+CPPUNIT_ASSERT_EQUAL(sal_Int32(0), xIndex->getCount());
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testRedlineTableRowDeletion)
 {
 // load a 1-row table, and delete the row with enabled 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/de_DE.xml |2 +-
 i18npool/source/localedata/data/de_LU.xml |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 400a44f9ac7792ffe3665f70507324e4a64dca2b
Author: Eike Rathke 
AuthorDate: Mon Aug 2 22:16:44 2021 +0200
Commit: Eike Rathke 
CommitDate: Tue Aug 3 01:11:32 2021 +0200

Related: tdf#143664 Change {de-*} March "Mrz" to "Mär"

Change-Id: Id4a4ebe432bf5badae96eadb723336648d2ce690
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119917
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/de_DE.xml 
b/i18npool/source/localedata/data/de_DE.xml
index 6eb8307d3c13..95f07a1e14ed 100644
--- a/i18npool/source/localedata/data/de_DE.xml
+++ b/i18npool/source/localedata/data/de_DE.xml
@@ -266,7 +266,7 @@
 
 
   mar
-  Mrz
+  Mär
   März
 
 
diff --git a/i18npool/source/localedata/data/de_LU.xml 
b/i18npool/source/localedata/data/de_LU.xml
index 3dcf21c6b616..00e5a7980e3d 100644
--- a/i18npool/source/localedata/data/de_LU.xml
+++ b/i18npool/source/localedata/data/de_LU.xml
@@ -254,7 +254,7 @@
 
 
   mar
-  Mrz
+  Mär
   März
 
 

[Libreoffice-commits] core.git: i18npool/source

[DaeHyun Sung (via logerrit)]

 i18npool/source/localedata/data/ko_KR.xml |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 9a873383868814e18de8d205a03c0824c74b6d56
Author: DaeHyun Sung 
AuthorDate: Sun Jul 11 04:05:49 2021 +0900
Commit: Eike Rathke 
CommitDate: Sat Jul 31 18:06:12 2021 +0200

tdf#143295 fix DateAcceptancePattern in Korean

In Korean, both "-MM-DD"(ISO8601) and ". MM. DD."Hangul 
orthography(한글맞춤법)" are public and usually use in Korean.

So, I fixed DateAcceptancePattern elements in Korean  on 
i18npool/source/localedata/data/ko_KR.xml

Change-Id: Iae3dfc63f4c67f4e1a74df7686daf2c2187c0b35
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118708
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/ko_KR.xml 
b/i18npool/source/localedata/data/ko_KR.xml
index fcb92702923e..a3df743e0c57 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -53,6 +53,11 @@
   
   
 M/D
+M-D
+M.D.
+M월D일
+Y.M.D.
+Y년M월D일
 
   General
 

[Libreoffice-commits] core.git: i18npool/source offapi/com sw/qa sw/source writerfilter/source

[DaeHyun Sung (via logerrit)]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   55 
++
 offapi/com/sun/star/style/NumberingType.idl   |   22 

 sw/qa/extras/ooxmlexport/ooxmlexport.cxx  |2 
 sw/source/filter/ww8/docxattributeoutput.cxx  |6 -
 sw/source/filter/ww8/rtfattributeoutput.cxx   |   12 +-
 sw/source/filter/ww8/ww8atr.cxx   |6 -
 writerfilter/source/dmapper/ConversionHelper.cxx  |8 +
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |6 +
 8 files changed, 108 insertions(+), 9 deletions(-)

New commits:
commit 4598a385ffaaf8fdc124962d347fead994450bea
Author: DaeHyun Sung 
AuthorDate: Mon Jul 26 23:36:50 2021 +0900
Commit: Miklos Vajna 
CommitDate: Thu Jul 29 08:43:18 2021 +0200

tdf#143526 fix and add Korean numbering

fix Korean NumberFormat, compare with MS Word
change mapping of style::NumberingType::NUMBER_HANGUL_KO,
from "koreanLegal" to "koreanCounting"
"koreanDigital" add new reserved words "일, 일영, 일영영, etc"
- style::NumberingType::NUMBER_DIGITAL_KO
"koreanLegal" is new reserved words "하나, 둘, 셋, 넷, 다섯, 여섯, 일곱, 여덟, 아홉, 열"
- style::NumberingType::NUMBER_LEGAL_KO
"koreanDigital2" is new reserved words "一, 一零, 一零零, etc"
 - style::NumberingType::NUMBER_DIGITAL2_KO

Reference:
1: "[MS-OE376]: Office Implementation Information for ECMA-376 Standards 
Support"

https://docs.microsoft.com/en-us/openspecs/office_standards/ms-oe376/a5deef83-bb01-410f-bde0-9c35abe4ca52
2.1.350 Part 4 Section 2.13.5.30, numberingChange (Previous Paragraph 
Numbering Properties)

2: "[MS-DOCX]: Word Extensions to the Office Open XML (.docx) File Format" 
shows example of not only Korean Numbering also others Numbering examples.

https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx/b839fe1f-e1ca-4fa6-8c26-5954d0abbccd
2.4 numFmt Extensions

https://docs.microsoft.com/en-us/openspecs/office_standards/ms-docx/a1bb5809-e361-4e49-8e16-7f1a67da4121

Change-Id: I535b2aa3cf4111d86b9b7b788afe4aa64e8e4545
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119518
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index dadfc13b86a0..b7ee64cac5eb 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -288,6 +288,29 @@ const sal_Unicode table_PersianWord_decadeX[][8]={
 {0x0645, 0x06cc, 0x0644, 0x06cc, 0x0627, 0x0631, 0x062f, 0} // 10
 };
 
+const sal_Unicode table_KoreanLegalWord_decade1[][3] = {
+{0xd558, 0xb098, 0}, // 1
+{0xb458, 0}, // 2
+{0xc14b, 0}, // 3
+{0xb137, 0}, // 4
+{0xb2e4, 0xc12f, 0}, // 5
+{0xc5ec, 0xc12f, 0}, // 6
+{0xc77c, 0xacf1, 0}, // 7
+{0xc5ec, 0xb35f, 0}, // 8
+{0xc544, 0xd649, 0}  // 9
+};
+
+const sal_Unicode table_KoreanLegalWord_decade2[][3] = {
+{0xc5f4, 0},  // 10
+{0xc2a4, 0xbb3c, 0},  // 20
+{0xc11c, 0xb978, 0},  // 30
+{0xb9c8, 0xd754, 0},  // 40
+{0xc270, 0},  // 50
+{0xc608, 0xc21c, 0},  // 60
+{0xc77c, 0xd754, 0},  // 70
+{0xc5ec, 0xb4e0, 0},  // 80
+{0xc544, 0xd754, 0}   // 90
+};
 
 DefaultNumberingProvider::DefaultNumberingProvider( const Reference < 
XComponentContext >& rxContext ) : m_xContext(rxContext)
 {
@@ -468,6 +491,16 @@ void lcl_formatPersianWord( sal_Int32 nNumber, OUString& 
rsResult )
 rsResult += aTemp;
 }
 
+static void lcl_formatKoreanLegalWord(sal_Int32 nNumber, OUString& rsResult) {
+OUStringBuffer aTemp(64);
+int digit1 = nNumber % 10;
+int digit2 = nNumber / 10;
+if (digit1 > 0)
+aTemp.insert(0, (table_KoreanLegalWord_decade1[digit1 - 1]));
+if (digit2 > 0)
+aTemp.insert(0, (table_KoreanLegalWord_decade2[digit2 - 1]));
+rsResult += aTemp.makeStringAndClear();
+}
 
 // Greek Letter Numbering
 
@@ -743,6 +776,25 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence= 100)
+  {
+  natNum = NativeNumberMode::NATNUM11;
+  locale.Language = "ko";
+  }
+  else
+  {
+  lcl_formatKoreanLegalWord(number, result);
+  }
+  break;
 
   case CIRCLE_NUMBER:
   table = table_CircledNumber;
@@ -1016,6 +1068,9 @@ const Supported_NumberingType aSupportedTypes[] =
 {style::NumberingType::HANGUL_SYLLABLE_KO,  nullptr, LANG_CJK},
 {style::NumberingType::HANGUL_CIRCLED_JAMO_KO,  nullptr, LANG_CJK},
 {style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO,  nullptr, 

[Libreoffice-commits] core.git: i18npool/source

[Noel Grandin (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |   12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

New commits:
commit 48d60a717a588d93e82268dc80018ea9970c4e0e
Author: Noel Grandin 
AuthorDate: Sun Jul 18 11:46:39 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 18 21:32:39 2021 +0200

osl::Mutex->std::mutex in NativeNumberSupplier

Change-Id: I5430636438723f99b584dd95be9d7cb5264a5af9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119131
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index 8541c9739e84..b337fc50f2c6 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -70,7 +71,7 @@ namespace i18npool {
 
 namespace {
 
-struct theNatNumMutex : public rtl::Static {};
+std::mutex theNatNumMutex;
 
 }
 
@@ -553,7 +554,7 @@ struct Separators
 Separators getLocaleSeparators(const Locale& rLocale, const OUString& rLocStr)
 {
 // Guard the static variable below.
-osl::MutexGuard aGuard(theNatNumMutex::get());
+std::lock_guard aGuard(theNatNumMutex);
 // Maximum a couple hundred of pairs with 4-byte structs - so no need for 
smart managing
 static std::unordered_map aLocaleSeparatorsBuf;
 auto it = aLocaleSeparatorsBuf.find(rLocStr);
@@ -598,11 +599,12 @@ OUString getNumberText(const Locale& rLocale, const 
OUString& rNumberString,
 // Handle also month and day names for NatNum12 date formatting
 const OUString& rNumberStr = (count == 0) ? rNumberString : 
sBuf.makeStringAndClear();
 
-// Guard the static variables below.
-osl::MutexGuard aGuard( theNatNumMutex::get());
-
 static auto xNumberText
 = 
css::linguistic2::NumberText::create(comphelper::getProcessComponentContext());
+
+// Guard the static variables below.
+std::lock_guard aGuard( theNatNumMutex );
+
 OUString numbertext_prefix;
 // default "cardinal" gets empty prefix
 if (!sNumberTextParams.empty() && sNumberTextParams != u"cardinal")
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[Heiko Tietze (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 06e48b4beb0f898483211c77adbb2e83d8908cee
Author: Heiko Tietze 
AuthorDate: Mon Jul 5 14:26:22 2021 +0200
Commit: Heiko Tietze 
CommitDate: Mon Jul 5 17:06:04 2021 +0200

Resolves tdf#137160 - Thin space before f./ff. in en_US

Change-Id: I3a2f2206d9784de2da6af8ea2b882e1ebe6205e0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118439
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index a96750aab17d..9e852f743125 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -258,8 +258,8 @@
 A-Z
 0
 1
-f.
-ff.
+ f.
+ ff.
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[DaeHyun Sung (via logerrit)]

 i18npool/source/localedata/data/ko_KR.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0afa7e64d547a8f2a48402660acf5c95a468a0ab
Author: DaeHyun Sung 
AuthorDate: Mon Jun 28 23:04:10 2021 +0900
Commit: Eike Rathke 
CommitDate: Mon Jul 5 01:51:57 2021 +0200

Fix Line break rule in Korean

I found the bug, Line break rule in Korea don't work
using `" -U+0022: Quotation Mark` & `' - U+0027: Apostrophe`

So I fixed the bug in xml file.
`` to `' - U+0027: Apostrophe`
`` to `" - U+0022: Quotation Mark`

Because, `'` and `"` are still displayed in several other line break rules.
such as, zh_CN.xml and zh_TW.xml, etc.

Reference1: HWP Guide - 금칙문자(Forbidden Characters)
http://help.hancom.com/hoffice/webhelp/9.0/ko_kr/hshow/tool/forbid.htm

Reference2: OOXML ISO/IEC 29500–1:2016(E)
Korean

* Cannot start a line: !%),.:;?]}¢°'"′″℃〉》」』】〕！％），．：；？］｝￠
(Unicode character values: U+0021, U+0025, U+0029, U+002C, U+002E, U+003A, 
U+003B, U+003F, U+005D, U+007D, U+00A2, U+00B0, U+2019, U+201D, U+2032, U+2033, 
U+2103, U+3009, U+300B, U+300D, U+300F, U+3011, U+3015, U+FF01, U+FF05, U+FF09, 
U+FF0C, U+FF0E, U+FF1A, U+FF1B, U+FF1F, U+FF3D, U+FF5D and U+FFE0, respectively)

* Cannot end a line: $([\{£¥'"〈《「『【〔＄（［｛￡￥￦
(Unicode character values: U+0024, U+0028, U+005B, U+005C, U+007B, U+00A3, 
U+00A5, U+2018, U+201C, U+3008, U+300A, U+300C, U+300E, U+3010, U+3014, U+FF04, 
U+FF08, U+FF3B, U+FF5B, U+FFE1, U+FFE5, and U+FFE6, respectively)

Change-Id: I07f6afc60d0a83508a8ba971f31d2ca66846cd23
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118027
Tested-by: Eike Rathke 
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/ko_KR.xml 
b/i18npool/source/localedata/data/ko_KR.xml
index a3e6121ba832..fcb92702923e 100644
--- a/i18npool/source/localedata/data/ko_KR.xml
+++ b/i18npool/source/localedata/data/ko_KR.xml
@@ -723,8 +723,8 @@
   
   
 
-  
!%),.:;?]}¢￠′″℃〉＞》」』】〕！％），．：；？］｝｡｣､･
 ﾞﾟ、。’”°
-  
$(¥£[\{￡￥＜《「『【〔＄（［｛₩￦｢‘“〈
+  !%),.:;?]}¢￠'"′″℃〉＞》」』】〕！％），．：；？］｝｡｣､･ 
ﾞﾟ、。’”°
+  
$(¥£[\{￡￥'"＜《「『【〔＄（［｛₩￦｢‘“〈
   !,.:;?、。！，．：；？
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/lt_LT.xml |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 57e0b8637a0c6f53a43c987df51a00a5a0f3909f
Author: Eike Rathke 
AuthorDate: Sun Jul 4 23:24:43 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Jul 5 01:05:49 2021 +0200

Related: tdf#125035 Include day of week in formatindex="19" DATE_SYSTEM_LONG

Change-Id: I3cbbda7592fede575b766f0631c5f4b42a19e03e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118387
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/lt_LT.xml 
b/i18npool/source/localedata/data/lt_LT.xml
index 914e51614e01..87446545ec12 100644
--- a/i18npool/source/localedata/data/lt_LT.xml
+++ b/i18npool/source/localedata/data/lt_LT.xml
@@ -109,7 +109,7 @@
   ISO 8601
 
 
-   "m."  DD "d."
+   "m."  DD "d." NNN
 
 
    "metų"  "mėnesio" D "diena"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/data/fr_FR.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0151a178d4e26b4546f7b27d569f0d94420caa9d
Author: Julien Nabet 
AuthorDate: Sat Jul 3 23:51:11 2021 +0200
Commit: Julien Nabet 
CommitDate: Sun Jul 4 10:04:54 2021 +0200

tdf#143173: fix wrong French abbr for Alphabetical Index-Grouped entries

Change-Id: If478fc1127f957e05cdf7bc247881f0c59146896
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118366
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/data/fr_FR.xml 
b/i18npool/source/localedata/data/fr_FR.xml
index ac7e17710cf9..b2b3abb329bb 100644
--- a/i18npool/source/localedata/data/fr_FR.xml
+++ b/i18npool/source/localedata/data/fr_FR.xml
@@ -212,8 +212,8 @@
 A-Z
 0
 1
- sv
- sv
+ sq.
+ sqq.
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source svl/qa

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/en_US.xml |2 +-
 svl/qa/unit/svl.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 57bd9a60757a5a5d222d6e992e7f38cb3cea4bf6
Author: Eike Rathke 
AuthorDate: Sat Jul 3 21:50:29 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat Jul 3 23:49:02 2021 +0200

Related: tdf#125035 en_US formatindex="19" DATE_SYSTEM_LONG with D not DD

Otherwise CppunitTest_sw_odfimport testDateFormFormats fails with

- Expected: Wednesday, March 4, 2020
- Actual  : Wednesday, March 04, 2020

if DateFormatter uses number formatter.
This is also what
https://www.localeplanet.com/icu/en-US/index.html
lists for Date.0 and formatindex="30" has as well.

This makes adapting CppunitTest_svl_qa_cppunit testNumberFormat
necessary.

Change-Id: I1c8cfd954f34f742b0397b8f922d22eb11ae19f0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118361
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/en_US.xml 
b/i18npool/source/localedata/data/en_US.xml
index bed196f3cee7..a96750aab17d 100644
--- a/i18npool/source/localedata/data/en_US.xml
+++ b/i18npool/source/localedata/data/en_US.xml
@@ -120,7 +120,7 @@
   M/D/YY
 
 
-   DD, 
+   D, 
 
 
   MM/DD/YY
diff --git a/svl/qa/unit/svl.cxx b/svl/qa/unit/svl.cxx
index 553ae8b7e8c1..ba3b6a34a805 100644
--- a/svl/qa/unit/svl.cxx
+++ b/svl/qa/unit/svl.cxx
@@ -182,7 +182,7 @@ void Test::testNumberFormat()
 
 const char* pDate[] = {
 "M/D/YY",
-" DD, ",
+" D, ",
 "MM/DD/YY",
 "MM/DD/",
 "MMM D, YY",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source sw/qa

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/da_DK.xml   |2 +-
 i18npool/source/localedata/data/en_CA.xml   |2 +-
 i18npool/source/localedata/data/en_DK.xml   |2 +-
 i18npool/source/localedata/data/en_GB.xml   |2 +-
 i18npool/source/localedata/data/en_GH.xml   |2 +-
 i18npool/source/localedata/data/en_NA.xml   |2 +-
 i18npool/source/localedata/data/en_ZA.xml   |2 +-
 i18npool/source/localedata/data/eo.xml  |2 +-
 i18npool/source/localedata/data/fi_FI.xml   |2 +-
 i18npool/source/localedata/data/fo_FO.xml   |2 +-
 i18npool/source/localedata/data/fr_CA.xml   |2 +-
 i18npool/source/localedata/data/gd_GB.xml   |2 +-
 i18npool/source/localedata/data/hu_HU.xml   |2 +-
 i18npool/source/localedata/data/id_ID.xml   |2 +-
 i18npool/source/localedata/data/is_IS.xml   |2 +-
 i18npool/source/localedata/data/kl_GL.xml   |2 +-
 i18npool/source/localedata/data/lg_UG.xml   |2 +-
 i18npool/source/localedata/data/sv_FI.xml   |2 +-
 i18npool/source/localedata/data/sv_SE.xml   |2 +-
 i18npool/source/localedata/data/zh_HK.xml   |2 +-
 sw/qa/uitest/writer_tests5/DateFormFieldPropertiesDialog.py |   11 +--
 21 files changed, 29 insertions(+), 22 deletions(-)

New commits:
commit 56ae948b08010ed1b61be9857c8c6ae4e97e86b2
Author: Eike Rathke 
AuthorDate: Fri Jul 2 23:29:28 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat Jul 3 11:47:28 2021 +0200

Related: tdf#125035 Include day of week in formatindex="19" DATE_SYSTEM_LONG

Used programmatically with number formatter's NF_DATE_SYSTEM_LONG
but quite some locales were lacking the day of week; maybe legacy
because duplicated formats sometimes were avoided, which nowadays
are suppressed in the number format dialog. Made the format code a
copy of formatindex="30" explicit DATE_SYS_D.

Didn't know what to do about lt_LT so kept that as is.

This made it necessary to adapt a dreaded UITest_writer_tests5
test that checks for listbox content,
test_date_field_with_custom_format, which depends on actual locale
data. See comment there.

Change-Id: Ifc26a4a5be6bed3fb8d9cedc1afcba1225751635
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118335
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/da_DK.xml 
b/i18npool/source/localedata/data/da_DK.xml
index 540e2ca7365d..6b659a0381e9 100644
--- a/i18npool/source/localedata/data/da_DK.xml
+++ b/i18npool/source/localedata/data/da_DK.xml
@@ -108,7 +108,7 @@
   DD-MM-YY
 
 
-  D.  
+  D.  
 
 
   DD-MM-YY
diff --git a/i18npool/source/localedata/data/en_CA.xml 
b/i18npool/source/localedata/data/en_CA.xml
index 9e637a7530d0..d3eb8804bd02 100644
--- a/i18npool/source/localedata/data/en_CA.xml
+++ b/i18npool/source/localedata/data/en_CA.xml
@@ -116,7 +116,7 @@
   YY-M-D
 
 
-   D, 
+   D, 
 
 
   YY-MM-DD
diff --git a/i18npool/source/localedata/data/en_DK.xml 
b/i18npool/source/localedata/data/en_DK.xml
index f8ac52e25f06..041ce09a73ae 100644
--- a/i18npool/source/localedata/data/en_DK.xml
+++ b/i18npool/source/localedata/data/en_DK.xml
@@ -120,7 +120,7 @@
   YY-MM-DD
 
 
-  DD  
+  D.  
 
 
   YY-MM-DD
diff --git a/i18npool/source/localedata/data/en_GB.xml 
b/i18npool/source/localedata/data/en_GB.xml
index 2928b62529da..ac82153508fa 100644
--- a/i18npool/source/localedata/data/en_GB.xml
+++ b/i18npool/source/localedata/data/en_GB.xml
@@ -79,7 +79,7 @@
   DD/MM/YY
 
 
-  DD  
+  D  
 
 
   D MMM YY
diff --git a/i18npool/source/localedata/data/en_GH.xml 
b/i18npool/source/localedata/data/en_GH.xml
index ccda3d203d24..0a6ea83eec08 100644
--- a/i18npool/source/localedata/data/en_GH.xml
+++ b/i18npool/source/localedata/data/en_GH.xml
@@ -114,7 +114,7 @@
   YY/MM/DD
 
 
-  DD  
+  D  
 
 
   YY/MM/DD
diff --git a/i18npool/source/localedata/data/en_NA.xml 
b/i18npool/source/localedata/data/en_NA.xml
index 4322f2bb5afa..09d481e413d7 100644
--- a/i18npool/source/localedata/data/en_NA.xml
+++ b/i18npool/source/localedata/data/en_NA.xml
@@ -114,7 +114,7 @@
   YY/MM/DD
 
 
-  DD  
+  D  
 
 
   YY/MM/DD
diff --git a/i18npool/source/localedata/data/en_ZA.xml 
b/i18npool/source/localedata/data/en_ZA.xml
index ec3990a72135..574f1da3407b 100644
--- a/i18npool/source/localedata/data/en_ZA.xml
+++ 

[Libreoffice-commits] core.git: i18npool/source linguistic/source oox/source package/source

[Julien Nabet (via logerrit)]

 i18npool/source/localedata/localedata.cxx  |   39 
+++---
 i18npool/source/transliteration/transliteration_Ignore.cxx |   18 
 i18npool/source/transliteration/transliteration_body.cxx   |5 -
 i18npool/source/transliteration/transliteration_caseignore.cxx |   12 ---
 linguistic/source/gciterator.cxx   |9 --
 oox/source/drawingml/textparagraphproperties.cxx   |3 
 oox/source/export/drawingml.cxx|   19 ++--
 oox/source/ppt/pptfilterhelpers.cxx|   10 +-
 package/source/zippackage/ZipPackage.cxx   |   16 +---
 9 files changed, 44 insertions(+), 87 deletions(-)

New commits:
commit 7af40a445551a07c6918f835da20ca461a6bd4ee
Author: Julien Nabet 
AuthorDate: Tue Jun 8 21:39:34 2021 +0200
Commit: Julien Nabet 
CommitDate: Wed Jun 9 10:49:26 2021 +0200

Simplify Sequences initializations (i*->p*)

Change-Id: I6bf0eaa2233de2487d90a2f9ae7de263b4ddf1bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116865
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/i18npool/source/localedata/localedata.cxx 
b/i18npool/source/localedata/localedata.cxx
index 0f3b03a2689a..33da5647adc3 100644
--- a/i18npool/source/localedata/localedata.cxx
+++ b/i18npool/source/localedata/localedata.cxx
@@ -784,8 +784,7 @@ LocaleDataImpl::getAllCalendars2( const Locale& rLocale )
 return calendarsSeq;
 }
 else {
-Sequence< Calendar2 > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -828,8 +827,7 @@ LocaleDataImpl::getAllCurrencies2( const Locale& rLocale )
 return seq;
 }
 else {
-Sequence< Currency2 > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -910,8 +908,7 @@ LocaleDataImpl::getDateAcceptancePatterns( const Locale& 
rLocale )
 }
 else
 {
-Sequence< OUString > seq(0);
-return seq;
+return {};
 }
 }
 
@@ -954,8 +951,7 @@ LocaleDataImpl::getCollatorImplementations( const Locale& 
rLocale )
 return seq;
 }
 else {
-Sequence< Implementation > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -974,8 +970,7 @@ LocaleDataImpl::getCollationOptions( const Locale& rLocale )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -994,8 +989,7 @@ LocaleDataImpl::getSearchOptions( const Locale& rLocale )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1023,8 +1017,7 @@ LocaleDataImpl::getIndexAlgorithm( const Locale& rLocale )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1108,8 +1101,7 @@ LocaleDataImpl::getUnicodeScripts( const Locale& rLocale )
 return seq;
 }
 else {
-Sequence< UnicodeScript > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1128,8 +1120,7 @@ LocaleDataImpl::getFollowPageWords( const Locale& rLocale 
)
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1150,8 +1141,7 @@ LocaleDataImpl::getTransliterations( const Locale& 
rLocale )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 
 
@@ -1229,8 +1219,7 @@ LocaleDataImpl::getBreakIteratorRules( const Locale& 
rLocale  )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1251,8 +1240,7 @@ LocaleDataImpl::getReservedWord( const Locale& rLocale  )
 return seq;
 }
 else {
-Sequence< OUString > seq1(0);
-return seq1;
+return {};
 }
 }
 
@@ -1427,8 +1415,7 @@ LocaleDataImpl::getOutlineNumberingLevels( const 
lang::Locale& rLocale )
 return aRet;
 }
 else {
-Sequence< Reference > seq1(0);
-return seq1;
+return {};
 }
 }
 
diff --git a/i18npool/source/transliteration/transliteration_Ignore.cxx 
b/i18npool/source/transliteration/transliteration_Ignore.cxx
index 946e2979b0da..c3faeb11ed0f 100644
--- a/i18npool/source/transliteration/transliteration_Ignore.cxx
+++ b/i18npool/source/transliteration/transliteration_Ignore.cxx
@@ -66,10 +66,7 @@ transliteration_Ignore::transliterateRange( const OUString& 
str1, const OUString
 if (str1.isEmpty() || str2.isEmpty())
 throw RuntimeException();
 
-Sequence< OUString > r(2);
-r[0] = str1.copy(0, 1);
-r[1] = str2.copy(0, 1);
-return r;
+return { str1.copy(0, 1), str2.copy(0, 1) };
 }
 
 
@@ -103,18 +100,9 @@ transliteration_Ignore::transliterateRange( const 
OUString& str1, const OUString
 OUString s22 = 

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/localedata/data/hu_HU.xml |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 8e7a9b0243a4a63841d1cb1faba118274d574053
Author: Eike Rathke 
AuthorDate: Fri Jun 4 13:37:55 2021 +0200
Commit: Eike Rathke 
CommitDate: Mon Jun 7 13:59:54 2021 +0200

Resolves: tdf#142216 Fix {hu-HU} AM/PM words, default time without leading 0

Change-Id: Ief925b01a882bd59807b7e6e8c84b77b5ca3485f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116713
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/localedata/data/hu_HU.xml 
b/i18npool/source/localedata/data/hu_HU.xml
index 29b8068e23cd..35b2a9cfdda3 100644
--- a/i18npool/source/localedata/data/hu_HU.xml
+++ b/i18npool/source/localedata/data/hu_HU.xml
@@ -47,8 +47,8 @@
   „
   ”
 
-DE
-DU
+de.
+du.
 metric
   
   
@@ -277,10 +277,10 @@
   [NatNum12 ordinal year]
 
 
-  HH:MM
+  H:MM
 
 
-  HH:MM:SS
+  H:MM:SS
 
 
   HH:MM AM/PM
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[MIhail Balabanov (via logerrit)]

 i18npool/source/localedata/data/bg_BG.xml |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit b3540898464d8eff745c564a66077f67199223e0
Author: MIhail Balabanov 
AuthorDate: Sun Apr 11 00:06:14 2021 +0200
Commit: Eike Rathke 
CommitDate: Fri Jun 4 12:33:24 2021 +0200

Fix the  entries for Bulgarian

Change-Id: I349a5a1fc9a93225f6129bd26f0387a3681f08ef
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113860
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/i18npool/source/localedata/data/bg_BG.xml 
b/i18npool/source/localedata/data/bg_BG.xml
index a4569ccfac36..78dc17cc22b1 100644
--- a/i18npool/source/localedata/data/bg_BG.xml
+++ b/i18npool/source/localedata/data/bg_BG.xml
@@ -208,8 +208,8 @@
   
 А-Ь Ѣ Ю-Я 
Ѫ
 8
-стр.
-стр.
+ и сл.
+ и сл.
   
   
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[Jan-Marek Glogowski (via logerrit)]

 i18npool/source/textconversion/textconversion_ko.cxx |   23 ---
 1 file changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 62be589df821687b36188e977b163fd58599c9ff
Author: Jan-Marek Glogowski 
AuthorDate: Mon May 17 16:53:31 2021 +0200
Commit: Jan-Marek Glogowski 
CommitDate: Tue May 25 20:05:19 2021 +0200

Don't ignore GCC warnings for static builds

Instead simply (and correctly) test the function pointers in the
static build case.

Change-Id: I01b3397f40671464b1d2cb472447d8530b996d21
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116117
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/i18npool/source/textconversion/textconversion_ko.cxx 
b/i18npool/source/textconversion/textconversion_ko.cxx
index d57495a546f1..e03286b772d7 100644
--- a/i18npool/source/textconversion/textconversion_ko.cxx
+++ b/i18npool/source/textconversion/textconversion_ko.cxx
@@ -105,7 +105,6 @@ static sal_Int16 checkScriptType(sal_Unicode c)
 }
 
 #ifdef DISABLE_DYNLOADING
-
 extern "C" {
 
 const sal_Unicode* getHangul2HanjaData();
@@ -115,7 +114,6 @@ const sal_uInt16* getHanja2HangulIndex();
 const sal_Unicode* getHanja2HangulData();
 
 }
-
 #endif
 
 Sequence< OUString >
@@ -129,15 +127,12 @@ TextConversion_ko::getCharConversions(const OUString& 
aText, sal_Int32 nStartPos
 sal_Int16 (*getHangul2HanjaIndexCount)() = reinterpret_cast(getFunctionBySymbol("getHangul2HanjaIndexCount"));
 const sal_uInt16* (*getHanja2HangulIndex)() = reinterpret_cast(getFunctionBySymbol("getHanja2HangulIndex"));
 const sal_Unicode* (*getHanja2HangulData)() = reinterpret_cast(getFunctionBySymbol("getHanja2HangulData"));
+
+if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && 
getHangul2HanjaData)
 #else
-#pragma GCC diagnostic push
-#ifdef __clang__
-#pragma GCC diagnostic warning "-Wbool-conversions"
-#else
-#pragma GCC diagnostic warning "-Waddress"
-#endif
+if (toHanja)
 #endif
-if (toHanja && getHangul2HanjaIndex && getHangul2HanjaIndexCount && 
getHangul2HanjaData) {
+{
 ch = aText[nStartPos];
 const Hangul_Index *Hangul_ko = getHangul2HanjaIndex();
 sal_Int16 top =  getHangul2HanjaIndexCount();
@@ -160,7 +155,12 @@ TextConversion_ko::getCharConversions(const OUString& 
aText, sal_Int32 nStartPos
 break;
 }
 }
-} else if (! toHanja && getHanja2HangulIndex && getHanja2HangulData)
+}
+#ifndef DISABLE_DYNLOADING
+else if (!toHanja && getHanja2HangulIndex && getHanja2HangulData)
+#else
+else if (!toHanja)
+#endif
 {
 std::unique_ptr newStr(new sal_Unicode[nLength+1]);
 sal_Int32 count = 0;
@@ -182,9 +182,6 @@ TextConversion_ko::getCharConversions(const OUString& 
aText, sal_Int32 nStartPos
 output[0] = OUString(newStr.get(), count);
 }
 }
-#if defined(DISABLE_DYNLOADING)
-#pragma GCC diagnostic pop
-#endif
 return output;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source

[Eike Rathke (via logerrit)]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit e8c373d1da87256933ece80b896ecd0f03c8cb43
Author: Eike Rathke 
AuthorDate: Sat May 15 00:48:32 2021 +0200
Commit: Eike Rathke 
CommitDate: Sat May 15 01:30:34 2021 +0200

Related: tdf#128314 Add NatNum12 modifier 'lower' attribute

Similar to capitalize, upper and title.

Change-Id: I5933362e69ebbc3cf31de4258aceec5677b76653
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115640
Reviewed-by: Eike Rathke 
Tested-by: Jenkins

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index b437edcd198e..8541c9739e84 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -637,12 +637,13 @@ OUString 
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 
 if (nNativeNumberMode == NativeNumberMode::NATNUM12)
 {
-// handle capitalization prefixes "capitalize", "upper" and "title"
+// handle capitalization prefixes "capitalize", "upper", "lower" and 
"title"
 
 enum WhichCasing
 {
 CAPITALIZE,
 UPPER,
+LOWER,
 TITLE
 };
 
@@ -656,6 +657,7 @@ OUString 
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 {
 { std::u16string_view(u"capitalize"), CAPITALIZE },
 { std::u16string_view(u"upper"), UPPER },
+{ std::u16string_view(u"lower"), LOWER },
 { std::u16string_view(u"title"), TITLE }
 };
 
@@ -685,6 +687,8 @@ OUString 
NativeNumberSupplierService::getNativeNumberString(const OUString& aNum
 (aStr.getLength() > 1 ? aStr.copy(1) : OUString());
 case UPPER:
 return xCharClass->toUpper(aStr, 0, aStr.getLength(), 
aLocale);
+case LOWER:
+return xCharClass->toLower(aStr, 0, aStr.getLength(), 
aLocale);
 case TITLE:
 return xCharClass->toTitle(aStr, 0, aStr.getLength(), 
aLocale);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18npool/source offapi/com

[Mike Kaganski (via logerrit)]

 i18npool/source/transliteration/transliterationImpl.cxx  |2 +-
 offapi/com/sun/star/i18n/TransliterationModulesExtra.idl |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e5ed5c3ef64934c410ad561c3862dc03e757cc7
Author: Mike Kaganski 
AuthorDate: Fri May 14 10:07:29 2021 +0200
Commit: Mike Kaganski 
CommitDate: Fri May 14 11:16:06 2021 +0200

Typos in comments

Change-Id: I6d421f007f6a4b1550e0c8c907feea2472216502
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/115517
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/i18npool/source/transliteration/transliterationImpl.cxx 
b/i18npool/source/transliteration/transliterationImpl.cxx
index 88fc122e4eca..46368d88e167 100644
--- a/i18npool/source/transliteration/transliterationImpl.cxx
+++ b/i18npool/source/transliteration/transliterationImpl.cxx
@@ -202,7 +202,7 @@ TransliterationImpl::loadModule( TransliterationModules 
modType, const Locale& r
 bodyCascade[numCascade], 
rLocale))
 numCascade++;
 }
-// additional transliterations from TranslationModuleExtra (we cannot 
extend TransliterationModule)
+// additional transliterations from TransliterationModulesExtra (we 
cannot extend TransliterationModules)
 if (bool(modType & 
TransliterationModules(TransliterationModulesExtra::IGNORE_DIACRITICS_CTL)))
 {
 if (loadModuleByName("ignoreDiacritics_CTL", 
bodyCascade[numCascade], rLocale))
diff --git a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl 
b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
index 5a67714ba640..baaa14c13a5e 100644
--- a/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
+++ b/offapi/com/sun/star/i18n/TransliterationModulesExtra.idl
@@ -56,7 +56,7 @@ constants TransliterationModulesExtra
 diacritic from characters.
 
 Because we cannot extend the TransliterationModules enum we use
-TranslationModuleExtra and it will act the same way.
+TransliterationModulesExtra and it will act the same way.
  */
 const long IGNORE_DIACRITICS_CTL   = 0x4000;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits