diff options
| author | Eike Rathke <erack@redhat.com> | 2018-08-16 15:50:02 +0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-08-17 17:17:52 +0200 |
| commit | 04e12e17cd7a9b7e740299560e8e3e0ba2822ca3 (patch) | |
| tree | 181053326518f09be2b26d5e4eb11c182defde9b /sc | |
| parent | 2b52e332b7d6cd18cb024295c1218517cf6d27d9 (diff) | |
Resolves: tdf#119013 do not over-aggressively reorder date particles
In particular not when reading documents as we don't know what the
original (default/system) locale was when the date format was
created and stored and whether the format's date order actually
matched the locale's ordering.
Regression from
commit 51478cefaa4e265b42e3f67eda0a64767ff3efba
CommitDate: Tue Apr 18 17:01:27 2017 +0200
Resolves: tdf#107012 follow date order of the target locale
Change-Id: I9d3bdbd512d95ed81ff6459e368a2d7497ec8a2d
Reviewed-on: https://gerrit.libreoffice.org/59182
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5b8007afdb97d416ee7c22bf9226e927d61e9bd3)
Reviewed-on: https://gerrit.libreoffice.org/59215
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/filter/excel/xistyle.cxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/docshell/impex.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sc/source/filter/excel/xistyle.cxx b/sc/source/filter/excel/xistyle.cxx index 07216a81db1f..16d53e111dae 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -700,7 +700,7 @@ void XclImpNumFmtBuffer::CreateScFormats() { OUString aFormat( rNumFmt.maFormat ); rFormatter.PutandConvertEntry( aFormat, nCheckPos, - nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage ); + nType, nKey, LANGUAGE_ENGLISH_US, rNumFmt.meLanguage, false); } else nKey = rFormatter.GetFormatIndex( rNumFmt.meOffset, rNumFmt.meLanguage ); diff --git a/sc/source/ui/docshell/impex.cxx b/sc/source/ui/docshell/impex.cxx index 854bc92b9635..9af724054c25 100644 --- a/sc/source/ui/docshell/impex.cxx +++ b/sc/source/ui/docshell/impex.cxx @@ -2035,7 +2035,7 @@ bool ScImportExport::Sylk2Doc( SvStream& rStrm ) SvNumFormatType nType; sal_uInt32 nKey; pDoc->GetFormatTable()->PutandConvertEntry( aCode, nCheckPos, nType, nKey, - LANGUAGE_ENGLISH_US, ScGlobal::eLnge ); + LANGUAGE_ENGLISH_US, ScGlobal::eLnge, false); if ( nCheckPos ) nKey = 0; aFormats.push_back( nKey ); |