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 /svtools/bmpmaker | |
parent | Merge sal_textenc into sal just on Android (diff) | |
download | core-9ab0b38e95133dab720408cc2c80093b8a201c10.tar.gz core-9ab0b38e95133dab720408cc2c80093b8a201c10.zip |
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 'svtools/bmpmaker')
-rw-r--r-- | svtools/bmpmaker/bmpcore.cxx | 10 | ||||
-rw-r--r-- | svtools/bmpmaker/bmpsum.cxx | 10 |
2 files changed, 9 insertions, 11 deletions
diff --git a/svtools/bmpmaker/bmpcore.cxx b/svtools/bmpmaker/bmpcore.cxx index 2a7c709fdb34..c2c954ab7dae 100644 --- a/svtools/bmpmaker/bmpcore.cxx +++ b/svtools/bmpmaker/bmpcore.cxx @@ -364,8 +364,6 @@ void BmpCreator::Create( const String& rSRSName, rtl::OString aByteText; sal_Bool bLangDep = sal_False; - using comphelper::string::indexOfL; - do { do @@ -373,14 +371,14 @@ void BmpCreator::Create( const String& rSRSName, if (!pSRS->ReadLine(aByteText)) break; } - while ( indexOfL(aByteText, RTL_CONSTASCII_STRINGPARAM("ImageList")) == -1 ); + while ( aByteText.indexOfL(RTL_CONSTASCII_STRINGPARAM("ImageList")) == -1 ); do { if (!pSRS->ReadLine( aByteText ) ) break; } - while ( indexOfL(aByteText, RTL_CONSTASCII_STRINGPARAM("File")) == -1 ); + while ( aByteText.indexOfL(RTL_CONSTASCII_STRINGPARAM("File")) == -1 ); aText = rtl::OStringToOUString(aByteText, RTL_TEXTENCODING_ASCII_US); const String aName( aText.GetToken( 1, '"' ) ); @@ -388,7 +386,7 @@ void BmpCreator::Create( const String& rSRSName, do { if( !bLangDep && - indexOfL(aByteText, RTL_CONSTASCII_STRINGPARAM("File")) != -1 && + aByteText.indexOfL(RTL_CONSTASCII_STRINGPARAM("File")) != -1 && aByteText.indexOf('[') != -1 && aByteText.indexOf(']') != -1 ) { @@ -398,7 +396,7 @@ void BmpCreator::Create( const String& rSRSName, if (!pSRS->ReadLine(aByteText)) break; } - while (indexOfL(aByteText, RTL_CONSTASCII_STRINGPARAM("IdList")) == -1); + while (aByteText.indexOfL(RTL_CONSTASCII_STRINGPARAM("IdList")) == -1); aText = rtl::OStringToOUString(aByteText, RTL_TEXTENCODING_ASCII_US); // if image list is not language dependent, don't do anything for languages except german diff --git a/svtools/bmpmaker/bmpsum.cxx b/svtools/bmpmaker/bmpsum.cxx index c57273708503..4fdf1e515275 100644 --- a/svtools/bmpmaker/bmpsum.cxx +++ b/svtools/bmpmaker/bmpsum.cxx @@ -305,7 +305,7 @@ void BmpSum::ProcessFileList( const String& rInFileList, if( !aReadLine.isEmpty() ) aFileNameSet.insert( aReadLine ); - if( comphelper::string::indexOfL(aReadLine, RTL_CONSTASCII_STRINGPARAM("enus") ) != -1 ) + if( aReadLine.indexOfL(RTL_CONSTASCII_STRINGPARAM("enus") ) != -1 ) { static const char* aLanguages[] = { @@ -328,10 +328,10 @@ void BmpSum::ProcessFileList( const String& rInFileList, for( sal_uInt32 n = 0; n < 14; ++n ) { - rtl::OString aLangPath = comphelper::string::replace( - aReadLine, - rtl::OString(RTL_CONSTASCII_STRINGPARAM("enus")), - rtl::OString(aLanguages[n])); + rtl::OString aLangPath( + aReadLine.replaceAll( + rtl::OString(RTL_CONSTASCII_STRINGPARAM("enus")), + rtl::OString(aLanguages[n]))); DirEntry aTestFile( aLangPath ); |