diff options
author | Eike Rathke <erack@redhat.com> | 2013-04-18 22:53:00 +0200 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2013-04-18 22:57:47 +0200 |
commit | 1ef2cce787df3d254a78ebdb469fb06668f350f4 (patch) | |
tree | 2a3f81bc4ff7fde1e4e7137a268b4586977c230b /basic | |
parent | fdo#63503 add 'Delete Last' button to Special Characters dialog (diff) | |
download | core-1ef2cce787df3d254a78ebdb469fb06668f350f4.tar.gz core-1ef2cce787df3d254a78ebdb469fb06668f350f4.zip |
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
Diffstat (limited to 'basic')
-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 815030d76e87..d18f42b05cd8 100644 --- a/basic/source/runtime/runtime.cxx +++ b/basic/source/runtime/runtime.cxx @@ -389,12 +389,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 ); } |