diff options
author | Caolán McNamara <caolanm@redhat.com> | 2012-07-02 16:02:38 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-03 21:24:35 +0100 |
commit | bccf34c19ae022b67565e212fa4ec0d5213947de (patch) | |
tree | 73c2d2e29ad8d15999cbfb2ff554efa1e502a35e /idl/source/objects/module.cxx | |
parent | 285289275d1cf1769080a208b55be984cd269e1e (diff) |
ditch String::CreateFromAscii
Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691
Diffstat (limited to 'idl/source/objects/module.cxx')
-rw-r--r-- | idl/source/objects/module.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/idl/source/objects/module.cxx b/idl/source/objects/module.cxx index 02a7cc7546d5..18756a6a6025 100644 --- a/idl/source/objects/module.cxx +++ b/idl/source/objects/module.cxx @@ -141,7 +141,7 @@ void SvMetaModule::ReadAttributesSvIdl( SvIdlDataBase & rBase, if( aSlotIdFile.ReadSvIdl( SvHash_SlotIdFile(), rInStm ) ) { sal_uInt32 nTokPos = rInStm.Tell(); - if( !rBase.ReadIdFile( String::CreateFromAscii( aSlotIdFile.getString().getStr() ) ) ) + if( !rBase.ReadIdFile( rtl::OStringToOUString(aSlotIdFile.getString(), RTL_TEXTENCODING_ASCII_US)) ) { rtl::OStringBuffer aStr(RTL_CONSTASCII_STRINGPARAM("cannot read file: ")); aStr.append(aSlotIdFile.getString()); @@ -231,7 +231,7 @@ void SvMetaModule::ReadContextSvIdl( SvIdlDataBase & rBase, SvToken * pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) { - DirEntry aFullName( String::CreateFromAscii( pTok->GetString().getStr() ) ); + DirEntry aFullName( rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US) ); rBase.StartNewFile( aFullName.GetFull() ); if( aFullName.Find( rBase.GetPath() ) ) { @@ -334,14 +334,14 @@ sal_Bool SvMetaModule::ReadSvIdl( SvIdlDataBase & rBase, SvTokenStream & rInStm { pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) - bOk = aBeginName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) ); + bOk = aBeginName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); } rInStm.ReadDelemiter(); if( bOk ) { pTok = rInStm.GetToken_Next(); if( pTok->IsString() ) - bOk = aEndName.MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) ); + bOk = aEndName.MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US)); } rInStm.ReadDelemiter(); if( bOk ) |