diff options
Diffstat (limited to 'basic/source/classes')
| -rw-r--r-- | basic/source/classes/image.cxx | 2 | ||||
| -rw-r--r-- | basic/source/classes/sb.cxx | 16 |
2 files changed, 9 insertions, 9 deletions
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx index 5aecb53318de..57ca034e66f3 100644 --- a/basic/source/classes/image.cxx +++ b/basic/source/classes/image.cxx @@ -474,7 +474,7 @@ String SbiImage::GetString( short nId ) const if( nLen == 1 ) { // Force length 1 and make char 0 afterwards - String aNullCharStr( String::CreateFromAscii( " " ) ); + String aNullCharStr( rtl::OUString(" ") ); aNullCharStr.SetChar( 0, 0 ); return aNullCharStr; } diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index 79fc969aecb9..c18d0eaf501f 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -1915,10 +1915,10 @@ BasicCollection::BasicCollection( const XubString& rClass ) { if( !nCountHash ) { - nCountHash = MakeHashCode( String::CreateFromAscii( pCountStr ) ); - nAddHash = MakeHashCode( String::CreateFromAscii( pAddStr ) ); - nItemHash = MakeHashCode( String::CreateFromAscii( pItemStr ) ); - nRemoveHash = MakeHashCode( String::CreateFromAscii( pRemoveStr ) ); + nCountHash = MakeHashCode( rtl::OUString::createFromAscii( pCountStr ) ); + nAddHash = MakeHashCode( rtl::OUString::createFromAscii( pAddStr ) ); + nItemHash = MakeHashCode( rtl::OUString::createFromAscii( pItemStr ) ); + nRemoveHash = MakeHashCode( rtl::OUString::createFromAscii( pRemoveStr ) ); } Initialize(); @@ -1940,14 +1940,14 @@ void BasicCollection::Initialize() SetFlag( SBX_FIXED ); ResetFlag( SBX_WRITE ); SbxVariable* p; - p = Make( String::CreateFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER ); + p = Make( rtl::OUString::createFromAscii( pCountStr ), SbxCLASS_PROPERTY, SbxINTEGER ); p->ResetFlag( SBX_WRITE ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pAddStr ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT ); + p = Make( rtl::OUString::createFromAscii( pItemStr ), SbxCLASS_METHOD, SbxVARIANT ); p->SetFlag( SBX_DONTSTORE ); - p = Make( String::CreateFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY ); + p = Make( rtl::OUString::createFromAscii( pRemoveStr ), SbxCLASS_METHOD, SbxEMPTY ); p->SetFlag( SBX_DONTSTORE ); if ( !xAddInfo.Is() ) { |