diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 20:21:15 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2011-09-27 20:22:03 +0200 |
| commit | 6671fa81db0ecea4ada005bb79f55f08fb440ad4 (patch) | |
| tree | 85ad806ece8d60736b6b01310b04b053dc2f8179 /rsc | |
| parent | b6d8251eee90b7e24ebb3f8452eff36a507e6d91 (diff) | |
Removed uses of rtl::O[U]String[Buffer]::operator sal_{char|Unicode} const *().
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscdb.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/parser/rscyacc.y | 16 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 2 |
3 files changed, 10 insertions, 10 deletions
diff --git a/rsc/source/parser/rscdb.cxx b/rsc/source/parser/rscdb.cxx index 3368c1fb54f8..38b4d1e91fb0 100644 --- a/rsc/source/parser/rscdb.cxx +++ b/rsc/source/parser/rscdb.cxx @@ -115,7 +115,7 @@ static sal_uInt32 getLangIdAndShortenLocale( RscTypCont* pTypCont, sal_uInt32 nRet = GetLangId( aL ); if( nRet == 0 ) { - pTypCont->AddLanguage( aL ); + pTypCont->AddLanguage( aL.getStr() ); nRet = GetLangId( aL ); } if( rVariant.getLength() ) diff --git a/rsc/source/parser/rscyacc.y b/rsc/source/parser/rscyacc.y index 7a7bb327871c..b48537a7529c 100644 --- a/rsc/source/parser/rscyacc.y +++ b/rsc/source/parser/rscyacc.y @@ -175,7 +175,7 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember ) } else pTC->pEH->Error( ERR_FALSETYPE, S.Top().pClass, aName1, - pHS->getString( pHeader->pClass->GetId() ) ); + pHS->getString( pHeader->pClass->GetId() ).getStr() ); } else { @@ -214,7 +214,7 @@ sal_Bool DoClassHeader( RSCHEADER * pHeader, sal_Bool bMember ) { if( ERR_CONT_INVALIDTYPE == aError ) pTC->pEH->Error( aError, S.Top().pClass, aName1, - pHS->getString( pHeader->pClass->GetId() ) ); + pHS->getString( pHeader->pClass->GetId() ).getStr() ); else pTC->pEH->Error( aError, S.Top().pClass, aName1 ); S.Top().pClass->GetElement( S.Top(), RscId(), @@ -775,7 +775,7 @@ var_header_class else { pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; @@ -804,7 +804,7 @@ var_header_class else { pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; if( !DoClassHeader( &$6, sal_True ) ) @@ -833,7 +833,7 @@ var_header_class else { pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; if( !DoClassHeader( &$6, sal_True ) ) @@ -853,7 +853,7 @@ var_header S.Push( aInst ); else{ pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; } @@ -877,7 +877,7 @@ var_header } else{ pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; } @@ -902,7 +902,7 @@ var_header } else{ pTC->pEH->Error( ERR_NOVARIABLENAME, S.Top().pClass, RscId(), - pHS->getString( $1 ) ); + pHS->getString( $1 ).getStr() ); return( ERR_ERROR ); }; } diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 649c96b62210..24fac69a4a87 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -840,7 +840,7 @@ ERRTYPE RscCompiler::Link() sMsg += "temporary rc file: " + aRcTmp + "\n"; sMsg += "temporary ilst file: " + aSysListTmp + "\n"; sMsg += "ilst file: " + aSysList + "\n"; - pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg); + pTC->pEH->FatalError(ERR_OPENFILE, RscId(), sMsg.getStr()); } if ( NULL == (fExitFile = foutput = fopen( aRcTmp.getStr(), "wb" )) ) pTC->pEH->FatalError( ERR_OPENFILE, RscId(), aRcTmp.getStr() ); |