From 3acca4c859b7198bc3caf4c690bfc653883e61b7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 13 Nov 2013 15:39:07 +0200 Subject: remove unnecessary sal_Unicode casts in UCB module Change-Id: Ib93120ec0cae76b5ea19f723054363771b27ab56 --- ucb/source/core/ucb.cxx | 6 ++-- ucb/source/regexp/regexp.cxx | 4 +-- ucb/source/ucp/ext/ucpext_content.cxx | 2 +- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 +- ucb/source/ucp/ext/ucpext_provider.cxx | 4 +-- ucb/source/ucp/file/bc.cxx | 12 +++---- ucb/source/ucp/file/filglob.cxx | 2 +- ucb/source/ucp/file/shell.cxx | 6 ++-- ucb/source/ucp/ftp/ftpurl.cxx | 42 +++++++++++----------- ucb/source/ucp/webdav-neon/DAVProperties.cxx | 4 +-- ucb/source/ucp/webdav-neon/NeonSession.cxx | 4 +-- ucb/source/ucp/webdav-neon/NeonUri.cxx | 4 +-- .../ucp/webdav-neon/UCBDeadPropertyValue.cxx | 6 ++-- ucb/source/ucp/webdav/DAVProperties.cxx | 6 ++-- ucb/source/ucp/webdav/SerfSession.cxx | 4 +-- ucb/source/ucp/webdav/SerfUri.cxx | 4 +-- ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx | 6 ++-- ucb/source/ucp/webdav/webdavcontent.cxx | 2 +- ucb/source/ucp/webdav/webdavresponseparser.cxx | 6 ++-- 19 files changed, 63 insertions(+), 63 deletions(-) (limited to 'ucb') diff --git a/ucb/source/core/ucb.cxx b/ucb/source/core/ucb.cxx index 69555ab4adf0..eb8acce5b3cb 100644 --- a/ucb/source/core/ucb.cxx +++ b/ucb/source/core/ucb.cxx @@ -76,7 +76,7 @@ bool fillPlaceholders(OUString const & rInput, && p[3] == ';') { aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('&')); + aBuffer.append('&'); p += 4; pCopy = p; } @@ -84,7 +84,7 @@ bool fillPlaceholders(OUString const & rInput, && p[0] == 'l' && p[1] == 't' && p[2] == ';') { aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('<')); + aBuffer.append('<'); p += 3; pCopy = p; } @@ -92,7 +92,7 @@ bool fillPlaceholders(OUString const & rInput, && p[0] == 'g' && p[1] == 't' && p[2] == ';') { aBuffer.append(pCopy, p - 1 - pCopy); - aBuffer.append(sal_Unicode('>')); + aBuffer.append('>'); p += 3; pCopy = p; } diff --git a/ucb/source/regexp/regexp.cxx b/ucb/source/regexp/regexp.cxx index 280c8604af28..44c2d8c54fa0 100644 --- a/ucb/source/regexp/regexp.cxx +++ b/ucb/source/regexp/regexp.cxx @@ -209,10 +209,10 @@ void appendStringLiteral(OUStringBuffer * pBuffer, { sal_Unicode c = *p++; if (c == '"' || c == '\\') - pBuffer->append(sal_Unicode('\\')); + pBuffer->append('\\'); pBuffer->append(c); } - pBuffer->append(sal_Unicode('"')); + pBuffer->append('"'); } } diff --git a/ucb/source/ucp/ext/ucpext_content.cxx b/ucb/source/ucp/ext/ucpext_content.cxx index 37cbddf1c309..c0d172ecb6a7 100644 --- a/ucb/source/ucp/ext/ucpext_content.cxx +++ b/ucb/source/ucp/ext/ucpext_content.cxx @@ -352,7 +352,7 @@ namespace ucb { namespace ucp { namespace ext OUString sRelativeURL( sURL.copy( sRootURL.getLength() ) ); // cut the extension ID - const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( sal_Unicode( '/' ) ) ); + const OUString sSeparatedExtensionId( encodeIdentifier( m_sExtensionId ) + OUString( '/' ) ); if ( !sRelativeURL.match( sSeparatedExtensionId ) ) { SAL_INFO( "ucb.ucp.ext", "illegal URL structure - no extension ID" ); diff --git a/ucb/source/ucp/ext/ucpext_datasupplier.cxx b/ucb/source/ucp/ext/ucpext_datasupplier.cxx index 57704ff666b7..573ac13acdf6 100644 --- a/ucb/source/ucp/ext/ucpext_datasupplier.cxx +++ b/ucb/source/ucp/ext/ucpext_datasupplier.cxx @@ -159,7 +159,7 @@ namespace ucb { namespace ucp { namespace ext const OUString& rLocalId = (*pExtInfo)[0]; ResultListEntry aEntry; - aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + OUString( sal_Unicode( '/' ) ); + aEntry.sId = ContentProvider::getRootURL() + Content::encodeIdentifier( rLocalId ) + OUString( '/' ); m_pImpl->m_aResults.push_back( aEntry ); } } diff --git a/ucb/source/ucp/ext/ucpext_provider.cxx b/ucb/source/ucp/ext/ucpext_provider.cxx index 6172354fbd61..df0f149a857c 100644 --- a/ucb/source/ucp/ext/ucpext_provider.cxx +++ b/ucb/source/ucp/ext/ucpext_provider.cxx @@ -151,7 +151,7 @@ namespace ucb { namespace ucp { namespace ext { if ( sRemaining[0] != '/' ) { - aComposer.append( sal_Unicode( '/' ) ); + aComposer.append( '/' ); aComposer.append( sRemaining ); } else @@ -161,7 +161,7 @@ namespace ucb { namespace ucp { namespace ext if ( sRemaining.isEmpty() ) { // again, it's the root content, but one / is missing - aComposer.append( sal_Unicode( '/' ) ); + aComposer.append( '/' ); } else { diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx index 0578243aaa2e..73f734dff0f2 100644 --- a/ucb/source/ucp/file/bc.cxx +++ b/ucb/source/ucp/file/bc.cxx @@ -893,7 +893,7 @@ BaseContent::setPropertyValues( { aBuf.append( NewTitle ); if ( bTrailingSlash ) - aBuf.append( sal_Unicode( '/' ) ); + aBuf.append( '/' ); } else { @@ -909,7 +909,7 @@ BaseContent::setPropertyValues( // Initial Title before "insert". // m_aUncPath contains parent's URI. - if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) + if( !m_aUncPath.endsWith( "/" ) ) m_aUncPath += "/"; m_aUncPath += rtl::Uri::encode( NewTitle, @@ -950,7 +950,7 @@ BaseContent::setPropertyValues( OUString aDstName = getParentName( m_aUncPath ); - if( aDstName.lastIndexOf( sal_Unicode('/') ) != aDstName.getLength() - 1 ) + if( !aDstName.endsWith("/") ) aDstName += "/"; aDstName += rtl::Uri::encode( NewTitle, @@ -1109,7 +1109,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); else - NewTitle = srcUncPath.copy( 1 + srcUncPath.lastIndexOf( sal_Unicode('/') ) ); + NewTitle = srcUncPath.copy( 1 + srcUncPath.lastIndexOf( '/' ) ); // Is destination a document or a folder ? Sequence< beans::Property > seq(1); @@ -1129,7 +1129,7 @@ BaseContent::transfer( sal_Int32 nMyCommandIdentifier, OUString dstUncPath; if( IsDocument ) { // as sibling - sal_Int32 lastSlash = m_aUncPath.lastIndexOf( sal_Unicode('/') ); + sal_Int32 lastSlash = m_aUncPath.lastIndexOf( '/' ); dstUncPath = m_aUncPath.copy(0,lastSlash ); } else @@ -1246,7 +1246,7 @@ void SAL_CALL BaseContent::insert( sal_Int32 nMyCommandIdentifier, // determine new uncpath m_pMyShell->clearError( nMyCommandIdentifier ); m_aUncPath = getParentName( m_aUncPath ); - if( m_aUncPath.lastIndexOf( sal_Unicode('/') ) != m_aUncPath.getLength() - 1 ) + if( !m_aUncPath.endsWith( "/" ) ) m_aUncPath += "/"; m_aUncPath += rtl::Uri::encode( aRequestImpl->newName(), diff --git a/ucb/source/ucp/file/filglob.cxx b/ucb/source/ucp/file/filglob.cxx index 5ff18a26d1db..143724ba6fb4 100644 --- a/ucb/source/ucp/file/filglob.cxx +++ b/ucb/source/ucp/file/filglob.cxx @@ -196,7 +196,7 @@ namespace fileaccess { OUString getParentName( const OUString& aFileName ) { - sal_Int32 lastIndex = aFileName.lastIndexOf( sal_Unicode('/') ); + sal_Int32 lastIndex = aFileName.lastIndexOf( '/' ); OUString aParent = aFileName.copy( 0,lastIndex ); if( aParent.endsWith(":") && aParent.getLength() == 6 ) diff --git a/ucb/source/ucp/file/shell.cxx b/ucb/source/ucp/file/shell.cxx index 1948f2965adb..b84963c381b6 100644 --- a/ucb/source/ucp/file/shell.cxx +++ b/ucb/source/ucp/file/shell.cxx @@ -1668,7 +1668,7 @@ shell::mkdir( sal_Int32 CommandId, OUString aUnqPath; // remove trailing slash - if ( rUnqPath[ rUnqPath.getLength() - 1 ] == sal_Unicode( '/' ) ) + if ( rUnqPath.endsWith("/") ) aUnqPath = rUnqPath.copy( 0, rUnqPath.getLength() - 1 ); else aUnqPath = rUnqPath; @@ -2036,7 +2036,7 @@ shell::copy_recursive( const OUString& srcUnqPath, rtl_UriEncodeIgnoreEscapes, RTL_TEXTENCODING_UTF8 ); - if( newDstUnqPath.lastIndexOf( sal_Unicode('/') ) != newDstUnqPath.getLength()-1 ) + if( !newDstUnqPath.endsWith( "/" ) ) newDstUnqPath += "/"; newDstUnqPath += tit; @@ -2071,7 +2071,7 @@ sal_Bool SAL_CALL shell::ensuredir( sal_Int32 CommandId, if ( rUnqPath.isEmpty() ) return sal_False; - if ( rUnqPath[ rUnqPath.getLength() - 1 ] == sal_Unicode( '/' ) ) + if ( rUnqPath.endsWith("/") ) aPath = rUnqPath.copy( 0, rUnqPath.getLength() - 1 ); else aPath = rUnqPath; diff --git a/ucb/source/ucp/ftp/ftpurl.cxx b/ucb/source/ucp/ftp/ftpurl.cxx index b71db5ae86e9..5ad33cc85dc3 100644 --- a/ucb/source/ucp/ftp/ftpurl.cxx +++ b/ucb/source/ucp/ftp/ftpurl.cxx @@ -168,13 +168,13 @@ void FTPURL::parse(const OUString& url) OUString aExpr(OUString(buffer,strlen(buffer), RTL_TEXTENCODING_UTF8)); - sal_Int32 l = aExpr.indexOf(sal_Unicode('@')); + sal_Int32 l = aExpr.indexOf('@'); m_aHost = aExpr.copy(1+l); if(l != -1) { // Now username and password. aExpr = aExpr.copy(0,l); - l = aExpr.indexOf(sal_Unicode(':')); + l = aExpr.indexOf(':'); if(l != -1) { aPassword = aExpr.copy(1+l); if(!aPassword.isEmpty()) @@ -187,8 +187,8 @@ void FTPURL::parse(const OUString& url) m_aUsername = aExpr; } - l = m_aHost.lastIndexOf(sal_Unicode(':')); - sal_Int32 ipv6Back = m_aHost.lastIndexOf(sal_Unicode(']')); + l = m_aHost.lastIndexOf(':'); + sal_Int32 ipv6Back = m_aHost.lastIndexOf(']'); if((ipv6Back == -1 && l != -1) // not ipv6, but a port || (ipv6Back != -1 && 1+ipv6Back == l) // ipv6, and a port @@ -230,7 +230,7 @@ void FTPURL::parse(const OUString& url) // now check for something like ";type=i" at end of url if(m_aPathSegmentVec.size() && - (l = m_aPathSegmentVec.back().indexOf(sal_Unicode(';'))) != -1) { + (l = m_aPathSegmentVec.back().indexOf(';')) != -1) { m_aType = m_aPathSegmentVec.back().copy(l); m_aPathSegmentVec.back() = m_aPathSegmentVec.back().copy(0,l); } @@ -258,28 +258,28 @@ OUString FTPURL::ident(bool withslash,bool internal) const if((m_bShowPassword || internal) && !aPassword.isEmpty() ) - bff.append(sal_Unicode(':')) + bff.append(':') .append(aPassword); - bff.append(sal_Unicode('@')); + bff.append('@'); } bff.append(m_aHost); if( m_aPort != "21" ) - bff.append(sal_Unicode(':')) + bff.append(':') .append(m_aPort) - .append(sal_Unicode('/')); + .append('/'); else - bff.append(sal_Unicode('/')); + bff.append('/'); for(unsigned i = 0; i < m_aPathSegmentVec.size(); ++i) if(i == 0) bff.append(m_aPathSegmentVec[i]); else - bff.append(sal_Unicode('/')).append(m_aPathSegmentVec[i]); + bff.append('/').append(m_aPathSegmentVec[i]); if(withslash) if(!bff.isEmpty() && bff[bff.getLength()-1] != '/') - bff.append(sal_Unicode('/')); + bff.append('/'); bff.append(m_aType); return bff.makeStringAndClear(); @@ -303,20 +303,20 @@ OUString FTPURL::parent(bool internal) const aAccount); if((internal || m_bShowPassword) && !aPassword.isEmpty()) - bff.append(sal_Unicode(':')) + bff.append(':') .append(aPassword); - bff.append(sal_Unicode('@')); + bff.append('@'); } bff.append(m_aHost); if( m_aPort != "21" ) - bff.append(sal_Unicode(':')) + bff.append(':') .append(m_aPort) - .append(sal_Unicode('/')); + .append('/'); else - bff.append(sal_Unicode('/')); + bff.append('/'); OUString last; @@ -326,7 +326,7 @@ OUString FTPURL::parent(bool internal) const else if(i == 0) bff.append(m_aPathSegmentVec[i]); else - bff.append(sal_Unicode('/')).append(m_aPathSegmentVec[i]); + bff.append('/').append(m_aPathSegmentVec[i]); if(last.isEmpty()) bff.appendAscii(".."); @@ -549,11 +549,11 @@ OUString FTPURL::net_title() const // Format of current working directory: // 257 "/bla/bla" is current directory sal_Int32 index1 = aNetTitle.lastIndexOf("257"); - index1 = 1+aNetTitle.indexOf(sal_Unicode('"'),index1); - sal_Int32 index2 = aNetTitle.indexOf(sal_Unicode('"'),index1); + index1 = 1+aNetTitle.indexOf('"',index1); + sal_Int32 index2 = aNetTitle.indexOf('"',index1); aNetTitle = aNetTitle.copy(index1,index2-index1); if( aNetTitle != "/" ) { - index1 = aNetTitle.lastIndexOf(sal_Unicode('/')); + index1 = aNetTitle.lastIndexOf('/'); aNetTitle = aNetTitle.copy(1+index1); } try_more = false; diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx index 313462edb495..5d5634936dca 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx @@ -175,7 +175,7 @@ bool DAVProperties::isUCBSpecialProperty( return false; sal_Int32 nStart = strlen( "" ) ) || nEnd == nStart ) { diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 04e6de0ab990..c493a7f945f2 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -348,7 +348,7 @@ namespace { if ( nContStart != -1 ) { nContStart += sPartId.getLength(); - sal_Int32 nContEnd = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart ); sPart = _rRawString.copy( nContStart, nContEnd - nContStart ); } return sPart; @@ -2047,7 +2047,7 @@ OUString NeonSession::makeAbsoluteURL( OUString const & rURL ) const try { // Is URL relative or already absolute? - if ( rURL[ 0 ] != sal_Unicode( '/' ) ) + if ( rURL[ 0 ] != '/' ) { // absolute. return OUString( rURL ); diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index b3488df1c095..6d8be5477900 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -172,7 +172,7 @@ void NeonUri::calculateURI () } // Is host a numeric IPv6 address? if ( ( mHostName.indexOf( ':' ) != -1 ) && - ( mHostName[ 0 ] != sal_Unicode( '[' ) ) ) + ( mHostName[ 0 ] != '[' ) ) { aBuf.appendAscii( "[" ); aBuf.append( mHostName ); @@ -282,7 +282,7 @@ OUString NeonUri::makeConnectionEndPointString( // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && - ( rHostName[ 0 ] != sal_Unicode( '[' ) ) ) + ( rHostName[ 0 ] != '[' ) ) { aBuf.appendAscii( "[" ); aBuf.append( rHostName ); diff --git a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index d2313dd14854..a3fe3c39af85 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -235,7 +235,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 3 ] ) ) { - aResult.append( sal_Unicode( '%' ) ); + aResult.append( '%' ); nPos += 3; } else @@ -258,7 +258,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 2 ] ) ) { - aResult.append( sal_Unicode( '<' ) ); + aResult.append( '<' ); nPos += 2; } else @@ -281,7 +281,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 2 ] ) ) { - aResult.append( sal_Unicode( '>' ) ); + aResult.append( '>' ); nPos += 2; } else diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index bbc894d728fe..9b6064ad167b 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -190,7 +190,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU return false; sal_Int32 nStart = RTL_CONSTASCII_LENGTH( "" ) ) return false; @@ -213,7 +213,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU rtl::OUStringBuffer aBuff( sNamesp ); if ( sNamesp[nLen - 1] != '/' ) - aBuff.append( sal_Unicode( '/' ) ); + aBuff.append( '/' ); aBuff.append( sPropName ); rParsedName = aBuff.makeStringAndClear(); diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 3eb5e3cf51ec..266c19bf119f 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -352,7 +352,7 @@ namespace { if ( nContStart != -1 ) { nContStart += sPartId.getLength(); - sal_Int32 nContEnd = _rRawString.indexOf( sal_Unicode( ',' ), nContStart ); + sal_Int32 nContEnd = _rRawString.indexOf( ',', nContStart ); sPart = _rRawString.copy( nContStart, nContEnd - nContStart ); } return sPart; @@ -1565,7 +1565,7 @@ OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const try { // Is URL relative or already absolute? - if ( rURL[ 0 ] != sal_Unicode( '/' ) ) + if ( rURL[ 0 ] != '/' ) { // absolute. return OUString( rURL ); diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 66aec6d7edc0..eecc7a467a24 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -148,7 +148,7 @@ void SerfUri::calculateURI () } // Is host a numeric IPv6 address? if ( ( mHostName.indexOf( ':' ) != -1 ) && - ( mHostName[ 0 ] != sal_Unicode( '[' ) ) ) + ( mHostName[ 0 ] != '[' ) ) { aBuf.append( "[" ); aBuf.append( mHostName ); @@ -254,7 +254,7 @@ OUString SerfUri::makeConnectionEndPointString( // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && - ( rHostName[ 0 ] != sal_Unicode( '[' ) ) ) + ( rHostName[ 0 ] != '[' ) ) { aBuf.append( "[" ); aBuf.append( rHostName ); diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index 82096f248fff..741a1de6dbec 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -241,7 +241,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 3 ] ) ) { - aResult.append( sal_Unicode( '%' ) ); + aResult.append( '%' ); nPos += 3; } else @@ -266,7 +266,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 2 ] ) ) { - aResult.append( sal_Unicode( '<' ) ); + aResult.append( '<' ); nPos += 2; } else @@ -291,7 +291,7 @@ static OUString decodeValue( const OUString & rValue ) && ( ';' == pValue[ nPos + 2 ] ) ) { - aResult.append( sal_Unicode( '>' ) ); + aResult.append( '>' ); nPos += 2; } else diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index f995bd098d5f..6269bd1a8e82 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -153,7 +153,7 @@ static void lcl_sendPartialGETRequest( bool &bError, // Parse the Content-Range to get the size // vid. http://tools.ietf.org/html/rfc2616#section-14.16 // Content-Range: / - sal_Int32 nSlash = aContentRange.lastIndexOf( sal_Unicode('/')); + sal_Int32 nSlash = aContentRange.lastIndexOf( '/' ); if ( nSlash != -1 ) { rtl::OUString aSize = aContentRange.copy( nSlash + 1 ); diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 2da021fb880d..c77725f1ef58 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -193,7 +193,7 @@ namespace { if(aName.match(aStrXmlns, 0)) { - const sal_Int32 nIndex(aName.indexOf(sal_Unicode(':'), 0)); + const sal_Int32 nIndex(aName.indexOf(':', 0)); if(-1 != nIndex && nIndex + 1 < nLen) { @@ -235,7 +235,7 @@ namespace if(nLen) { - const sal_Int32 nIndex(rSource.indexOf(sal_Unicode(':'), 0)); + const sal_Int32 nIndex(rSource.indexOf(':', 0)); if(nIndex > 0 && ((nIndex + 1) < nLen)) { @@ -777,7 +777,7 @@ namespace if(aNew.getLength()) { // add one char when appending (see html1.1 spec) - aNew += OUString(sal_Unicode(' ')); + aNew += OUString(' '); } aNew += aTrimmedChars; -- cgit