diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-12-12 09:36:55 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-12-12 09:39:00 +0000 |
| commit | 1b1f0bbb28c6146f3aa12ef3f87f2eb1aa0c7479 (patch) | |
| tree | ab54a1a08bbcbda9efc52370d97faf85497fa1de /rsc/source/parser | |
| parent | 4521fc855b319bd8aa6583900d97c026bcc5f32f (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'rsc/source/parser')
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 8 | ||||
| -rw-r--r-- | rsc/source/parser/rsclex.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.y | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 4e2ba9f30080..e4cc72a2d561 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -147,19 +147,19 @@ void RscLangEnum::Init( RscNameTable& rNames ) rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); if ( aEnvIsoTokens.getLength() ) { - ByteString aIsoToken; + rtl::OString aIsoToken; sal_uInt16 nTokenCounter = 0; sal_Bool bOneMore = 1; while ( bOneMore ) { aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' '); - if ( aIsoToken.Len() ) + if ( aIsoToken.getLength() ) { - SetConstant( rNames.Put( aIsoToken.GetBuffer(), CONSTNAME, mnLangId ), mnLangId ); + SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId ); if ( ! GetLangId( aIsoToken )) ULong_Iso_map[ aIsoToken ] = mnLangId; #if OSL_DEBUG_LEVEL > 2 - fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.GetBuffer(), mnLangId ); + fprintf( stderr, "Env ISO Language out: %s 0x%lx\n", aIsoToken.getStr(), mnLangId ); #endif mnLangId++; } diff --git a/rsc/source/parser/rsclex.cxx b/rsc/source/parser/rsclex.cxx index df388d9c63c0..0edbb549238b 100644 --- a/rsc/source/parser/rsclex.cxx +++ b/rsc/source/parser/rsclex.cxx @@ -381,7 +381,7 @@ void IncludeParser( RscFileInst * pFileInst ) } else if( INCLUDE_STRING == nToken ){ lKey = pTypCon->aFileTab.NewIncFile( aYYSType.string, - ByteString() ); + rtl::OString() ); pFName->InsertDependFile( lKey, ULONG_MAX ); }; }; diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 6c401d55d66a..4ba11f4b5a9b 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -504,13 +504,13 @@ type { if( $1 ) { - ByteString aTypeName = pHS->getString( $1->GetId() ); - aTypeName += "[]"; - $$ = pTC->SearchType( pHS->getID( aTypeName.GetBuffer(), true ) ); + rtl::OString aTypeName = rtl::OStringBuffer(pHS->getString($1->GetId())). + append("[]").makeStringAndClear(); + $$ = pTC->SearchType( pHS->getID( aTypeName.getStr(), true ) ); if( !$$ ) { RscCont * pCont; - pCont = new RscCont( pHS->getID( aTypeName.GetBuffer() ), RSC_NOTYPE ); + pCont = new RscCont( pHS->getID( aTypeName.getStr() ), RSC_NOTYPE ); pCont->SetTypeClass( $1 ); pTC->InsertType( pCont ); $$ = pCont; |