diff options
| author | Eike Rathke <erack@redhat.com> | 2018-08-16 15:50:02 +0200 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2018-08-16 18:54:31 +0200 |
| commit | 5b8007afdb97d416ee7c22bf9226e927d61e9bd3 (patch) | |
| tree | d7299707f0a418bfa62fd0104adbe19ec0ce70d0 /sc | |
| parent | 6e03d7ee5734c94d245aea5900c0924fbef2a246 (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
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 ef3b3f5668c9..c058977842f0 100644 --- a/sc/source/filter/excel/xistyle.cxx +++ b/sc/source/filter/excel/xistyle.cxx @@ -702,7 +702,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 2fef2685f18e..9128a93f0195 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 ); |