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 /sw | |
| 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 'sw')
| -rw-r--r-- | sw/source/core/fields/fldbas.cxx | 6 | ||||
| -rw-r--r-- | sw/source/filter/ww8/ww8par5.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx index 01e43cdc992c..2c51bbab11c4 100644 --- a/sw/source/core/fields/fldbas.cxx +++ b/sw/source/core/fields/fldbas.cxx @@ -502,7 +502,7 @@ OUString SwValueFieldType::ExpandValue( const double& rVal, OUString sFormat(pEntry->GetFormatstring()); pFormatter->PutandConvertEntry(sFormat, nDummy, nType, nFormat, - pEntry->GetLanguage(), nFormatLng ); + pEntry->GetLanguage(), nFormatLng, false); } else nFormat = nNewFormat; @@ -610,7 +610,7 @@ sal_uInt32 SwValueField::GetSystemFormat(SvNumberFormatter* pFormatter, sal_uInt sal_uInt32 nTempFormat = nFormat; pFormatter->PutandConvertEntry(sFormat, nDummy, nType, - nTempFormat, pEntry->GetLanguage(), nLng); + nTempFormat, pEntry->GetLanguage(), nLng, true); nFormat = nTempFormat; } else @@ -660,7 +660,7 @@ void SwValueField::SetLanguage( LanguageType nLng ) pFormatter->PutandConvertEntry( sFormat, nDummy, nType, nNewFormat, pEntry->GetLanguage(), - nFormatLng ); + nFormatLng, false); } SetFormat( nNewFormat ); } diff --git a/sw/source/filter/ww8/ww8par5.cxx b/sw/source/filter/ww8/ww8par5.cxx index 951601fb2196..f0ab52c3b900 100644 --- a/sw/source/filter/ww8/ww8par5.cxx +++ b/sw/source/filter/ww8/ww8par5.cxx @@ -477,7 +477,7 @@ SvNumFormatType SwWW8ImplReader::GetTimeDatePara(OUString const & rStr, sal_uInt OUString sTemp(sParams); pFormatter->PutandConvertEntry(sTemp, nCheckPos, nType, rFormat, - LANGUAGE_ENGLISH_US, rLang); + LANGUAGE_ENGLISH_US, rLang, false); sParams = sTemp; return bHasTime ? SvNumFormatType::DATETIME : SvNumFormatType::DATE; |