diff options
Diffstat (limited to 'rsc/source/parser')
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rscicpx.cxx | 4 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.y | 10 |
3 files changed, 9 insertions, 9 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 9024281c0cf0..a7fdf0c6f137 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -144,8 +144,8 @@ void RscLangEnum::Init( RscNameTable& rNames ) nIndex++; } - ByteString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); - if ( aEnvIsoTokens.Len() ) + rtl::OString aEnvIsoTokens = getenv( "RSC_LANG_ISO" ); + if ( aEnvIsoTokens.getLength() ) { ByteString aIsoToken; sal_uInt16 nTokenCounter = 0; diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index c59acfb8273e..ad70349f17b0 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -47,7 +47,7 @@ /************************************************************************* |* RscTypCont::InsWinBit() *************************************************************************/ -void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, +void RscTypCont::InsWinBit( RscTop * pClass, const rtl::OString& rName, Atom nVal ) { RscClient * pClient; @@ -56,7 +56,7 @@ void RscTypCont::InsWinBit( RscTop * pClass, const ByteString & rName, aBaseLst.push_back( pClient = new RscClient( pHS->getID( "sal_Bool" ), RSC_NOTYPE, &aWinBits, nVal ) ); - Atom nId = aNmTb.Put( rName.GetBuffer(), VARNAME ); + Atom nId = aNmTb.Put( rName.getStr(), VARNAME ); pClass->SetVariable( nId, pClient, NULL, VAR_NODATAINST, 0, nWinBitVarId ); } diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index a89560a4ad6f..61f028e558ec 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -389,7 +389,7 @@ resource_definition if( $4.IsNumber() ){ if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - ByteString( $3 ), + rtl::OString( $3 ), $4.GetLong(), ULONG_MAX ) ) bError = sal_True; } @@ -403,12 +403,12 @@ resource_definition pExpr = new RscExpression( aExpType, '+', $4 ); if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - ByteString( $3 ), pExpr, ULONG_MAX ) ) + rtl::OString( $3 ), pExpr, ULONG_MAX ) ) bError = sal_True; } else if( $4.IsExpression() ){ if( !pTC->aFileTab.NewDef( pFI->GetFileIndex(), - ByteString( $3 ), $4.aExp.pExp, + rtl::OString( $3 ), $4.aExp.pExp, ULONG_MAX ) ) bError = sal_True; } @@ -1334,7 +1334,7 @@ line_number RscFile * pFName; pFI->SetLineNo( $3 ); - pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $4 ) ) ); + pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $4 ) ) ); pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); pFName->bLoaded = sal_True; pFName->bScanned = sal_True; @@ -1344,7 +1344,7 @@ line_number RscFile * pFName; pFI->SetLineNo( $2 ); - pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( ByteString( $3 ) ) ); + pFI->SetFileIndex( pTC->aFileTab.NewCodeFile( rtl::OString( $3 ) ) ); pFName = pTC->aFileTab.Get( pFI->GetFileIndex() ); pFName->bLoaded = sal_True; pFName->bScanned = sal_True; |