diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/bootstrp/cppdep.cxx | 9 | ||||
| -rw-r--r-- | tools/source/fsys/dirent.cxx | 4 | ||||
| -rw-r--r-- | tools/source/inet/inetstrm.cxx | 2 |
3 files changed, 6 insertions, 9 deletions
diff --git a/tools/bootstrp/cppdep.cxx b/tools/bootstrp/cppdep.cxx index 979201b3d02a..50165d136798 100644 --- a/tools/bootstrp/cppdep.cxx +++ b/tools/bootstrp/cppdep.cxx @@ -34,7 +34,6 @@ #include <sys/stat.h> #include <tools/stream.hxx> #include <rtl/strbuf.hxx> -#include <comphelper/string.hxx> #include "cppdep.hxx" CppDep::CppDep() @@ -82,8 +81,7 @@ sal_Bool CppDep::Search(const rtl::OString &rFileName) aFile.Open( suFileName, STREAM_READ ); while ( aFile.ReadLine( aReadLine )) { - using comphelper::string::indexOfL; - sal_Int32 nPos = indexOfL(aReadLine, + sal_Int32 nPos = aReadLine.indexOfL( RTL_CONSTASCII_STRINGPARAM("include")); if ( nPos != -1 ) { @@ -186,9 +184,8 @@ rtl::OString CppDep::IsIncludeStatement(rtl::OString aLine) #endif } // WhiteSpacesfressen - using comphelper::string::replace; - aLine = replace(aLine, rtl::OString(' '), rtl::OString()); - aLine = replace(aLine, rtl::OString('\t'), rtl::OString()); + aLine = aLine.replaceAll(rtl::OString(' '), rtl::OString()). + replaceAll(rtl::OString('\t'), rtl::OString()); #ifdef DEBUG_VERBOSE fprintf( stderr, "now : %s\n", aLine.getStr() ); #endif 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)); |