diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 01:13:09 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-09-20 10:11:43 +0100 |
| commit | 70e2e12154c256b9eb1c1b88fb46630c0ac130a1 (patch) | |
| tree | 8875804cbe31dc70d34ce3bac5b311db1d51fe51 /rsc | |
| parent | 07a793a2b73a4449432138f037416075d69c9f4c (diff) | |
ByteString->rtl::OStringBuffer
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index e026b04bdc63..113769410b90 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -851,22 +851,22 @@ ERRTYPE RscCompiler::Link() pTC->ChangeLanguage( it->aLangName ); pTC->SetSourceCharSet( RTL_TEXTENCODING_UTF8 ); pTC->ClearSysNames(); - ByteString aSysSearchPath( it->aLangSearchPath ); + rtl::OStringBuffer aSysSearchPath(it->aLangSearchPath); xub_StrLen nIndex = 0; ByteString aSearchPath = pTC->GetSearchPath(); while( nIndex != STRING_NOTFOUND ) { ByteString aToken = aSearchPath.GetToken( 0, cSearchDelim, nIndex ); - if( aSysSearchPath.Len() ) - aSysSearchPath.Append( cSearchDelim ); - aSysSearchPath.Append( aToken ); - aSysSearchPath.Append( cAccessDelim ); - aSysSearchPath.Append( it->aLangName ); - aSysSearchPath.Append( cSearchDelim ); - aSysSearchPath.Append( aToken ); + if (aSysSearchPath.getLength()) + aSysSearchPath.append(cSearchDelim); + aSysSearchPath.append(aToken); + aSysSearchPath.append(cAccessDelim); + aSysSearchPath.append(it->aLangName); + aSysSearchPath.append(cSearchDelim); + aSysSearchPath.append(aToken); } - OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.GetBuffer() ); - pTC->SetSysSearchPath( aSysSearchPath ); + OSL_TRACE( "setting search path for language %s: %s\n", it->aLangName.GetBuffer(), aSysSearchPath.getStr() ); + pTC->SetSysSearchPath(aSysSearchPath.makeStringAndClear()); WriteRcContext aContext; |