diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-01-02 13:21:32 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-01-02 14:22:21 +0100 |
| commit | f8922b67a4dc1ff0b889f33d2407584aed5d2e36 (patch) | |
| tree | c3dbbc81468176b79e03b8222bb174fc24a30e16 /rsc | |
| parent | c7531408b3ef4b2d284edf35ed983c23e7585231 (diff) | |
Remove unnecessary comphelper::string::getToken
Change-Id: I49192637121441b9a1980350b9bb32cd995d4386
Diffstat (limited to 'rsc')
| -rw-r--r-- | rsc/source/parser/rscibas.cxx | 2 | ||||
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/rsc/source/parser/rscibas.cxx b/rsc/source/parser/rscibas.cxx index b5f72362a568..92babd05fd3a 100644 --- a/rsc/source/parser/rscibas.cxx +++ b/rsc/source/parser/rscibas.cxx @@ -126,7 +126,7 @@ void RscLangEnum::Init( RscNameTable& rNames ) bool bOneMore = true; while ( bOneMore ) { - aIsoToken = comphelper::string::getToken(aEnvIsoTokens, nTokenCounter, ' '); + aIsoToken = aEnvIsoTokens.getToken(nTokenCounter, ' '); if ( !aIsoToken.isEmpty() ) { SetConstant( rNames.Put( aIsoToken.getStr(), CONSTNAME, mnLangId ), mnLangId ); diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 3a2115bca037..402fb6711f21 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -54,7 +54,6 @@ #include <vector> #include <algorithm> -using comphelper::string::getToken; using comphelper::string::getTokenCount; OString* pStdParType = NULL; @@ -851,9 +850,9 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, while( aIStm.ReadLine( aLine ) ) { if( ( getTokenCount(aLine, '=') == 2 ) && - ( getToken(aLine, 0, '=').indexOf("File") != -1 ) ) + ( aLine.getToken(0, '=').indexOf("File") != -1 ) ) { - OString aBaseFileName( getToken(getToken(aLine, 1, '"'), 0, '.') ); + OString aBaseFileName( aLine.getToken(1, '"').getToken(0, '.') ); if( GetImageFilePath( rOutputFile, rContext, aBaseFileName, aFilePath, pSysListFile ) ) { @@ -883,7 +882,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, } while (aLine.indexOf("Prefix") == -1); - const OString aPrefix( getToken(aLine, 1, '"') ); + const OString aPrefix( aLine.getToken(1, '"') ); aIStm.Seek( nImgListStartPos ); do |