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 /l10ntools/source/localize.cxx | |
| 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 'l10ntools/source/localize.cxx')
| -rw-r--r-- | l10ntools/source/localize.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/l10ntools/source/localize.cxx b/l10ntools/source/localize.cxx index e259ef722dcf..6fb83e1a9bc4 100644 --- a/l10ntools/source/localize.cxx +++ b/l10ntools/source/localize.cxx @@ -50,8 +50,6 @@ #include "sal/main.h" #include "sal/types.h" -#include "helper.hxx" - using namespace std; namespace { @@ -104,7 +102,7 @@ bool matchList( rtl::OUString const & url, AsciiString const * list, std::size_t length) { for (std::size_t i = 0; i != length; ++i) { - if (helper::endsWithAsciiL(url, list[i].string, list[i].length)) { + if (url.endsWithAsciiL(list[i].string, list[i].length)) { return true; } } @@ -272,8 +270,8 @@ void handleFile( { RTL_CONSTASCII_STRINGPARAM(".xhp"), "helpex", false }, { RTL_CONSTASCII_STRINGPARAM(".properties"), "propex", false } }; for (std::size_t i = 0; i != SAL_N_ELEMENTS(commands); ++i) { - if (helper::endsWithAsciiL( - url, commands[i].extension, commands[i].extensionLength)) + if (url.endsWithAsciiL( + commands[i].extension, commands[i].extensionLength)) { handleCommand( project, projectRoot, url, |