diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:26:43 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-02-15 15:41:09 +0100 |
| commit | 9ab0b38e95133dab720408cc2c80093b8a201c10 (patch) | |
| tree | 416dde227ed5c4ded99292feb94f36a64c327999 /rsc/source | |
| parent | 42422f2599220b678aa41c4aadeec28df113c3ec (diff) | |
Various string function clean up
Added:
* rtl::OString::matchL
* rtl::OString::endsWith
* rtl::OString::endsWithL
* rtl::OString::indexOfL
* rtl::OString::replaceFirst
* rtl::OString::replaceAll
* rtl::OString::getToken
* rtl::OUString::endsWith
* rtl::OUString::replaceFirst
* rtl::OUString::replaceFirstAsciiL
* rtl::OUString::replaceFirstAsciiLAsciiL
* rtl::OUString::replaceAll
* rtl::OUString::replaceAllAsciiL
* rtl::OUString::replaceAllAsciiLAsciiL
* rtl::OUString::getToken
plus underlying C functions where necessary
Deprecated:
* comphelper::string::remove
* comphelper::string::getToken
Removed:
* comphelper::string::searchAndReplaceAsciiL
* comphelper::string::searchAndReplaceAllAsciiWithAscii
* comphelper::string::searchAndReplaceAsciiI
* comphelper::string::replace
* comphelper::string::matchL
* comphelper::string::matchIgnoreAsciiCaseL
* comphelper::string::indexOfL
Also fixed some apparent misuses of RTL_CONSTASCII_USTRINGPARAM ->
RTL_CONSTASCII_STRINGPARAM.
Diffstat (limited to 'rsc/source')
| -rw-r--r-- | rsc/source/rsc/rsc.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/rsc/source/rsc/rsc.cxx b/rsc/source/rsc/rsc.cxx index 229b5ce36993..d9018d4df9cd 100644 --- a/rsc/source/rsc/rsc.cxx +++ b/rsc/source/rsc/rsc.cxx @@ -75,7 +75,6 @@ using ::rtl::OStringBuffer; using ::rtl::OStringToOUString; using comphelper::string::getToken; using comphelper::string::getTokenCount; -using comphelper::string::indexOfL; /*************** F o r w a r d s *****************************************/ /*************** G l o b a l e V a r i a b l e n **********************/ @@ -1171,7 +1170,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, aOStm.WriteLine(aLine); } - else if (indexOfL(aLine, RTL_CONSTASCII_STRINGPARAM("ImageList")) != -1) + else if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("ImageList")) != -1) { ::std::vector< ::std::pair< rtl::OString, sal_Int32 > > aEntryVector; @@ -1186,7 +1185,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if( !aIStm.ReadLine(aLine) ) break; } - while (indexOfL(aLine, RTL_CONSTASCII_STRINGPARAM("Prefix")) == -1); + while (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("Prefix")) == -1); const rtl::OString aPrefix( getToken(aLine, 1, '"') ); aIStm.Seek( nImgListStartPos ); @@ -1196,7 +1195,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, if (!aIStm.ReadLine(aLine) ) break; } - while (indexOfL(aLine, RTL_CONSTASCII_STRINGPARAM("IdList")) == -1); + while (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("IdList")) == -1); // scan all ids and collect images while (aLine.indexOf('}') == -1) @@ -1231,7 +1230,7 @@ void RscCompiler::PreprocessSrsFile( const RscCmdLine::OutputFile& rOutputFile, { aIStm.ReadLine( aLine ); - if (indexOfL(aLine, RTL_CONSTASCII_STRINGPARAM("IdList")) != -1) + if (aLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("IdList")) != -1) { while (aLine.indexOf('}') == -1) aIStm.ReadLine(aLine); |