diff options
| author | Noel Grandin <noel@peralex.com> | 2013-11-21 15:52:45 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2013-11-22 08:07:19 +0200 |
| commit | 73342dbb82ba074d01962359dac50fb2aa36cbeb (patch) | |
| tree | addab0397681725810b42ad55ab15be3fdb4c236 /ucb | |
| parent | 071c3f3e93c4c00cf57ce3c382325cd717fed511 (diff) | |
remove unnecessary RTL_CONSTASCII_STRINGPARAM
A final pass through the code, converting code to use the new
OUString and OString methods that can detect string literals.
Change-Id: Ifa6382335e5650a1c67e52006b26354e0692c710
Diffstat (limited to 'ucb')
| -rw-r--r-- | ucb/source/ucp/webdav/DAVProperties.cxx | 4 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx | 3 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav/webdavprovider.cxx | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index e4e254d8fc28..7d29a241dcb9 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -185,7 +185,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU sal_Int32 nLen = rFullName.getLength(); if ( nLen <= 0 || !rFullName.startsWith( "<prop:" ) || - !rFullName.endsWithAsciiL( RTL_CONSTASCII_STRINGPARAM( "\">" ) ) ) + !rFullName.endsWith( "\">" ) ) return false; sal_Int32 nStart = RTL_CONSTASCII_LENGTH( "<prop:" ); @@ -198,7 +198,7 @@ bool DAVProperties::isUCBSpecialProperty(const rtl::OUString& rFullName, rtl::OU return false; // TODO skip whitespaces? - if ( !rFullName.startsWith( RTL_CONSTASCII_STRINGPARAM( "xmlns:prop=\"" ), ++nEnd ) ) + if ( !rFullName.startsWith( "xmlns:prop=\"", ++nEnd ) ) return false; nStart = nEnd + RTL_CONSTASCII_LENGTH( "xmlns:prop=\"" ); diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx index 9be84da091e8..49963ca09fce 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx @@ -65,8 +65,7 @@ void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeader OSL_TRACE( "Request Header - \"%s: %s\"", aHeader.getStr(), aValue.getStr() ); if ( !bHasUserAgent ) - bHasUserAgent = aHeaderIter->first.equalsAsciiL( - RTL_CONSTASCII_STRINGPARAM( "User-Agent" ) ); + bHasUserAgent = aHeaderIter->first == "User-Agent"; serf_bucket_headers_set( inoutSerfHeaderBucket, aHeader.getStr(), diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index e9ae31e313a5..f07239d56725 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -96,13 +96,13 @@ ContentProvider::ContentProvider( xConfigAccess->getByName(OUString("ooName")) >>= aVal; OUString &aUserAgent = WebDAVUserAgent::get(); - sal_Int32 nIndex = aUserAgent.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "$ooName" ) ); + sal_Int32 nIndex = aUserAgent.indexOf( "$ooName" ); if ( !aVal.getLength() || nIndex == -1 ) return; aUserAgent = aUserAgent.replaceAt( nIndex, RTL_CONSTASCII_LENGTH( "$ooName" ), aVal ); xConfigAccess->getByName(OUString("ooSetupVersion")) >>= aVal; - nIndex = aUserAgent.indexOfAsciiL( RTL_CONSTASCII_STRINGPARAM( "$ooSetupVersion" ) ); + nIndex = aUserAgent.indexOf( "$ooSetupVersion" ); if ( !aVal.getLength() || nIndex == -1 ) return; aUserAgent = aUserAgent.replaceAt( nIndex, RTL_CONSTASCII_LENGTH( "$ooSetupVersion" ), aVal ); |