summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2020-03-15 18:22:05 +0100
committerEike Rathke <erack@redhat.com>2020-03-15 19:32:18 +0100
commit5b88a664b1ad2b5761a4672678845cc77be6cd4d (patch)
tree67e3bbccc2d6caa9bc94f475756083eff6cd7983 /sc
parent1f540cc7613cdbc0048f4013efe43886d256f86b (diff)
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 <erack@redhat.com> Tested-by: Jenkins
Diffstat (limited to 'sc')
-rw-r--r--sc/source/filter/oox/numberformatsbuffer.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sc/source/filter/oox/numberformatsbuffer.cxx b/sc/source/filter/oox/numberformatsbuffer.cxx
index 8d0b620665da..1296853dbe48 100644
--- a/sc/source/filter/oox/numberformatsbuffer.cxx
+++ b/sc/source/filter/oox/numberformatsbuffer.cxx
@@ -2053,7 +2053,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 )
{