diff options
author | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 12:06:47 +0200 |
---|---|---|
committer | Luboš Luňák <l.lunak@suse.cz> | 2013-04-07 14:23:11 +0200 |
commit | 1946794ae09ba732022fe6a74ea45e304ab70b84 (patch) | |
tree | e32bd7ba61fa021ecc7f8c85959df8ca837d6e81 /ucb/source/ucp/webdav/DAVResourceAccess.cxx | |
parent | 5b08c6e7a21dda94d5b755eea0b1ed1e9c199bec (diff) |
mass removal of rtl:: prefixes for O(U)String*
Modules sal, salhelper, cppu, cppuhelper, codemaker (selectively) and odk
have kept them, in order not to break external API (the automatic using declaration
is LO-internal).
Change-Id: I588fc9e0c45b914f824f91c0376980621d730f09
Diffstat (limited to 'ucb/source/ucp/webdav/DAVResourceAccess.cxx')
-rw-r--r-- | ucb/source/ucp/webdav/DAVResourceAccess.cxx | 92 |
1 files changed, 46 insertions, 46 deletions
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx index 8c495610a8d7..ee713eae1183 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx @@ -42,10 +42,10 @@ using namespace com::sun::star; //========================================================================= // virtual int DAVAuthListener_Impl::authenticate( - const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials ) { @@ -69,7 +69,7 @@ int DAVAuthListener_Impl::authenticate( rtl::Reference< ucbhelper::SimpleAuthenticationRequest > xRequest = new ucbhelper::SimpleAuthenticationRequest( m_aURL, inHostName, inRealm, inoutUserName, - outPassWord, ::rtl::OUString(), + outPassWord, OUString(), true /*bAllowPersistentStoring*/, bCanUseSystemCredentials ); xIH->handle( xRequest.get() ); @@ -98,8 +98,8 @@ int DAVAuthListener_Impl::authenticate( { // This is the (strange) way to tell neon to use // system credentials. - inoutUserName = rtl::OUString(); - outPassWord = rtl::OUString(); + inoutUserName = OUString(); + outPassWord = OUString(); } else { @@ -133,7 +133,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xSMgr( rSMgr ) @@ -168,7 +168,7 @@ DAVResourceAccess & DAVResourceAccess::operator=( //========================================================================= void DAVResourceAccess::PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -186,7 +186,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -229,7 +229,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPFIND" ), aHeaders ); @@ -270,7 +270,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "PROPPATCH" ), aHeaders ); @@ -294,7 +294,7 @@ void DAVResourceAccess::PROPPATCH( //========================================================================= void DAVResourceAccess::HEAD( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( DAVException ) @@ -311,7 +311,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "HEAD" ), + OUString::createFromAscii( "HEAD" ), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -351,7 +351,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -392,7 +392,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -415,7 +415,7 @@ void DAVResourceAccess::GET( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::GET( - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -433,7 +433,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -461,7 +461,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( //========================================================================= void DAVResourceAccess::GET( uno::Reference< io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, + const std::vector< OUString > & rHeaderNames, DAVResource & rResource, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -478,7 +478,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "GET" ), + OUString::createFromAscii( "GET" ), aHeaders ); m_xSession->GET( getRequestURI(), @@ -565,7 +565,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "PUT" ), + OUString::createFromAscii( "PUT" ), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -588,8 +588,8 @@ void DAVResourceAccess::PUT( //========================================================================= uno::Reference< io::XInputStream > DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ) @@ -617,7 +617,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -651,8 +651,8 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( //========================================================================= void DAVResourceAccess::POST( - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & rInputStream, uno::Reference< io::XOutputStream > & rOutputStream, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) @@ -680,7 +680,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "POST" ), + OUString::createFromAscii( "POST" ), aHeaders ); m_xSession->POST( getRequestURI(), @@ -728,7 +728,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MKCOL" ), + OUString::createFromAscii( "MKCOL" ), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -750,8 +750,8 @@ void DAVResourceAccess::MKCOL( //========================================================================= void DAVResourceAccess::COPY( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -768,7 +768,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "COPY" ), + OUString::createFromAscii( "COPY" ), aHeaders ); m_xSession->COPY( rSourcePath, @@ -792,8 +792,8 @@ void DAVResourceAccess::COPY( //========================================================================= void DAVResourceAccess::MOVE( - const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const uno::Reference< ucb::XCommandEnvironment > & xEnv ) throw( DAVException ) @@ -810,7 +810,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "MOVE" ), + OUString::createFromAscii( "MOVE" ), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -849,7 +849,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( + OUString::createFromAscii( "DESTROY" ), aHeaders ); @@ -889,7 +889,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -931,7 +931,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "LOCK" ), + OUString::createFromAscii( "LOCK" ), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -973,7 +973,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString::createFromAscii( "UNLOCK" ), + OUString::createFromAscii( "UNLOCK" ), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -994,12 +994,12 @@ void DAVResourceAccess::UNLOCK( } //========================================================================= -void DAVResourceAccess::setURL( const rtl::OUString & rNewURL ) +void DAVResourceAccess::setURL( const OUString & rNewURL ) throw( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); m_aURL = rNewURL; - m_aPath = rtl::OUString(); // Next initialize() will create new session. + m_aPath = OUString(); // Next initialize() will create new session. } //========================================================================= @@ -1011,7 +1011,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { SerfUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1045,7 +1045,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1061,8 +1061,8 @@ const rtl::OUString & DAVResourceAccess::getRequestURI() const // static void DAVResourceAccess::getUserRequestHeaders( const uno::Reference< ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ) { if ( xEnv.is() ) @@ -1077,7 +1077,7 @@ void DAVResourceAccess::getUserRequestHeaders( for ( sal_Int32 n = 0; n < aRequestHeaders.getLength(); ++n ) { - rtl::OUString aValue; + OUString aValue; sal_Bool isString = aRequestHeaders[ n ].Value >>= aValue; if ( !isString ) @@ -1096,7 +1096,7 @@ void DAVResourceAccess::getUserRequestHeaders( //========================================================================= sal_Bool DAVResourceAccess::detectRedirectCycle( - const rtl::OUString& rRedirectURL ) + const OUString& rRedirectURL ) throw ( DAVException ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); |