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 /extensions | |
| 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 'extensions')
| -rw-r--r-- | extensions/source/scanner/sanedlg.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/extensions/source/scanner/sanedlg.cxx b/extensions/source/scanner/sanedlg.cxx index d08a1759162f..e12e6400b736 100644 --- a/extensions/source/scanner/sanedlg.cxx +++ b/extensions/source/scanner/sanedlg.cxx @@ -38,7 +38,6 @@ #include <math.h> #include <sal/macros.h> #include <rtl/strbuf.hxx> -#include <comphelper/string.hxx> ResId SaneResId( sal_uInt32 nID ) { @@ -1212,20 +1211,18 @@ sal_Bool SaneDlg::LoadState() if( nOption == -1 ) continue; - using comphelper::string::matchL; - - if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM("BOOL="))) + if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("BOOL="))) { aValue = aValue.copy(RTL_CONSTASCII_LENGTH("BOOL=")); sal_Bool aBOOL = (sal_Bool)aValue.toInt32(); mrSane.SetOptionValue( nOption, aBOOL ); } - else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM("STRING="))) + else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("STRING="))) { aValue = aValue.copy(RTL_CONSTASCII_LENGTH("STRING=")); mrSane.SetOptionValue(nOption,rtl::OStringToOUString(aValue, osl_getThreadTextEncoding()) ); } - else if (matchL(aValue, RTL_CONSTASCII_USTRINGPARAM("NUMERIC="))) + else if (aValue.matchL(RTL_CONSTASCII_STRINGPARAM("NUMERIC="))) { aValue = aValue.copy(RTL_CONSTASCII_LENGTH("NUMERIC=")); |