diff options
| author | Eike Rathke <erack@redhat.com> | 2020-03-15 18:22:05 +0100 |
|---|---|---|
| committer | Xisco Faulí <xiscofauli@libreoffice.org> | 2020-03-16 16:47:18 +0100 |
| commit | 95d35dd3109263a1708fab143accc0f45a05758d (patch) | |
| tree | 97e1132bd06fddf7212ca2bdd04bd70ff4c93026 | |
| parent | 285313d2703aadbcf4007523b94c832b99e7c12b (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
(cherry picked from commit 5b88a664b1ad2b5761a4672678845cc77be6cd4d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90399
Reviewed-by: Xisco Faulí <xiscofauli@libreoffice.org>
| -rw-r--r-- | sc/source/filter/oox/numberformatsbuffer.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 ) { |