summaryrefslogtreecommitdiff
path: root/rsc/source
diff options
context:
space:
mode:
Diffstat (limited to 'rsc/source')
-rw-r--r--rsc/source/parser/rscibas.cxx2
-rw-r--r--rsc/source/rsc/rsc.cxx7
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