summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorEike Rathke <erack@redhat.com>2018-08-16 15:50:02 +0200
committerCaolán McNamara <caolanm@redhat.com>2018-08-17 17:17:52 +0200
commit04e12e17cd7a9b7e740299560e8e3e0ba2822ca3 (patch)
tree181053326518f09be2b26d5e4eb11c182defde9b /sw/source
parent2b52e332b7d6cd18cb024295c1218517cf6d27d9 (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 'sw/source')
-rw-r--r--sw/source/core/fields/fldbas.cxx6
-rw-r--r--sw/source/filter/ww8/ww8par5.cxx2
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3087bc382eb8..cd80d853632d 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -495,7 +495,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;
@@ -603,7 +603,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
@@ -645,7 +645,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 efd87ee64a05..4d1f84a9ad76 100644
--- a/sw/source/filter/ww8/ww8par5.cxx
+++ b/sw/source/filter/ww8/ww8par5.cxx
@@ -478,7 +478,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;