From 7a142d8932990b253e51be29b1f0b861c9111d9f Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sun, 18 Sep 2011 22:35:32 +0100 Subject: drop intermediate ByteString --- basic/source/runtime/methods.cxx | 11 +++++------ basic/source/runtime/step1.cxx | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) (limited to 'basic') diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 2f110304d5b5..2123d940fd34 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -369,17 +369,16 @@ void implChr( SbxArray& rPar, bool bChrW ) { SbxVariableRef pArg = rPar.Get( 1 ); - String aStr; + rtl::OUString aStr; if( !bChrW && SbiRuntime::isVBAEnabled() ) { - sal_Char c = (sal_Char)pArg->GetByte(); - ByteString s( c ); - aStr = String( s, gsl_getSystemTextEncoding() ); + sal_Char c = static_cast(pArg->GetByte()); + aStr = rtl::OUString(&c, 1, gsl_getSystemTextEncoding()); } else { - sal_Unicode aCh = (sal_Unicode)pArg->GetUShort(); - aStr = String( aCh ); + sal_Unicode aCh = static_cast(pArg->GetUShort()); + aStr = rtl::OUString(aCh); } rPar.Get(0)->PutString( aStr ); } diff --git a/basic/source/runtime/step1.cxx b/basic/source/runtime/step1.cxx index 7dbf23e2d319..9fa4e9c4927f 100644 --- a/basic/source/runtime/step1.cxx +++ b/basic/source/runtime/step1.cxx @@ -428,7 +428,7 @@ void SbiRuntime::StepCLOSE( sal_uInt32 nOp1 ) void SbiRuntime::StepPRCHAR( sal_uInt32 nOp1 ) { - ByteString s( (char) nOp1 ); + rtl::OString s(static_cast(nOp1)); pIosys->Write( s ); Error( pIosys->GetError() ); } -- cgit option> LibreOffice 核心代码仓库文档基金会
summaryrefslogtreecommitdiff