diff options
| author | Eike Rathke <erack@redhat.com> | 2013-04-18 22:53:00 +0200 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-04-19 04:53:10 +0000 |
| commit | f2fcd0aac530f0ff217304e1869f33d620087dff (patch) | |
| tree | de989c87e42a5f845a181159fd42397ccfea80e2 | |
| parent | ef3b6fe6411b1f7f0c20361a1a9847e06d4c141f (diff) | |
Revert "svformatter already accept OUString input", fdo#63306
This reverts commit c5e5699c80cfb32a164696a2c5144b5ccb0a91a9.
And adapts to OUString.
Conflicts:
basic/source/runtime/runtime.cxx
Change-Id: Icd7c1e1e57162eefb1f3631aa5509fd3a09c9b08
(cherry picked from commit 1ef2cce787df3d254a78ebdb469fb06668f350f4)
Reviewed-on: https://gerrit.libreoffice.org/3468
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | basic/source/runtime/runtime.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx index 122357733cae..ed1e5d190e1d 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -392,12 +392,14 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter, case YMD: aDateStr = "JJJJ.MM.TT"; break; default: aDateStr = "MM.TT.JJJJ"; break; } - rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType, - rnStdDateIdx, LANGUAGE_GERMAN, eLangType ); + OUString aStr( aDateStr ); // PutandConvertEntry() modifies string! + rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType, + rnStdDateIdx, LANGUAGE_GERMAN, eLangType ); nCheckPos = 0; OUString aStrHHMMSS(" HH:MM:SS"); aDateStr += aStrHHMMSS; - rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType, + aStr = aDateStr; + rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType, rnStdDateTimeIdx, LANGUAGE_GERMAN, eLangType ); } |