diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 23:01:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-21 09:47:37 +0100 |
| commit | 0577f19870453e7bc707b59d57c5331df7bde14d (patch) | |
| tree | 3ab5310218ca1bea96dec5fb03eef8e69ad88760 /rsc/source/res | |
| parent | 59cb0469897b1d2c57386510ad321a72e5477ad4 (diff) | |
ByteString->rtl::OString[Buffer]
Diffstat (limited to 'rsc/source/res')
| -rw-r--r-- | rsc/source/res/rscmgr.cxx | 21 | ||||
| -rw-r--r-- | rsc/source/res/rscstr.cxx | 8 |
2 files changed, 13 insertions, 16 deletions
diff --git a/rsc/source/res/rscmgr.cxx b/rsc/source/res/rscmgr.cxx index 663ab351318b..33b08d0fd582 100644 --- a/rsc/source/res/rscmgr.cxx +++ b/rsc/source/res/rscmgr.cxx @@ -234,11 +234,10 @@ ERRTYPE RscMgr::WriteRcHeader( const RSCINST & rInst, RscWriteRc & rMem, GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); - aMsg += ' '; - aMsg += pClassData->aRefId.GetName(); + rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); + aMsg.append(' ').append(pClassData->aRefId.GetName()); aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error( aError, rInst.pClass, rId, aMsg.GetBuffer() ); + pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr()); } } @@ -370,11 +369,10 @@ ERRTYPE RscMgr::WriteHxxHeader( const RSCINST & rInst, FILE * fOutput, pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); - aMsg += ' '; - aMsg += pClassData->aRefId.GetName(); + rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); + aMsg.append(' ').append(pClassData->aRefId.GetName()); aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error( aError, rInst.pClass, rId, aMsg.GetBuffer() ); + pTC->pEH->Error(aError, rInst.pClass, rId, aMsg.getStr()); } } @@ -450,11 +448,10 @@ ERRTYPE RscMgr::WriteCxxHeader( const RSCINST & rInst, FILE * fOutput, pObjNode = rInst.pClass->GetObjNode( pClassData->aRefId ); if( !pObjNode && pTC ) { - ByteString aMsg( pHS->getString( rInst.pClass->GetId() ).getStr() ); - aMsg += ' '; - aMsg += pClassData->aRefId.GetName(); + rtl::OStringBuffer aMsg(pHS->getString(rInst.pClass->GetId())); + aMsg.append(' ').append(pClassData->aRefId.GetName()); aError = WRN_MGR_REFNOTFOUND; - pTC->pEH->Error( aError, rInst.pClass, rId, aMsg.GetBuffer() ); + pTC->pEH->Error( aError, rInst.pClass, rId, aMsg.getStr() ); } } diff --git a/rsc/source/res/rscstr.cxx b/rsc/source/res/rscstr.cxx index 9126823b5f76..87c1e9240e63 100644 --- a/rsc/source/res/rscstr.cxx +++ b/rsc/source/res/rscstr.cxx @@ -305,12 +305,12 @@ ERRTYPE RscString::WriteRc( const RSCINST & rInst, RscWriteRc & rMem, { if( pTC ) { - ByteString aMsg( pHS->getString( pRefClass->GetId() ).getStr() ); - aMsg += ' '; - aMsg += aId.GetName(); + rtl::OStringBuffer aMsg(pHS->getString( + pRefClass->GetId())); + aMsg.append(' ').append(aId.GetName()); aError = WRN_STR_REFNOTFOUND; pTC->pEH->Error( aError, rInst.pClass, - RscId(), aMsg.GetBuffer() ); + RscId(), aMsg.getStr() ); } break; } |