diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-06-21 23:04:05 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-06-22 09:25:35 +0100 |
| commit | e370ee9a887417c93b455562cf60fc375d9725ea (patch) | |
| tree | 691a29e2974c4e83dc69e4f2743c32de7c04e741 /tools/bootstrp | |
| parent | use the new way of specifying UNO API includes (diff) | |
| download | core-e370ee9a887417c93b455562cf60fc375d9725ea.tar.gz core-e370ee9a887417c93b455562cf60fc375d9725ea.zip | |
ditch some old-style strings
Diffstat (limited to 'tools/bootstrp')
| -rw-r--r-- | tools/bootstrp/prj.cxx | 16 | ||||
| -rw-r--r-- | tools/bootstrp/rscdep.cxx | 6 |
2 files changed, 11 insertions, 11 deletions
diff --git a/tools/bootstrp/prj.cxx b/tools/bootstrp/prj.cxx index 00be3bedddee..b44592c562ec 100644 --- a/tools/bootstrp/prj.cxx +++ b/tools/bootstrp/prj.cxx @@ -53,26 +53,26 @@ SimpleConfig::~SimpleConfig() aFileStream.Close (); } -ByteString SimpleConfig::GetNext() +rtl::OString SimpleConfig::getNext() { - if ( aStringBuffer =="" ) + if (aStringBuffer == "") while ((aStringBuffer = GetNextLine()) == "\t") ; //solange bis != "\t" - if ( aStringBuffer =="" ) - return ByteString(); + if ( aStringBuffer == "" ) + return rtl::OString(); - ByteString aString = aStringBuffer.GetToken(0,'\t'); - aStringBuffer.Erase(0, aString.Len()+1); + rtl::OString aString = aStringBuffer.GetToken(0,'\t'); + aStringBuffer.Erase(0, aString.getLength()+1); aStringBuffer.EraseLeadingChars( '\t' ); return aString; } -ByteString SimpleConfig::GetNextLine() +rtl::OString SimpleConfig::GetNextLine() { aFileStream.ReadLine ( aTmpStr ); if ( aTmpStr.Search( "#" ) == 0 ) - return "\t"; + return rtl::OString('\t'); aTmpStr = aTmpStr.EraseLeadingChars(); aTmpStr = aTmpStr.EraseTrailingChars(); while ( aTmpStr.SearchAndReplace(ByteString(' '),ByteString('\t') ) != STRING_NOTFOUND ) ; diff --git a/tools/bootstrp/rscdep.cxx b/tools/bootstrp/rscdep.cxx index 1ebd9e85ac9a..d1e26f21d27a 100644 --- a/tools/bootstrp/rscdep.cxx +++ b/tools/bootstrp/rscdep.cxx @@ -125,13 +125,13 @@ int main( int argc, char** argv ) } if (aBuf[0] == '@' ) { - ByteString aToken; + rtl::OString aToken; String aRespName( &aBuf[1], gsl_getSystemTextEncoding()); SimpleConfig aConfig( aRespName ); - while ( (aToken = aConfig.GetNext()) != "") + while ((aToken = aConfig.getNext()).getLength()) { char aBuf2[255]; - (void) strcpy( aBuf2, aToken.GetBuffer()); + strcpy( aBuf2, aToken.getStr()); if ( aBuf[0] == '-' && aBuf[1] == 'p' && aBuf[2] == '=' ) { strcpy(pFileNamePrefix, &aBuf[3]); |