sc/source/filter/oox/numberformatsbuffer.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 95d35dd3109263a1708fab143accc0f45a05758d
Author: Eike Rathke <er...@redhat.com>
AuthorDate: Sun Mar 15 18:22:05 2020 +0100
Commit: Xisco Faulí <xiscofa...@libreoffice.org>
CommitDate: Mon Mar 16 16:47:18 2020 +0100
Resolves: tdf#129985 OOXML import: do not force a fixed-locale number format
... instead of system locale.
Change-Id: Ie7b4c6a560468f142df6916f50bfda9daaf7c379
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90538
Reviewed-by: Eike Rathke <er...@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5b88a664b1ad2b5761a4672678845cc77be6cd4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90399
Reviewed-by: Xisco Faulí <xiscofa...@libreoffice.org>
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx
b/sc/source/filter/oox/numberformatsbuffer.cxx
index 2ca5a3dc88f2..2787dacd3aa0 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2054,7 +2054,7 @@ void NumberFormatsBuffer::insertBuiltinFormats()
{
// do not put the current system locale for default table
Locale aLocale;
- if( (*aVIt)->mpcParent[ 0 ] != '\0' )
+ if( (*aVIt)->mpcParent[ 0 ] != '\0' &&
OUString::createFromAscii((*aVIt)->mpcLocale) != maLocaleStr )
aLocale = aSysLocale;
for( const BuiltinFormat* pBuiltin = (*aVIt)->mpFormats; pBuiltin &&
(pBuiltin->mnNumFmtId >= 0); ++pBuiltin )
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
