From 363d2c6f8bb3de234f1576a5995677d4b9a65fba Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 22 Oct 2012 10:51:51 +0200 Subject: use OUString for intermediary result in PrepareNumberFormatter Change-Id: I9435d926beb2fd7ebe350f61634673eed7228fbe --- basic/source/runtime/runtime.cxx | 17 +++++++++-------- 1 file 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 -- cgit v1.2.3