ditch String::CreateFromAscii

Change-Id: I2b482bd323ac510629c5ee31868010b7cd6ce691

4 files changed, 10 insertions, 10 deletions

diff --git a/idl/source/objects/bastype.cxx b/idl/source/objects/bastype.cxx
index 87771116be98..41864df0915a 100644
--- a/idl/source/objects/bastype.cxx
+++ b/idl/source/objects/bastype.cxx
@@ -374,7 +374,7 @@ sal_Bool SvUUId::ReadSvIdl( SvIdlDataBase &, SvTokenStream & rInStm )
             if( pTok->IsString() )
             {
                 pTok = rInStm.GetToken_Next();
-                bOk = MakeId( String::CreateFromAscii( pTok->GetString().getStr() ) );
+                bOk = MakeId(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
             }
             if( bOk && bBraket )
                 bOk = rInStm.Read( ')' );
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 )
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 7a7bc82777a8..182b75723918 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -187,12 +187,12 @@ sal_Bool ReadIdl( SvIdlWorkingBase * pDataBase, const SvCommand & rCommand )
 static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
 {
     // program name
-    pList->push_back( new String( String::CreateFromAscii(*argv) ) );
+    pList->push_back( new String(rtl::OUString::createFromAscii(*argv) ) );
     for( int i = 1; i < argc; i++ )
     {
         if( '@' == **(argv +i) )
         { // when @, then response file
-            SvFileStream aStm( String::CreateFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
+            SvFileStream aStm( rtl::OUString::createFromAscii((*(argv +i)) +1), STREAM_STD_READ | STREAM_NOCREATE );
             if( aStm.GetError() != SVSTREAM_OK )
                 return sal_False;
 
@@ -214,7 +214,7 @@ static sal_Bool ResponseFile( StringList * pList, int argc, char ** argv )
             }
         }
         else if( argv[ i ] )
-            pList->push_back( new String( String::CreateFromAscii( argv[ i ] ) ) );
+            pList->push_back( new String( rtl::OUString::createFromAscii( argv[ i ] ) ) );
     }
     return sal_True;
 }
@@ -369,7 +369,7 @@ SvCommand::SvCommand( int argc, char ** argv )
     {
         if( aPath.Len() )
             aPath += DirEntry::GetSearchDelimiter();
-        aPath += String::CreateFromAscii( aInc.getStr() );
+        aPath += rtl::OStringToOUString(aInc, RTL_TEXTENCODING_ASCII_US);
     }
 }
 
diff --git a/idl/source/prj/database.cxx b/idl/source/prj/database.cxx
index 3171197a1d07..92b161d7b30e 100644
--- a/idl/source/prj/database.cxx
+++ b/idl/source/prj/database.cxx
@@ -640,7 +640,7 @@ sal_Bool SvIdlWorkingBase::ReadSvIdl( SvTokenStream & rInStm, sal_Bool bImported
             pTok = rInStm.GetToken_Next();
             if( pTok->IsString() )
             {
-                DirEntry aFullName( String::CreateFromAscii( pTok->GetString().getStr() ) );
+                DirEntry aFullName(rtl::OStringToOUString(pTok->GetString(), RTL_TEXTENCODING_ASCII_US));
                 if( aFullName.Find( rPath ) )
                 {
                     this->AddDepFile(aFullName.GetFull());