diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-04 23:58:05 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-09 12:16:56 +0100 |
commit | 104261010aa5ccbb7df4a82a3a3cafcfb0591fa7 (patch) | |
tree | b8db79d2707ff5925ad01dba8a41bd8ab6d66847 /basic | |
parent | 1a1e953ee33c213dc8b88dd96a69ca9fc5e42d50 (diff) |
some UniString->rtl::OUString
Change-Id: Ie69b30094da25df23a36baca2c7723d6a41f48c3
Diffstat (limited to 'basic')
-rw-r--r-- | basic/source/basmgr/basmgr.cxx | 10 | ||||
-rw-r--r-- | basic/source/comp/basiccharclass.cxx | 3 | ||||
-rw-r--r-- | basic/source/comp/dim.cxx | 2 | ||||
-rw-r--r-- | basic/source/comp/parser.cxx | 2 |
4 files changed, 9 insertions, 8 deletions
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 8fa93f5458fb..5d25cd4d9bb6 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -1810,10 +1810,12 @@ ErrCode BasicManager::ExecuteMacro( String const& i_fullyQualifiedName, String c } // add quoted arguments and do the call - String sCall( '[' ); - sCall += pMethod->GetName(); - sCall += sQuotedArgs; - sCall += ']'; + rtl::OUString sCall = rtl::OUStringBuffer(). + append('['). + append(pMethod->GetName()). + append(sQuotedArgs). + append(']'). + makeStringAndClear(); SbxVariable* pRet = pMethod->GetParent()->Execute( sCall ); if ( pRet && ( pRet != pMethod ) ) diff --git a/basic/source/comp/basiccharclass.cxx b/basic/source/comp/basiccharclass.cxx index eb11a39a00a7..bea29241caa7 100644 --- a/basic/source/comp/basiccharclass.cxx +++ b/basic/source/comp/basiccharclass.cxx @@ -110,9 +110,8 @@ bool BasicCharClass::isLetterUnicode( sal_Unicode c ) static CharClass* pCharClass = NULL; if( pCharClass == NULL ) pCharClass = new CharClass( Application::GetSettings().GetLocale() ); - String aStr( c ); // can we get pCharClass to accept a sal_Unicode instead of this waste? - return pCharClass->isLetter( aStr, 0 ); + return pCharClass->isLetter( rtl::OUString(c), 0 ); } bool BasicCharClass::isAlpha( sal_Unicode c, bool bCompatible ) diff --git a/basic/source/comp/dim.cxx b/basic/source/comp/dim.cxx index 1acc7c98b3ea..9b3bbad15a2f 100644 --- a/basic/source/comp/dim.cxx +++ b/basic/source/comp/dim.cxx @@ -138,7 +138,7 @@ void SbiParser::TypeDecl( SbiSymDef& rDef, sal_Bool bAsNewAlreadyParsed ) // #52709 DIM AS NEW for Uno with full-qualified name if( Peek() == DOT ) { - String aDotStr( '.' ); + rtl::OUString aDotStr( '.' ); while( Peek() == DOT ) { aCompleteName += aDotStr; diff --git a/basic/source/comp/parser.cxx b/basic/source/comp/parser.cxx index 1af42ef2fadb..f958a88b30a8 100644 --- a/basic/source/comp/parser.cxx +++ b/basic/source/comp/parser.cxx @@ -722,7 +722,7 @@ void SbiParser::Implements() Next(); if( Peek() == DOT ) { - String aDotStr( '.' ); + rtl::OUString aDotStr( '.' ); while( Peek() == DOT ) { aImplementedIface += aDotStr; |