Kaydet (Commit) 1ef2cce7 authored tarafından Eike Rathke's avatar Eike Rathke

Revert "svformatter already accept OUString input", fdo#63306

This reverts commit c5e5699c.

And adapts to OUString.

Conflicts:
	basic/source/runtime/runtime.cxx

Change-Id: Icd7c1e1e57162eefb1f3631aa5509fd3a09c9b08
üst ab7776e1
...@@ -389,12 +389,14 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter, ...@@ -389,12 +389,14 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
case YMD: aDateStr = "JJJJ.MM.TT"; break; case YMD: aDateStr = "JJJJ.MM.TT"; break;
default: aDateStr = "MM.TT.JJJJ"; break; default: aDateStr = "MM.TT.JJJJ"; break;
} }
rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType, OUString aStr( aDateStr ); // PutandConvertEntry() modifies string!
rnStdDateIdx, LANGUAGE_GERMAN, eLangType ); rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
rnStdDateIdx, LANGUAGE_GERMAN, eLangType );
nCheckPos = 0; nCheckPos = 0;
OUString aStrHHMMSS(" HH:MM:SS"); OUString aStrHHMMSS(" HH:MM:SS");
aDateStr += aStrHHMMSS; aDateStr += aStrHHMMSS;
rpNumberFormatter->PutandConvertEntry( aDateStr, nCheckPos, nType, aStr = aDateStr;
rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
rnStdDateTimeIdx, LANGUAGE_GERMAN, eLangType ); rnStdDateTimeIdx, LANGUAGE_GERMAN, eLangType );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment