summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-10-22 10:51:51 +0200
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-11-03 20:24:25 -0500
commit363d2c6f8bb3de234f1576a5995677d4b9a65fba (patch)
tree5e7d8bc3b82dc2ac64967d0253bf97a69eea0995
parentde8d81b15777351148ed561f2e85aa22f48f2339 (diff)
use OUString for intermediary result in PrepareNumberFormatter
Change-Id: I9435d926beb2fd7ebe350f61634673eed7228fbe
-rw-r--r--basic/source/runtime/runtime.cxx17
1 files changed, 9 insertions, 8 deletions
diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index f9d1158fbfb3..0b780c1e919b 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -384,33 +384,34 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
// Problem: Print Year(Date) under engl. BS
// also have a look at: svtools\source\sbx\sbxdate.cxx
- String aDateStr;
+ OUString aDateStr;
switch( eDate )
{
- case MDY: aDateStr = String( RTL_CONSTASCII_USTRINGPARAM("MM.TT.JJJJ") ); break;
- case DMY: aDateStr = String( RTL_CONSTASCII_USTRINGPARAM("TT.MM.JJJJ") ); break;
- case YMD: aDateStr = String( RTL_CONSTASCII_USTRINGPARAM("JJJJ.MM.TT") ); break;
- default: aDateStr = String( RTL_CONSTASCII_USTRINGPARAM("MM.TT.JJJJ") );
+ case MDY: aDateStr = "MM.TT.JJJJ"; break;
+ case DMY: aDateStr = "TT.MM.JJJJ"; break;
+ case YMD: aDateStr = "JJJJ.MM.TT"; break;
+ default: aDateStr = "MM.TT.JJJJ"; break;
}
String aStr( aDateStr );
rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
rnStdDateIdx, LANGUAGE_GERMAN, eLangType );
nCheckPos = 0;
- String aStrHHMMSS( RTL_CONSTASCII_USTRINGPARAM(" HH:MM:SS") );
+ OUString aStrHHMMSS(" HH:MM:SS");
+ aDateStr += aStrHHMMSS;
aStr = aDateStr;
- aStr += aStrHHMMSS;
rpNumberFormatter->PutandConvertEntry( aStr, nCheckPos, nType,
rnStdDateTimeIdx, LANGUAGE_GERMAN, eLangType );
}
-
// Let engine run. If Flags == SbDEBUG_CONTINUE, take Flags over
void SbiInstance::Stop()
{
for( SbiRuntime* p = pRun; p; p = p->pNext )
+ {
p->Stop();
+ }
}
// Allows Basic IDE to set watch mode to suppress errors