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 /sot | |
| 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 'sot')
| -rw-r--r-- | sot/source/sdstor/ucbstorage.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index 215c42b76f34..e82d7b3dff32 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -52,8 +52,6 @@ #include <com/sun/star/packages/manifest/XManifestReader.hpp> #include <com/sun/star/ucb/InteractiveIOException.hpp> -#include <comphelper/string.hxx> - #include <rtl/digest.h> #include <tools/ref.hxx> #include <tools/debug.hxx> @@ -3294,7 +3292,7 @@ String UCBStorage::GetLinkedFile( SvStream &rStream ) if( nBytes == 0x04034b50 ) { rtl::OString aTmp = read_lenPrefixed_uInt8s_ToOString<sal_uInt16>(rStream); - if (comphelper::string::matchL(aTmp, RTL_CONSTASCII_STRINGPARAM("ContentURL="))) + if (aTmp.matchL(RTL_CONSTASCII_STRINGPARAM("ContentURL="))) { aString = rtl::OStringToOUString(aTmp.copy(11), RTL_TEXTENCODING_UTF8); } |