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 /tools/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 'tools/source')
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 4 | ||||
| -rw-r--r-- | tools/source/inet/inetstrm.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tools/source/fsys/dirent.cxx b/tools/source/fsys/dirent.cxx index 20251dfeee40..3fa68692eb6c 100644 --- a/tools/source/fsys/dirent.cxx +++ b/tools/source/fsys/dirent.cxx @@ -732,7 +732,7 @@ DirEntry::DirEntry( const String& rInitName, FSysPathStyle eStyle ) } rtl::OString aTmpName(rtl::OUStringToOString(rInitName, osl_getThreadTextEncoding())); - if (comphelper::string::matchIgnoreAsciiCaseL(aTmpName, RTL_CONSTASCII_STRINGPARAM("file:"))) + if (aTmpName.matchIgnoreAsciiCase(rtl::OString(RTL_CONSTASCII_STRINGPARAM("file:")))) { DBG_WARNING( "File URLs are not permitted but accepted" ); aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding()); @@ -784,7 +784,7 @@ DirEntry::DirEntry( const rtl::OString& rInitName, FSysPathStyle eStyle ) } rtl::OString aTmpName( rInitName ); - if (comphelper::string::matchIgnoreAsciiCaseL(aTmpName, RTL_CONSTASCII_STRINGPARAM("file:"))) + if (aTmpName.matchIgnoreAsciiCase(rtl::OString(RTL_CONSTASCII_STRINGPARAM("file:")))) { DBG_WARNING( "File URLs are not permitted but accepted" ); aTmpName = rtl::OUStringToOString(INetURLObject( rInitName ).PathToFileName(), osl_getThreadTextEncoding()); diff --git a/tools/source/inet/inetstrm.cxx b/tools/source/inet/inetstrm.cxx index d787baaa7166..7ad19e640fc6 100644 --- a/tools/source/inet/inetstrm.cxx +++ b/tools/source/inet/inetstrm.cxx @@ -1614,7 +1614,7 @@ int INetMIMEMessageStream::PutMsgLine (const sal_Char *pData, sal_uIntPtr nSize) pMsg->GetContentType(), RTL_TEXTENCODING_ASCII_US)); rtl::OString aLowerType(aType.toAsciiLowerCase()); - sal_Int32 nPos = comphelper::string::indexOfL(aLowerType, + sal_Int32 nPos = aLowerType.indexOfL( RTL_CONSTASCII_STRINGPARAM("boundary=")); rtl::OString aBoundary(aType.copy(nPos + 9)); |