diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-08-29 23:03:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-08-30 09:32:23 +0100 |
| commit | 98f246d83db8f1a3e90dd794f48c390593a3ef62 (patch) | |
| tree | da17ce5516a0d2fbe4778f08aa5facc0d6d49250 /rsc | |
| parent | 8fd3e7c09177a856fb9ba6de0e42af5d12b67652 (diff) | |
ByteString->rtl::OString
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 3 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 7 |
2 files changed, 6 insertions, 4 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index 057c338e778e..057c809d8f3d 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -36,6 +36,7 @@ #include <string.h> #include <i18npool/mslangid.hxx> +#include <comphelper/string.hxx> #include <tools/rc.h> #include <tools/color.hxx> @@ -158,7 +159,7 @@ void RscLangEnum::Init( RscNameTable& rNames ) sal_Bool bOneMore = 1; while ( bOneMore ) { - aIsoToken = aEnvIsoTokens.GetToken( nTokenCounter, ' ' ); + aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' '); if ( aIsoToken.Len() ) { SetConstant( rNames.Put( aIsoToken.GetBuffer(), CONSTNAME, mnLangId ), mnLangId ); diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index e8c6045fcfff..fc972c4bc2d5 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -75,6 +75,7 @@ using ::rtl::OUString; using ::rtl::OString; using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; +using comphelper::string::getToken; /*************** F o r w a r d s *****************************************/ /*************** G l o b a l e V a r i a b l e n **********************/ @@ -1151,9 +1152,9 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, while( aIStm.ReadLine( aLine ) ) { if( ( aLine.GetTokenCount( '=' ) == 2 ) && - ( aLine.GetToken( 0, '=' ).Search( "File" ) != STRING_NOTFOUND ) ) + ( getToken(aLine, 0, '=').indexOf("File") != -1 ) ) { - ByteString aBaseFileName( aLine.GetToken( 1, '"' ).GetToken( 0, '.' ) ); + ByteString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') ); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) ( ( aLine = "File = \"" ) += aFilePath ) += "\";"; @@ -1179,7 +1180,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } while( aLine.Search( "Prefix" ) == STRING_NOTFOUND ); - const ByteString aPrefix( aLine.GetToken( 1, '"' ) ); + const ByteString aPrefix( getToken(aLine, 1, '"') ); aIStm.Seek( nImgListStartPos ); do |