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 | |
| 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')
46 files changed, 888 insertions, 888 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 4c6e217ac39f..0ca32557aeec 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -88,16 +88,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) SerfUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( - rtl::OUString( "*** unknown ***" ) ), + OUString( "*** unknown ***" ) ), true ); } @@ -119,24 +119,24 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) //========================================================================= ContentProperties::ContentProperties( - const rtl::OUString & rTitle, sal_Bool bFolder ) + const OUString & rTitle, sal_Bool bFolder ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); } //========================================================================= -ContentProperties::ContentProperties( const rtl::OUString & rTitle ) +ContentProperties::ContentProperties( const OUString & rTitle ) : m_xProps( new PropertyValueMap ), m_bTrailingSlash( sal_False ) { - (*m_xProps)[ rtl::OUString::createFromAscii( "Title" ) ] + (*m_xProps)[ OUString::createFromAscii( "Title" ) ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -158,7 +158,7 @@ ContentProperties::ContentProperties( const ContentProperties & rOther ) } //========================================================================= -bool ContentProperties::contains( const rtl::OUString & rName ) const +bool ContentProperties::contains( const OUString & rName ) const { if ( get( rName ) ) return true; @@ -168,7 +168,7 @@ bool ContentProperties::contains( const rtl::OUString & rName ) const //========================================================================= const uno::Any & ContentProperties::getValue( - const rtl::OUString & rName ) const + const OUString & rName ) const { const PropertyValue * pProp = get( rName ); if ( pProp ) @@ -179,7 +179,7 @@ const uno::Any & ContentProperties::getValue( //========================================================================= const PropertyValue * ContentProperties::get( - const rtl::OUString & rName ) const + const OUString & rName ) const { PropertyValueMap::const_iterator it = m_xProps->find( rName ); const PropertyValueMap::const_iterator end = m_xProps->end(); @@ -204,7 +204,7 @@ const PropertyValue * ContentProperties::get( // static void ContentProperties::UCBNamesToDAVNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -298,7 +298,7 @@ void ContentProperties::UCBNamesToDAVNames( // static void ContentProperties::UCBNamesToHTTPNames( const uno::Sequence< beans::Property > & rProps, - std::vector< rtl::OUString > & propertyNames, + std::vector< OUString > & propertyNames, bool bIncludeUnmatched /* = true */ ) { ////////////////////////////////////////////////////////////// @@ -319,17 +319,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Last-Modified" ) ); + OUString::createFromAscii( "Last-Modified" ) ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Type" ) ); + OUString::createFromAscii( "Content-Type" ) ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString::createFromAscii( "Content-Length" ) ); + OUString::createFromAscii( "Content-Length" ) ); } else { @@ -342,14 +342,14 @@ void ContentProperties::UCBNamesToHTTPNames( //========================================================================= bool ContentProperties::containsAllNames( const uno::Sequence< beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { rNamesNotContained.clear(); sal_Int32 nCount = rProps.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProps[ n ].Name; + const OUString & rName = rProps[ n ].Name; if ( !contains( rName ) ) { // Not found. @@ -362,15 +362,15 @@ bool ContentProperties::containsAllNames( //========================================================================= void ContentProperties::addProperties( - const std::vector< rtl::OUString > & rProps, + const std::vector< OUString > & rProps, const ContentProperties & rContentProps ) { - std::vector< rtl::OUString >::const_iterator it = rProps.begin(); - std::vector< rtl::OUString >::const_iterator end = rProps.end(); + std::vector< OUString >::const_iterator it = rProps.begin(); + std::vector< OUString >::const_iterator end = rProps.end(); while ( it != end ) { - const rtl::OUString & rName = (*it); + const OUString & rName = (*it); if ( !contains( rName ) ) // ignore duplicates { @@ -424,19 +424,19 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) } //========================================================================= -void ContentProperties::addProperty( const rtl::OUString & rName, +void ContentProperties::addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName == DAVProperties::CREATIONDATE ) ) { // Map DAV:creationdate to UCP:DateCreated - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateCreated" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateCreated" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -448,10 +448,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -460,16 +460,16 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map Content-Length entity header to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString::createFromAscii( "Size" ) ] + (*m_xProps)[ OUString::createFromAscii( "Size" ) ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -478,7 +478,7 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString::createFromAscii( "MediaType" ) ] + (*m_xProps)[ OUString::createFromAscii( "MediaType" ) ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -487,12 +487,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName == DAVProperties::GETLASTMODIFIED ) { // Map the DAV:getlastmodified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -501,12 +501,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // Only DAV resources have this property. // Map the Last-Modified entity header to UCP:DateModified - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; util::DateTime aDate; DateTimeHelper::convert( aValue, aDate ); - (*m_xProps)[ rtl::OUString::createFromAscii( "DateModified" ) ] + (*m_xProps)[ OUString::createFromAscii( "DateModified" ) ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -514,21 +514,21 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName == DAVProperties::RESOURCETYPE ) ) { - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; // Map DAV:resourceype to UCP:IsFolder, UCP:IsDocument, UCP:ContentType sal_Bool bFolder = aValue.equalsIgnoreAsciiCase( "collection" ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsFolder" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsFolder" ) ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "IsDocument" ) ] + (*m_xProps)[ OUString::createFromAscii( "IsDocument" ) ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString::createFromAscii( "ContentType" ) ] + (*m_xProps)[ OUString::createFromAscii( "ContentType" ) ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ) + : OUString::createFromAscii( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) ) // { @@ -548,25 +548,25 @@ void ContentProperties::addProperty( const rtl::OUString & rName, namespace { - bool isCachable( rtl::OUString const & rName, + bool isCachable( OUString const & rName, bool isCaseSensitive ) { - static rtl::OUString aNonCachableProps [] = + static OUString aNonCachableProps [] = { DAVProperties::LOCKDISCOVERY, DAVProperties::GETETAG, - rtl::OUString( "ETag" ), + OUString( "ETag" ), - rtl::OUString( "DateModified" ), - rtl::OUString( "Last-Modified" ), + OUString( "DateModified" ), + OUString( "Last-Modified" ), DAVProperties::GETLASTMODIFIED, - rtl::OUString( "Size" ), - rtl::OUString( "Content-Length" ), + OUString( "Size" ), + OUString( "Content-Length" ), DAVProperties::GETCONTENTLENGTH, - rtl::OUString( "Date" ) + OUString( "Date" ) }; for ( sal_uInt32 n = 0; diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 6105879f1dda..b9e075c1854b 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -42,7 +42,7 @@ struct DAVResource; struct equalString { - bool operator()( const rtl::OUString& s1, const rtl::OUString& s2 ) const + bool operator()( const OUString& s1, const OUString& s2 ) const { return !!( s1 == s2 ); } @@ -50,7 +50,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -84,7 +84,7 @@ public: typedef std::hash_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -101,17 +101,17 @@ public: ContentProperties( const DAVResource& rResource ); // Mini props for transient contents. - ContentProperties( const rtl::OUString & rTitle, sal_Bool bFolder ); + ContentProperties( const OUString & rTitle, sal_Bool bFolder ); // Micro props for non-existing contents. - ContentProperties( const rtl::OUString & rTitle ); + ContentProperties( const OUString & rTitle ); ContentProperties( const ContentProperties & rOther ); - bool contains( const rtl::OUString & rName ) const; + bool contains( const OUString & rName ) const; const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const; + getValue( const OUString & rName ) const; // Maps the UCB property names contained in rProps with their DAV property // counterparts, if possible. All unmappable properties will be included @@ -123,7 +123,7 @@ public: static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // Maps the UCB property names contained in rProps with their HTTP header @@ -136,7 +136,7 @@ public: static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property > & rProps, - std::vector< rtl::OUString > & resources, + std::vector< OUString > & resources, bool bIncludeUnmatched = true ); // return true, if all properties contained in rProps are contained in @@ -145,12 +145,12 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const; + std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in // rContentProps to this instance. In case of duplicates the value // already contained in this will left unchanged. - void addProperties( const std::vector< rtl::OUString > & rProps, + void addProperties( const std::vector< OUString > & rProps, const ContentProperties & rContentProps ); // overwrites probably existing entries. @@ -160,7 +160,7 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); // overwrites probably existing entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -169,7 +169,7 @@ public: bool isTrailingSlash() const { return m_bTrailingSlash; } - const rtl::OUString & getEscapedTitle() const { return m_aEscapedTitle; } + const OUString & getEscapedTitle() const { return m_aEscapedTitle; } // Not good to expose implementation details, but this is actually an // internal class. @@ -177,7 +177,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -185,7 +185,7 @@ private: ContentProperties & operator=( const ContentProperties & ); // n.i. - const PropertyValue * get( const rtl::OUString & rName ) const; + const PropertyValue * get( const OUString & rName ) const; }; class CachableContentProperties @@ -206,11 +206,11 @@ public: bool containsAllNames( const com::sun::star::uno::Sequence< com::sun::star::beans::Property >& rProps, - std::vector< rtl::OUString > & rNamesNotContained ) const + std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } const com::sun::star::uno::Any & - getValue( const rtl::OUString & rName ) const + getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } operator const ContentProperties & () const { return m_aProps; } diff --git a/ucb/source/ucp/webdav/DAVAuthListener.hxx b/ucb/source/ucp/webdav/DAVAuthListener.hxx index baa27bdc19ba..005079b26de5 100644 --- a/ucb/source/ucp/webdav/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListener.hxx @@ -34,10 +34,10 @@ class DAVAuthListener : public salhelper::SimpleReferenceObject { public: virtual int 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 = sal_True ) = 0; }; diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 9ffe92255ef7..82822239da40 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -46,25 +46,25 @@ namespace http_dav_ucp DAVAuthListener_Impl( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment>& xEnv, - const ::rtl::OUString & inURL ) + const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { } - virtual int authenticate( const ::rtl::OUString & inRealm, - const ::rtl::OUString & inHostName, - ::rtl::OUString & inoutUserName, - ::rtl::OUString & outPassWord, + virtual int authenticate( const OUString & inRealm, + const OUString & inHostName, + OUString & inoutUserName, + OUString & outPassWord, sal_Bool bCanUseSystemCredentials, sal_Bool bUsePreviousCredentials = sal_True ); private: const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; - const rtl::OUString m_aURL; + const OUString m_aURL; - rtl::OUString m_aPrevPassword; - rtl::OUString m_aPrevUsername; + OUString m_aPrevPassword; + OUString m_aPrevUsername; }; } diff --git a/ucb/source/ucp/webdav/DAVException.hxx b/ucb/source/ucp/webdav/DAVException.hxx index dc0dc2fd57f2..54b85003c82e 100644 --- a/ucb/source/ucp/webdav/DAVException.hxx +++ b/ucb/source/ucp/webdav/DAVException.hxx @@ -135,7 +135,7 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: @@ -145,13 +145,13 @@ class DAVException , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData ) + const OUString & rData ) : mExceptionCode( inExceptionCode ) , mData( rData ) , mStatusCode( SC_NONE ) {}; DAVException( ExceptionCode inExceptionCode, - const rtl::OUString & rData, + const OUString & rData, sal_uInt16 nStatusCode ) : mExceptionCode( inExceptionCode ) , mData( rData ) @@ -160,7 +160,7 @@ class DAVException ~DAVException( ) {}; const ExceptionCode & getError() const { return mExceptionCode; } - const rtl::OUString & getData() const { return mData; } + const OUString & getData() const { return mData; } sal_uInt16 getStatus() const { return mStatusCode; } }; diff --git a/ucb/source/ucp/webdav/DAVProperties.cxx b/ucb/source/ucp/webdav/DAVProperties.cxx index 5b018b6e6344..7340dbe6a35c 100644 --- a/ucb/source/ucp/webdav/DAVProperties.cxx +++ b/ucb/source/ucp/webdav/DAVProperties.cxx @@ -22,41 +22,41 @@ using namespace http_dav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE = - ::rtl::OUString::createFromAscii( "DAV:creationdate" ); -const ::rtl::OUString DAVProperties::DISPLAYNAME = - ::rtl::OUString::createFromAscii( "DAV:displayname" ); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE = - ::rtl::OUString::createFromAscii( "DAV:getcontentlanguage" ); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH = - ::rtl::OUString::createFromAscii( "DAV:getcontentlength" ); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE = - ::rtl::OUString::createFromAscii( "DAV:getcontenttype" ); -const ::rtl::OUString DAVProperties::GETETAG = - ::rtl::OUString::createFromAscii( "DAV:getetag" ); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED = - ::rtl::OUString::createFromAscii( "DAV:getlastmodified" ); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY = - ::rtl::OUString::createFromAscii( "DAV:lockdiscovery" ); -const ::rtl::OUString DAVProperties::RESOURCETYPE = - ::rtl::OUString::createFromAscii( "DAV:resourcetype" ); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK = - ::rtl::OUString::createFromAscii( "DAV:supportedlock" ); - -const ::rtl::OUString DAVProperties::EXECUTABLE = - ::rtl::OUString::createFromAscii( +const OUString DAVProperties::CREATIONDATE = + OUString::createFromAscii( "DAV:creationdate" ); +const OUString DAVProperties::DISPLAYNAME = + OUString::createFromAscii( "DAV:displayname" ); +const OUString DAVProperties::GETCONTENTLANGUAGE = + OUString::createFromAscii( "DAV:getcontentlanguage" ); +const OUString DAVProperties::GETCONTENTLENGTH = + OUString::createFromAscii( "DAV:getcontentlength" ); +const OUString DAVProperties::GETCONTENTTYPE = + OUString::createFromAscii( "DAV:getcontenttype" ); +const OUString DAVProperties::GETETAG = + OUString::createFromAscii( "DAV:getetag" ); +const OUString DAVProperties::GETLASTMODIFIED = + OUString::createFromAscii( "DAV:getlastmodified" ); +const OUString DAVProperties::LOCKDISCOVERY = + OUString::createFromAscii( "DAV:lockdiscovery" ); +const OUString DAVProperties::RESOURCETYPE = + OUString::createFromAscii( "DAV:resourcetype" ); +const OUString DAVProperties::SUPPORTEDLOCK = + OUString::createFromAscii( "DAV:supportedlock" ); + +const OUString DAVProperties::EXECUTABLE = + OUString::createFromAscii( "http://apache.org/dav/props/executable" ); // ------------------------------------------------------------------- // static -void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, +void DAVProperties::createSerfPropName( const OUString & rFullName, SerfPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ) ); } @@ -64,7 +64,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://apache.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://apache.org/dav/props/" ) ), @@ -74,7 +74,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "http://ucb.openoffice.org/dav/props/" ) ), @@ -84,8 +84,8 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, { // Support for 3rd party namespaces/props - rtl::OString aFullName - = rtl::OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); + OString aFullName + = OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ); // Format: <prop:the_propname xmlns:prop="the_namespace"> @@ -102,7 +102,7 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // Add our namespace to our own properties. rName.nspace = "http://ucb.openoffice.org/dav/props/"; rName.name - = strdup( rtl::OUStringToOString( rFullName, + = strdup( OUStringToOString( rFullName, RTL_TEXTENCODING_UTF8 ) ); } } @@ -111,12 +111,12 @@ void DAVProperties::createSerfPropName( const rtl::OUString & rFullName, // static void DAVProperties::createUCBPropName( const char * nspace, const char * name, - rtl::OUString & rFullName ) + OUString & rFullName ) { - rtl::OUString aNameSpace - = rtl::OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); - rtl::OUString aName - = rtl::OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); + OUString aNameSpace + = OStringToOUString( nspace, RTL_TEXTENCODING_UTF8 ); + OUString aName + = OStringToOUString( name, RTL_TEXTENCODING_UTF8 ); if ( !aNameSpace.getLength() ) { @@ -135,7 +135,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) ) { - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } } @@ -162,11 +162,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString::createFromAscii( "<prop:" ); + rFullName = OUString::createFromAscii( "<prop:" ); rFullName += aName; - rFullName += rtl::OUString::createFromAscii( " xmlns:prop=\"" ); + rFullName += OUString::createFromAscii( " xmlns:prop=\"" ); rFullName += aNameSpace; - rFullName += rtl::OUString::createFromAscii( "\">" ); + rFullName += OUString::createFromAscii( "\">" ); } } diff --git a/ucb/source/ucp/webdav/DAVProperties.hxx b/ucb/source/ucp/webdav/DAVProperties.hxx index 0434ef3cc7e5..1906c7fb264d 100644 --- a/ucb/source/ucp/webdav/DAVProperties.hxx +++ b/ucb/source/ucp/webdav/DAVProperties.hxx @@ -29,23 +29,23 @@ namespace http_dav_ucp struct DAVProperties { - static const ::rtl::OUString CREATIONDATE; - static const ::rtl::OUString DISPLAYNAME; - static const ::rtl::OUString GETCONTENTLANGUAGE; - static const ::rtl::OUString GETCONTENTLENGTH; - static const ::rtl::OUString GETCONTENTTYPE; - static const ::rtl::OUString GETETAG; - static const ::rtl::OUString GETLASTMODIFIED; - static const ::rtl::OUString LOCKDISCOVERY; - static const ::rtl::OUString RESOURCETYPE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; - - static void createSerfPropName( const rtl::OUString & rFullName, + static const OUString CREATIONDATE; + static const OUString DISPLAYNAME; + static const OUString GETCONTENTLANGUAGE; + static const OUString GETCONTENTLENGTH; + static const OUString GETCONTENTTYPE; + static const OUString GETETAG; + static const OUString GETLASTMODIFIED; + static const OUString LOCKDISCOVERY; + static const OUString RESOURCETYPE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; + + static void createSerfPropName( const OUString & rFullName, SerfPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const SerfPropName & rName ); }; diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx index e609273968f5..ea63b9efe514 100644 --- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx @@ -27,19 +27,19 @@ namespace http_dav_ucp { - typedef std::pair< rtl::OUString, rtl::OUString > DAVRequestHeader; + typedef std::pair< OUString, OUString > DAVRequestHeader; typedef std::vector< DAVRequestHeader > DAVRequestHeaders; struct DAVRequestEnvironment { - rtl::OUString m_aRequestURI; + OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; // rtl::Reference< DAVStatusListener > m_xStatusListener; // rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 6e9fa1b259e5..9e43a135973c 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -32,7 +32,7 @@ namespace http_dav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -41,19 +41,19 @@ struct DAVPropertyValue struct DAVResource { - ::rtl::OUString uri; + OUString uri; std::vector< DAVPropertyValue > properties; DAVResource() {} - DAVResource( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResource( const OUString & inUri ) : uri( inUri ) {} }; struct DAVResourceInfo { - ::rtl::OUString uri; - std::vector < ::rtl::OUString > properties; + OUString uri; + std::vector < OUString > properties; - DAVResourceInfo( const ::rtl::OUString & inUri ) : uri( inUri ) {} + DAVResourceInfo( const OUString & inUri ) : uri( inUri ) {} }; } // namespace http_dav_ucp 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 ); diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 792a85a354e0..a6d562321e75 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -45,8 +45,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; com::sun::star::uno::Reference< @@ -59,17 +59,17 @@ public: com::sun::star::lang::XMultiServiceFactory > & rSMgr, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); - void setURL( const rtl::OUString & rNewURL ) + void setURL( const OUString & rNewURL ) throw ( DAVException ); void resetUri(); - const rtl::OUString & getURL() const { return m_aURL; } + const OUString & getURL() const { return m_aURL; } rtl::Reference< DAVSessionFactory > getSessionFactory() const { return m_xSessionFactory; } @@ -80,7 +80,7 @@ public: // allprop & named void PROPFIND( const Depth nDepth, - const std::vector< rtl::OUString > & rPropertyNames, + const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -101,7 +101,7 @@ public: throw ( DAVException ); void - HEAD( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -129,7 +129,7 @@ public: void GET( com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & rStream, - const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' + const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -143,8 +143,8 @@ public: throw ( DAVException ); com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, const com::sun::star::uno::Reference< @@ -152,8 +152,8 @@ public: throw ( DAVException ); void - POST( const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & rInputStream, com::sun::star::uno::Reference< @@ -168,16 +168,16 @@ public: throw ( DAVException ); void - COPY( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + COPY( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - MOVE( const ::rtl::OUString & rSourcePath, - const ::rtl::OUString & rDestinationURI, + MOVE( const OUString & rSourcePath, + const OUString & rDestinationURI, sal_Bool bOverwrite, const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ) @@ -218,13 +218,13 @@ public: getUserRequestHeaders( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv, - const rtl::OUString & rURI, - const rtl::OUString & rMethod, + const OUString & rURI, + const OUString & rMethod, DAVRequestHeaders & rRequestHeaders ); private: - const rtl::OUString & getRequestURI() const; - sal_Bool detectRedirectCycle( const rtl::OUString& rRedirectURL ) + const OUString & getRequestURI() const; + sal_Bool detectRedirectCycle( const OUString& rRedirectURL ) throw ( DAVException ); sal_Bool handleException( DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index ebb7fd2162e2..e02ff46a1e77 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -59,7 +59,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath ) = 0; + virtual sal_Bool CanUse( const OUString & inPath ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -68,82 +68,82 @@ public: // NOT USED /* - virtual void OPTIONS( const ::rtl::OUString & inPath, + virtual void OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; */ // allprop & named - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropertyNames, + const std::vector< OUString > & inPropertyNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // propnames - virtual void PROPFIND( const ::rtl::OUString & inPath, + virtual void PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PROPPATCH( const ::rtl::OUString & inPath, + virtual void PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + virtual void HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void GET( const ::rtl::OUString & inPath, + virtual void GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void PUT( const ::rtl::OUString & inPath, + virtual void PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + virtual void POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -151,39 +151,39 @@ public: const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void MKCOL( const ::rtl::OUString & inPath, + virtual void MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual void COPY( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void COPY( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void MOVE( const ::rtl::OUString & inSource, - const ::rtl::OUString & inDestination, + virtual void MOVE( const OUString & inSource, + const OUString & inDestination, const DAVRequestEnvironment & rEnv, sal_Bool inOverwrite = false ) throw( DAVException ) = 0; - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; // set new lock. - virtual void LOCK( const ::rtl::OUString & inPath, + virtual void LOCK( const OUString & inPath, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inPath, + virtual sal_Int64 LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; - virtual void UNLOCK( const ::rtl::OUString & inPath, + virtual void UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.cxx b/ucb/source/ucp/webdav/DAVSessionFactory.cxx index 231a7fe6c10f..77bb317fdb01 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.cxx @@ -30,7 +30,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Reference< lang::XMultiServiceFactory > & rxSMgr ) throw( DAVException ) { diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 403a70fff10e..27f58ef72731 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -50,7 +50,7 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rxSMgr ) @@ -58,7 +58,7 @@ public: ::uno::Reference< ::lang::XMultiServiceFactory > getServiceFactory() { return m_xMSF; } private: - typedef std::map< rtl::OUString, DAVSession * > Map; + typedef std::map< OUString, DAVSession * > Map; Map m_aMap; osl::Mutex m_aMutex; diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index a32aee65e697..85255d4dbd67 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -65,11 +65,11 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - rtl::OUString name; + OUString name; com::sun::star::uno::Any value; ProppatchValue( const ProppatchOperation o, - const rtl::OUString & n, + const OUString & n, const com::sun::star::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index ba2be763eb74..25425a289231 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -38,16 +38,16 @@ namespace http_dav_ucp class DateTimeHelper { private: - static sal_Int32 convertMonthToInt (const ::rtl::OUString& ); + static sal_Int32 convertMonthToInt (const OUString& ); - static bool ISO8601_To_DateTime (const ::rtl::OUString&, + static bool ISO8601_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); - static bool RFC2068_To_DateTime (const ::rtl::OUString&, + static bool RFC2068_To_DateTime (const OUString&, ::com::sun::star::util::DateTime& ); public: - static bool convert (const ::rtl::OUString&, + static bool convert (const OUString&, ::com::sun::star::util::DateTime& ); }; diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index b5791a3c1fb4..3632853c542f 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -38,7 +38,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream( xioInStrm ) @@ -62,7 +62,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream() @@ -139,7 +139,7 @@ void SerfGetReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfResponse void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -151,8 +151,8 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -174,7 +174,7 @@ void SerfGetReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 6497ecba2715..dd02be1639c4 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -42,7 +42,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); SerfGetReqProcImpl( const char* inPath, @@ -52,7 +52,7 @@ public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfGetReqProcImpl(); @@ -73,7 +73,7 @@ protected: private: com::sun::star::uno::Reference< SerfInputStream > xInputStream; com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx index fe4171164241..e48a1a0b04e2 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.cxx @@ -26,7 +26,7 @@ namespace http_dav_ucp SerfHeadReqProcImpl::SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpHeaderNames( &inHeaderNames ) @@ -93,7 +93,7 @@ void SerfHeadReqProcImpl::handleEndOfResponseData( serf_bucket_t * inSerfRespons void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, const char* inHeaderValue ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( inHeaderName ) ); + OUString aHeaderName( OUString::createFromAscii( inHeaderName ) ); bool bStoreHeaderField = false; @@ -105,8 +105,8 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, else { // store only header fields which are requested - std::vector< ::rtl::OUString >::const_iterator it( mpHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( mpHeaderNames->end() ); + std::vector< OUString >::const_iterator it( mpHeaderNames->begin() ); + const std::vector< OUString >::const_iterator end( mpHeaderNames->end() ); while ( it != end ) { @@ -128,7 +128,7 @@ void SerfHeadReqProcImpl::processSingleResponseHeader( const char* inHeaderName, DAVPropertyValue thePropertyValue; thePropertyValue.IsCaseSensitive = false; thePropertyValue.Name = aHeaderName; - thePropertyValue.Value <<= rtl::OUString::createFromAscii( inHeaderValue ); + thePropertyValue.Value <<= OUString::createFromAscii( inHeaderValue ); mpResource->properties.push_back( thePropertyValue ); } } diff --git a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx index 46039f130b49..404175617631 100644 --- a/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfHeadReqProcImpl.hxx @@ -37,7 +37,7 @@ class SerfHeadReqProcImpl : public SerfRequestProcessorImpl public: SerfHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); virtual ~SerfHeadReqProcImpl(); @@ -56,7 +56,7 @@ protected: void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ); private: - const std::vector< ::rtl::OUString > * mpHeaderNames; + const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfLockStore.cxx b/ucb/source/ucp/webdav/SerfLockStore.cxx index ec53fc57f6b2..27ed897bb8f8 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.cxx +++ b/ucb/source/ucp/webdav/SerfLockStore.cxx @@ -142,12 +142,12 @@ void SerfLockStore::registerSession( HttpSession * pHttpSession ) } // ------------------------------------------------------------------- -SerfLock * SerfLockStore::findByUri( rtl::OUString const & rUri ) +SerfLock * SerfLockStore::findByUri( OUString const & rUri ) { osl::MutexGuard aGuard( m_aMutex ); ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( + ne_uri_parse( OUStringToOString( rUri, RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); return ne_lockstore_findbyuri( m_pSerfLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav/SerfLockStore.hxx b/ucb/source/ucp/webdav/SerfLockStore.hxx index cc11af5e4011..ac3e951a79f6 100644 --- a/ucb/source/ucp/webdav/SerfLockStore.hxx +++ b/ucb/source/ucp/webdav/SerfLockStore.hxx @@ -70,7 +70,7 @@ public: void registerSession( HttpSession * pHttpSession ); - SerfLock * findByUri( rtl::OUString const & rUri ); + SerfLock * findByUri( OUString const & rUri ); void addLock( SerfLock * pLock, rtl::Reference< SerfSession > const & xSession, diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 725f91d01ec5..50accc4252f0 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -99,7 +99,7 @@ serf_bucket_t * SerfPostReqProcImpl::createSerfRequestBucket( serf_request_t * i serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnPostDataLen ), RTL_TEXTENCODING_UTF8 ) ); } if ( mpContentType != 0 ) { diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx index 4dca188f32c1..5fb7680fc55b 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.cxx @@ -32,7 +32,7 @@ namespace http_dav_ucp SerfPropFindReqProcImpl::SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mDepthStr( 0 ) @@ -89,7 +89,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t // body bucket - certain properties OR all properties OR only property names serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with requested properties const int nPropCount = ( !mbOnlyPropertyNames && mpPropNames ) @@ -105,33 +105,33 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t thePropName ); /* <*propname* xmlns="*propns*" /> */ - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlnx=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"/>" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlnx=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"/>" ); } - aBodyText = rtl::OUString::createFromAscii( "<prop>" ) + + aBodyText = OUString::createFromAscii( "<prop>" ) + aBodyText + - rtl::OUString::createFromAscii( "</prop>" ); + OUString::createFromAscii( "</prop>" ); } else { if ( mbOnlyPropertyNames ) { - aBodyText = rtl::OUString::createFromAscii( "<propname/>" ); + aBodyText = OUString::createFromAscii( "<propname/>" ); } else { - aBodyText = rtl::OUString::createFromAscii( "<allprop/>" ); + aBodyText = OUString::createFromAscii( "<allprop/>" ); } } - aBodyText = rtl::OUString::createFromAscii( PROPFIND_HEADER ) + + aBodyText = OUString::createFromAscii( PROPFIND_HEADER ) + aBodyText + - rtl::OUString::createFromAscii( PROPFIND_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + OUString::createFromAscii( PROPFIND_TRAILER ); + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -161,7 +161,7 @@ serf_bucket_t * SerfPropFindReqProcImpl::createSerfRequestBucket( serf_request_t } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 92ea5a7fed91..35503ba0f812 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -38,7 +38,7 @@ public: SerfPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfPropFindReqProcImpl( const char* inPath, @@ -62,7 +62,7 @@ private: void init( const Depth inDepth ); const char* mDepthStr; - const std::vector< ::rtl::OUString > * mpPropNames; + const std::vector< OUString > * mpPropNames; std::vector< DAVResource > * mpResources; std::vector< DAVResourceInfo > * mpResInfo; diff --git a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx index 39f1c8d637d7..9b2583a53f6f 100644 --- a/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPropPatchReqProcImpl.cxx @@ -48,7 +48,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ // body bucket serf_bucket_t* body_bkt = 0; - rtl::OUString aBodyText; + OUString aBodyText; { // create and fill body bucket with properties to be set or removed static const char* OpCodes[2] = { "set", "remove" }; @@ -59,9 +59,9 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ { // <*operation code*><prop> ProppatchOperation lastOp = (*mpProperties)[ 0 ].operation; - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( "><prop>" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( "><prop>" ); SerfPropName thePropName; for ( int n = 0; n < nPropCount; ++n ) @@ -74,26 +74,26 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ if ( rProperty.operation != lastOp ) { // </prop></*last operation code*><*operation code><prop> - aBodyText += rtl::OUString::createFromAscii( "</prop></" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( "><" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[rProperty.operation] ); - aBodyText += rtl::OUString::createFromAscii( "><prop>" ); + aBodyText += OUString::createFromAscii( "</prop></" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( "><" ); + aBodyText += OUString::createFromAscii( OpCodes[rProperty.operation] ); + aBodyText += OUString::createFromAscii( "><prop>" ); } // <*propname* xmlns="*propns*" - aBodyText += rtl::OUString::createFromAscii( "<" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( " xmlns=\"" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.nspace ); - aBodyText += rtl::OUString::createFromAscii( "\"" ); + aBodyText += OUString::createFromAscii( "<" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( " xmlns=\"" ); + aBodyText += OUString::createFromAscii( thePropName.nspace ); + aBodyText += OUString::createFromAscii( "\"" ); if ( rProperty.operation == PROPSET ) { // >*property value*</*propname*> - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( ">" ); - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( thePropName ) ) { UCBDeadPropertyValue::toXML( rProperty.value, @@ -104,31 +104,31 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ rProperty.value >>= aStringValue; } aBodyText += aStringValue; - aBodyText += rtl::OUString::createFromAscii( "</" ); - aBodyText += rtl::OUString::createFromAscii( thePropName.name ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "</" ); + aBodyText += OUString::createFromAscii( thePropName.name ); + aBodyText += OUString::createFromAscii( ">" ); } else { // /> - aBodyText += rtl::OUString::createFromAscii( "/>" ); + aBodyText += OUString::createFromAscii( "/>" ); } lastOp = rProperty.operation; } // </prop></*last operation code*> - aBodyText += rtl::OUString::createFromAscii( "</prop></" ); - aBodyText += rtl::OUString::createFromAscii( OpCodes[lastOp] ); - aBodyText += rtl::OUString::createFromAscii( ">" ); + aBodyText += OUString::createFromAscii( "</prop></" ); + aBodyText += OUString::createFromAscii( OpCodes[lastOp] ); + aBodyText += OUString::createFromAscii( ">" ); // add PropPatch xml header in front - aBodyText = rtl::OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; + aBodyText = OUString::createFromAscii( PROPPATCH_HEADER ) + aBodyText; // add PropPatch xml trailer at end - aBodyText += rtl::OUString::createFromAscii( PROPPATCH_TRAILER ); + aBodyText += OUString::createFromAscii( PROPPATCH_TRAILER ); - body_bkt = SERF_BUCKET_SIMPLE_STRING( rtl::OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), + body_bkt = SERF_BUCKET_SIMPLE_STRING( OUStringToOString( aBodyText, RTL_TEXTENCODING_UTF8 ), pSerfBucketAlloc ); if ( useChunkedEncoding() ) { @@ -158,7 +158,7 @@ serf_bucket_t * SerfPropPatchReqProcImpl::createSerfRequestBucket( serf_request_ } serf_bucket_headers_set( hdrs_bkt, "Content-Type", "application/xml" ); serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( aBodyText.getLength() ), RTL_TEXTENCODING_UTF8 ) ); } return req_bkt; diff --git a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx index 56519e99de66..2b83dcf21147 100644 --- a/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPutReqProcImpl.cxx @@ -75,7 +75,7 @@ serf_bucket_t * SerfPutReqProcImpl::createSerfRequestBucket( serf_request_t * in serf_bucket_headers_set( hdrs_bkt, "Transfer-Encoding", "chunked"); } serf_bucket_headers_set( hdrs_bkt, "Content-Length", - rtl::OUStringToOString( rtl::OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( OUString::valueOf( (sal_Int32)mnDataLen ), RTL_TEXTENCODING_UTF8 ) ); } diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index f73766f6df0b..db4c5ac4ec3c 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -29,7 +29,7 @@ namespace http_dav_ucp { SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ) : mrSerfSession( rSerfSession ) , mPathStr( 0 ) @@ -50,7 +50,7 @@ SerfRequestProcessor::SerfRequestProcessor( SerfSession& rSerfSession, , mbHandleSerfResponseCalled( false ) { mPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ) ); } SerfRequestProcessor::~SerfRequestProcessor() @@ -64,8 +64,8 @@ void SerfRequestProcessor::prepareProcessor() delete mpDAVException; mpDAVException = 0; mnHTTPStatusCode = SC_NONE; - mHTTPStatusCodeText = rtl::OUString(); - mRedirectLocation = rtl::OUString(); + mHTTPStatusCodeText = OUString(); + mRedirectLocation = OUString(); mnSuccessfulCredentialAttempts = 0; mbInputOfCredentialsAborted = false; @@ -76,7 +76,7 @@ void SerfRequestProcessor::prepareProcessor() // PROPFIND - allprop & named bool SerfRequestProcessor::processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ) { @@ -130,7 +130,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -158,7 +158,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com // GET inclusive header fields bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -173,7 +173,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com } // HEAD -bool SerfRequestProcessor::processHead( const std::vector< ::rtl::OUString > & inHeaderNames, +bool SerfRequestProcessor::processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) { @@ -203,15 +203,15 @@ bool SerfRequestProcessor::processPut( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -227,15 +227,15 @@ bool SerfRequestProcessor::processPost( const char* inData, // POST bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inContentType, RTL_TEXTENCODING_UTF8 ) ); mReferer = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inReferer, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createPostReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, inData, @@ -269,12 +269,12 @@ bool SerfRequestProcessor::processMkCol( apr_status_t& outSerfStatus ) } // COPY -bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createCopyReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -285,12 +285,12 @@ bool SerfRequestProcessor::processCopy( const rtl::OUString & inDestinationPath, } // MOVE -bool SerfRequestProcessor::processMove( const rtl::OUString & inDestinationPath, +bool SerfRequestProcessor::processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ) { mDestPathStr = apr_pstrdup( mrSerfSession.getAprPool(), - rtl::OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); + OUStringToOString( inDestinationPath, RTL_TEXTENCODING_UTF8 ) ); mpProcImpl = createMoveReqProcImpl( mPathStr, mrSerfSession.getRequestEnvironment().m_aRequestHeaders, mDestPathStr, @@ -501,7 +501,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe : SC_NONE; if ( sl.reason ) { - mHTTPStatusCodeText = ::rtl::OUString::createFromAscii( sl.reason ); + mHTTPStatusCodeText = OUString::createFromAscii( sl.reason ); } if ( ( sl.version == 0 || sl.code < 0 ) || mnHTTPStatusCode >= 300 ) @@ -516,7 +516,7 @@ apr_status_t SerfRequestProcessor::handleSerfResponse( serf_request_t * inSerfRe const char* location = serf_bucket_headers_get( headers, "Location" ); if ( location ) { - mRedirectLocation = rtl::OUString::createFromAscii( location ); + mRedirectLocation = OUString::createFromAscii( location ); } mbProcessingDone = true; return APR_EGENERAL; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 8b7fcaded928..734cd07bb601 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -43,13 +43,13 @@ class SerfRequestProcessor { public: SerfRequestProcessor( SerfSession& rSerfSession, - const rtl::OUString & inPath, + const OUString & inPath, const bool bUseChunkedEncoding ); ~SerfRequestProcessor(); // PROPFIND - allprop & named bool processPropFind( const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, apr_status_t& outSerfStatus ); @@ -68,7 +68,7 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -78,12 +78,12 @@ public: // GET inclusive header fields bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); // HEAD - bool processHead( const std::vector< ::rtl::OUString > & inHeaderNames, + bool processHead( const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -95,16 +95,16 @@ public: // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // POST bool processPost( const char* inData, apr_size_t inDataLen, - const rtl::OUString & inContentType, - const rtl::OUString & inReferer, + const OUString & inContentType, + const OUString & inReferer, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); @@ -115,12 +115,12 @@ public: bool processMkCol( apr_status_t& outSerfStatus ); // COPY - bool processCopy( const rtl::OUString & inDestinationPath, + bool processCopy( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); // MOVE - bool processMove( const rtl::OUString & inDestinationPath, + bool processMove( const OUString & inDestinationPath, const bool inOverwrite, apr_status_t& outSerfStatus ); @@ -165,8 +165,8 @@ public: DAVException* mpDAVException; sal_uInt16 mnHTTPStatusCode; - rtl::OUString mHTTPStatusCodeText; - rtl::OUString mRedirectLocation; + OUString mHTTPStatusCodeText; + OUString mRedirectLocation; sal_uInt8 mnSuccessfulCredentialAttempts; bool mbInputOfCredentialsAborted; diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx index d27064c60ab7..7637684f3425 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImpl.cxx @@ -56,9 +56,9 @@ void SerfRequestProcessorImpl::setRequestHeaders( serf_bucket_t* inoutSerfHeader while ( aHeaderIter != aEnd ) { - const rtl::OString aHeader = rtl::OUStringToOString( (*aHeaderIter).first, + const OString aHeader = OUStringToOString( (*aHeaderIter).first, RTL_TEXTENCODING_UTF8 ); - const rtl::OString aValue = rtl::OUStringToOString( (*aHeaderIter).second, + const OString aValue = OUStringToOString( (*aHeaderIter).second, RTL_TEXTENCODING_UTF8 ); serf_bucket_headers_set( inoutSerfHeaderBucket, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx index 33e79223845e..3abf5a7ec37b 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.cxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfPropFindReqProcImpl( inPath, @@ -80,7 +80,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -104,7 +104,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference<com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfGetReqProcImpl( inPath, @@ -117,7 +117,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ) { SerfRequestProcessorImpl* pReqProcImpl = new SerfHeadReqProcImpl( inPath, diff --git a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx index ee6d5b540953..083287ed7c13 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessorImplFac.hxx @@ -34,7 +34,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources ); SerfRequestProcessorImpl* createPropFindReqProcImpl( const char* inPath, @@ -53,7 +53,7 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, @@ -63,12 +63,12 @@ namespace http_dav_ucp SerfRequestProcessorImpl* createGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createHeadReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource& ioResource ); SerfRequestProcessorImpl* createPutReqProcImpl( const char* inPath, diff --git a/ucb/source/ucp/webdav/SerfSession.cxx b/ucb/source/ucp/webdav/SerfSession.cxx index 40641676df02..33c54281fb10 100644 --- a/ucb/source/ucp/webdav/SerfSession.cxx +++ b/ucb/source/ucp/webdav/SerfSession.cxx @@ -59,7 +59,7 @@ using namespace http_dav_ucp; // ------------------------------------------------------------------- SerfSession::SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) : DAVSession( rSessionFactory ) @@ -159,7 +159,7 @@ void SerfSession::Init() { apr_sockaddr_t *proxy_address = NULL; const apr_status_t status = apr_sockaddr_info_get( &proxy_address, - rtl::OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ), APR_UNSPEC, static_cast<apr_port_t>(m_nProxyPort), 0, getAprPool() ); @@ -207,7 +207,7 @@ bool SerfSession::isHeadRequestInProgress() bool SerfSession::isSSLNeeded() { - return m_aUri.GetScheme().equalsIgnoreAsciiCase( rtl::OUString( "https" ) ); + return m_aUri.GetScheme().equalsIgnoreAsciiCase( OUString( "https" ) ); } char* SerfSession::getHostinfo() @@ -218,7 +218,7 @@ char* SerfSession::getHostinfo() // ------------------------------------------------------------------- // virtual -sal_Bool SerfSession::CanUse( const rtl::OUString & inUri ) +sal_Bool SerfSession::CanUse( const OUString & inUri ) { try { @@ -296,12 +296,12 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA return SERF_ERROR_AUTHN_FAILED; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; try { SerfUri uri( getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( aUserInfo.getLength() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -325,7 +325,7 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA const bool bCanUseSystemCreds = ( ( strcasecmp( inAuthProtocol, "NTLM" ) == 0 ) || ( strcasecmp( inAuthProtocol, "Negotiate" ) == 0 ) ); - int theRetVal = pListener->authenticate( rtl::OUString::createFromAscii( inRealm ), + int theRetVal = pListener->authenticate( OUString::createFromAscii( inRealm ), getHostName(), theUserName, thePassWord, @@ -334,8 +334,8 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA if ( theRetVal == 0 ) { - *outUsername = apr_pstrdup( inAprPool, rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); - *outPassword = apr_pstrdup( inAprPool, rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + *outUsername = apr_pstrdup( inAprPool, OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + *outPassword = apr_pstrdup( inAprPool, OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); } return theRetVal != 0 ? SERF_ERROR_AUTHN_FAILED : APR_SUCCESS; @@ -344,10 +344,10 @@ apr_status_t SerfSession::provideSerfCredentials( bool bGiveProvidedCredentialsA namespace { // ------------------------------------------------------------------- // Helper function - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId = ::rtl::OUString::createFromAscii( "CN=" ); + OUString sPart; + OUString sPartId = OUString::createFromAscii( "CN=" ); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -387,10 +387,10 @@ apr_status_t SerfSession::verifySerfCertificateChain ( xSEInitializer = uno::Reference< xml::crypto::XSEInitializer >( getMSF()->createInstance( - rtl::OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), + OUString::createFromAscii( "com.sun.star.xml.crypto.SEInitializer" ) ), uno::UNO_QUERY_THROW); - xSecurityContext = xSEInitializer->createSecurityContext( rtl::OUString() ); + xSecurityContext = xSEInitializer->createSecurityContext( OUString() ); if (xSecurityContext.is()) xSecurityEnv = xSecurityContext->getSecurityEnvironment(); @@ -408,16 +408,16 @@ apr_status_t SerfSession::verifySerfCertificateChain ( // Decode the server certificate. uno::Reference< security::XCertificate > xServerCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[0]))); if ( ! xServerCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; // Get the subject from the server certificate. - ::rtl::OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); + OUString sServerCertificateSubject (xServerCertificate->getSubjectName()); sal_Int32 nIndex = 0; while (nIndex >= 0) { - const ::rtl::OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); + const OUString sToken (sServerCertificateSubject.getToken(0, ',', nIndex)); if (sToken.startsWith("CN=")) { sServerCertificateSubject = sToken.copy(3); @@ -451,7 +451,7 @@ apr_status_t SerfSession::verifySerfCertificateChain ( { uno::Reference< security::XCertificate > xCertificate( xSecurityEnv->createCertificateFromAscii( - rtl::OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); + OUString::createFromAscii(pCertificateChainBase64Encoded[nIndex]))); if ( ! xCertificate.is()) return SERF_SSL_CERT_UNKNOWN_FAILURE; aChain.push_back(xCertificate); @@ -559,7 +559,7 @@ serf_bucket_t* SerfSession::acceptSerfResponse( serf_request_t * inSerfRequest, return responseBkt; } -SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) +SerfRequestProcessor* SerfSession::createReqProc( const OUString & inPath ) { return new SerfRequestProcessor( *this, inPath, @@ -569,9 +569,9 @@ SerfRequestProcessor* SerfSession::createReqProc( const rtl::OUString & inPath ) // ------------------------------------------------------------------- // PROPFIND - allprop & named // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -600,7 +600,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPFIND - propnames // ------------------------------------------------------------------- -void SerfSession::PROPFIND( const rtl::OUString & inPath, +void SerfSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -629,7 +629,7 @@ void SerfSession::PROPFIND( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PROPPATCH // ------------------------------------------------------------------- -void SerfSession::PROPPATCH( const rtl::OUString & inPath, +void SerfSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -649,8 +649,8 @@ void SerfSession::PROPPATCH( const rtl::OUString & inPath, // ------------------------------------------------------------------- // HEAD // ------------------------------------------------------------------- -void SerfSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void SerfSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -678,7 +678,7 @@ void SerfSession::HEAD( const ::rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, +SerfSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -700,7 +700,7 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -721,8 +721,8 @@ void SerfSession::GET( const rtl::OUString & inPath, // GET // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +SerfSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -750,9 +750,9 @@ SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // GET // ------------------------------------------------------------------- -void SerfSession::GET( const rtl::OUString & inPath, +void SerfSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -776,7 +776,7 @@ void SerfSession::GET( const rtl::OUString & inPath, // ------------------------------------------------------------------- // PUT // ------------------------------------------------------------------- -void SerfSession::PUT( const rtl::OUString & inPath, +void SerfSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -801,9 +801,9 @@ void SerfSession::PUT( const rtl::OUString & inPath, // POST // ------------------------------------------------------------------- uno::Reference< io::XInputStream > -SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -835,9 +835,9 @@ SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // POST // ------------------------------------------------------------------- -void SerfSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void SerfSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -868,7 +868,7 @@ void SerfSession::POST( const rtl::OUString & inPath, // ------------------------------------------------------------------- // MKCOL // ------------------------------------------------------------------- -void SerfSession::MKCOL( const rtl::OUString & inPath, +void SerfSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -886,8 +886,8 @@ void SerfSession::MKCOL( const rtl::OUString & inPath, // ------------------------------------------------------------------- // COPY // ------------------------------------------------------------------- -void SerfSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -909,8 +909,8 @@ void SerfSession::COPY( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // MOVE // ------------------------------------------------------------------- -void SerfSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void SerfSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -932,7 +932,7 @@ void SerfSession::MOVE( const rtl::OUString & inSourceURL, // ------------------------------------------------------------------- // DESTROY // ------------------------------------------------------------------- -void SerfSession::DESTROY( const rtl::OUString & inPath, +void SerfSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -981,7 +981,7 @@ namespace // ------------------------------------------------------------------- // LOCK (set new lock) // ------------------------------------------------------------------- -void SerfSession::LOCK( const ::rtl::OUString & inPath, +void SerfSession::LOCK( const OUString & inPath, ucb::Lock & /*rLock*/, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1000,7 +1000,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // Set the lock uri ne_uri aUri; - ne_uri_parse( rtl::OUStringToOString( makeAbsoluteURL( inPath ), + ne_uri_parse( OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), &aUri ); theLock->uri = aUri; @@ -1038,10 +1038,10 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, theLock->timeout = (long)rLock.Timeout; // Set the lock owner - rtl::OUString aValue; + OUString aValue; rLock.Owner >>= aValue; theLock->owner = - ne_strdup( rtl::OUStringToOString( aValue, + ne_strdup( OUStringToOString( aValue, RTL_TEXTENCODING_UTF8 ).getStr() ); TimeValue startCall; osl_getSystemTime( &startCall ); @@ -1055,12 +1055,12 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, lastChanceToSendRefreshRequest( startCall, theLock->timeout ) ); - uno::Sequence< rtl::OUString > aTokens( 1 ); - aTokens[ 0 ] = rtl::OUString::createFromAscii( theLock->token ); + uno::Sequence< OUString > aTokens( 1 ); + aTokens[ 0 ] = OUString::createFromAscii( theLock->token ); rLock.LockTokens = aTokens; OSL_TRACE( "SerfSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1069,7 +1069,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "SerfSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1080,7 +1080,7 @@ void SerfSession::LOCK( const ::rtl::OUString & inPath, // ------------------------------------------------------------------- // LOCK (refresh existing lock) // ------------------------------------------------------------------- -sal_Int64 SerfSession::LOCK( const ::rtl::OUString & /*inPath*/, +sal_Int64 SerfSession::LOCK( const OUString & /*inPath*/, sal_Int64 nTimeout, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) @@ -1152,7 +1152,7 @@ bool SerfSession::LOCK( SerfLock * /*pLock*/, // ------------------------------------------------------------------- // UNLOCK // ------------------------------------------------------------------- -void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, +void SerfSession::UNLOCK( const OUString & /*inPath*/, const DAVRequestEnvironment & /*rEnv*/ ) throw ( DAVException ) { @@ -1177,7 +1177,7 @@ void SerfSession::UNLOCK( const ::rtl::OUString & /*inPath*/, else { OSL_TRACE( "SerfSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1232,7 +1232,7 @@ const ucbhelper::InternetProxyServer & SerfSession::getProxySettings() const { // TODO: figure out, if this case can occur return m_rProxyDecider.getProxy( m_aUri.GetScheme(), - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1246,7 +1246,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, { for ( sal_Int32 n = 0; n < rLocks.getLength(); ++n ) { - const uno::Sequence< rtl::OUString > & rTokens + const uno::Sequence< OUString > & rTokens = rLocks[ n ].LockTokens; for ( sal_Int32 m = 0; m < rTokens.getLength(); ++m ) { @@ -1261,7 +1261,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, */ // ------------------------------------------------------------------- -bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, +bool SerfSession::removeExpiredLocktoken( const OUString & /*inURL*/, const DAVRequestEnvironment & /*rEnv*/ ) { return true; @@ -1276,7 +1276,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // @@@ Alternative: use ne_lock_discover() => less overhead std::vector< DAVResource > aResources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; aPropNames.push_back( DAVProperties::LOCKDISCOVERY ); PROPFIND( rEnv.m_aRequestURI, DAVZERO, aPropNames, aResources, rEnv ); @@ -1313,7 +1313,7 @@ bool SerfSession::removeExpiredLocktoken( const rtl::OUString & /*inURL*/, // in propfind result -> not locked OSL_TRACE( "SerfSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1364,7 +1364,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc case NE_ERROR: // Generic error { - rtl::OUString aText = rtl::OUString::createFromAscii( + OUString aText = OUString::createFromAscii( ne_get_error( m_pHttpSession ) ); sal_uInt16 code = makeStatusCode( aText ); @@ -1441,7 +1441,7 @@ void SerfSession::HandleError( boost::shared_ptr<SerfRequestProcessor> rReqProc { OSL_TRACE( "SerfSession::HandleError : Unknown Serf error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1540,17 +1540,17 @@ SerfSession::getDataFromInputStream( // --------------------------------------------------------------------- sal_Bool -SerfSession::isDomainMatch( rtl::OUString certHostName ) +SerfSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; - if ( 0 == certHostName.indexOf( rtl::OUString::createFromAscii( "*" ) ) && + if ( 0 == certHostName.indexOf( OUString::createFromAscii( "*" ) ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -1561,7 +1561,7 @@ SerfSession::isDomainMatch( rtl::OUString certHostName ) /* // --------------------------------------------------------------------- -rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString SerfSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -1569,7 +1569,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -1578,7 +1578,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const ne_fill_server_uri( m_pHttpSession, &aUri ); aUri.path - = ne_strdup( rtl::OUStringToOString( + = ne_strdup( OUStringToOString( rURL, RTL_TEXTENCODING_UTF8 ).getStr() ); SerfUri aSerfUri( &aUri ); ne_uri_free( &aUri ); @@ -1589,7 +1589,7 @@ rtl::OUString SerfSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } */ diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index 73a44021cddd..585a28a2064f 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -50,7 +50,7 @@ private: SerfUri m_aUri; - rtl::OUString m_aProxyName; + OUString m_aProxyName; sal_Int32 m_nProxyPort; SerfConnection* m_pSerfConnection; @@ -69,14 +69,14 @@ private: char* getHostinfo(); bool isSSLNeeded(); - SerfRequestProcessor* createReqProc( const rtl::OUString & inPath ); + SerfRequestProcessor* createReqProc( const OUString & inPath ); protected: virtual ~SerfSession(); public: SerfSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); @@ -111,7 +111,7 @@ public: SerfConnection* getSerfConnection(); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inUri ); + virtual sal_Bool CanUse( const OUString & inUri ); virtual sal_Bool UsesProxy(); @@ -120,30 +120,30 @@ public: // allprop & named virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // propnames virtual void - PROPFIND( const ::rtl::OUString & inPath, + PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo >& ioResInfo, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PROPPATCH( const ::rtl::OUString & inPath, + PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -151,53 +151,53 @@ public: bool isHeadRequestInProgress(); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - GET( const ::rtl::OUString & inPath, + GET( const OUString & inPath, com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & ioOutputStream, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - PUT( const ::rtl::OUString & inPath, + PUT( const OUString & inPath, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, + POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const com::sun::star::uno::Reference< com::sun::star::io::XInputStream > & inInputStream, com::sun::star::uno::Reference< @@ -206,41 +206,41 @@ public: throw ( DAVException ); virtual void - MKCOL( const ::rtl::OUString & inPath, + MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); virtual void - COPY( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); virtual void - MOVE( const ::rtl::OUString & inSourceURL, - const ::rtl::OUString & inDestinationURL, + MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ); - virtual void DESTROY( const ::rtl::OUString & inPath, + virtual void DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // set new lock. - virtual void LOCK( const ::rtl::OUString & inURL, + virtual void LOCK( const OUString & inURL, com::sun::star::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // refresh existing lock. - virtual sal_Int64 LOCK( const ::rtl::OUString & inURL, + virtual sal_Int64 LOCK( const OUString & inURL, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); - virtual void UNLOCK( const ::rtl::OUString & inURL, + virtual void UNLOCK( const OUString & inURL, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); @@ -248,13 +248,13 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aUri.GetHost(); } + const OUString & getHostName() const { return m_aUri.GetHost(); } int getPort() const { return m_aUri.GetPort(); } const ::uno::Reference< ::lang::XMultiServiceFactory > getMSF() { return m_xFactory->getServiceFactory(); } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class SerfLockStore; @@ -270,7 +270,7 @@ private: const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by SerfLockStore::refreshLocks @@ -302,8 +302,8 @@ private: const char * buffer, //ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ); + const OUString & rContentType, + const OUString & rReferer ); */ // Helper: XInputStream -> Sequence< sal_Int8 > @@ -314,7 +314,7 @@ private: bool bAppendTrailingZeroByte ); /* - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; */ }; diff --git a/ucb/source/ucp/webdav/SerfUri.cxx b/ucb/source/ucp/webdav/SerfUri.cxx index 550524f965ae..a82418c0f175 100644 --- a/ucb/source/ucp/webdav/SerfUri.cxx +++ b/ucb/source/ucp/webdav/SerfUri.cxx @@ -39,7 +39,7 @@ using namespace http_dav_ucp; namespace { -inline bool matchIgnoreAsciiCase(rtl::OString const & rStr1, +inline bool matchIgnoreAsciiCase(OString const & rStr1, sal_Char const * pStr2, sal_Int32 nStr2Len) SAL_THROW(()) { @@ -74,7 +74,7 @@ SerfUri::SerfUri( const apr_uri_t * inUri ) calculateURI(); } -SerfUri::SerfUri( const rtl::OUString & inUri ) +SerfUri::SerfUri( const OUString & inUri ) throw ( DAVException ) : mAprUri() , mURI() @@ -88,9 +88,9 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) throw DAVException( DAVException::DAV_INVALID_ARG ); // #i77023# - rtl::OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); + OUString aEscapedUri( ucb_impl::urihelper::encodeURI( inUri ) ); - rtl::OString theInputUri( + OString theInputUri( aEscapedUri.getStr(), aEscapedUri.getLength(), RTL_TEXTENCODING_UTF8 ); if ( apr_uri_parse( apr_environment::AprEnv::getAprEnv()->getAprPool(), @@ -114,22 +114,22 @@ SerfUri::SerfUri( const rtl::OUString & inUri ) void SerfUri::init( const apr_uri_t * pUri ) { - mScheme = rtl::OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); + mScheme = OStringToOUString( pUri->scheme, RTL_TEXTENCODING_UTF8 ); + mUserInfo = OStringToOUString( pUri->user, RTL_TEXTENCODING_UTF8 ); + mHostName = OStringToOUString( pUri->hostname, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port; - mPath = rtl::OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); + mPath = OStringToOUString( pUri->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString::createFromAscii( "?" ); - mPath += rtl::OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "?" ); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString::createFromAscii( "#" ); - mPath += rtl::OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); + mPath += OUString::createFromAscii( "#" ); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -139,7 +139,7 @@ SerfUri::~SerfUri( ) void SerfUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.append( "://" ); if ( mUserInfo.getLength() > 0 ) { @@ -174,14 +174,14 @@ void SerfUri::calculateURI () if ( bAppendPort ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString SerfUri::GetPathBaseName () const +OUString SerfUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -193,7 +193,7 @@ void SerfUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -207,7 +207,7 @@ void SerfUri::calculateURI () return aTemp; } else - return rtl::OUString::createFromAscii ("/"); + return OUString::createFromAscii ("/"); } bool SerfUri::operator== ( const SerfUri & rOther ) const @@ -215,22 +215,22 @@ bool SerfUri::operator== ( const SerfUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString SerfUri::GetPathBaseNameUnescaped () const +OUString SerfUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void SerfUri::AppendPath (const rtl::OUString& rPath) +void SerfUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString::createFromAscii ("/"); + mPath += OUString::createFromAscii ("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) +OUString SerfUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -239,7 +239,7 @@ rtl::OUString SerfUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) +OUString SerfUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -247,10 +247,10 @@ rtl::OUString SerfUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString SerfUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString SerfUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -268,7 +268,7 @@ rtl::OUString SerfUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.append( ":" ); - aBuf.append( rtl::OUString::valueOf( sal_Int32( nPort ) ) ); + aBuf.append( OUString::valueOf( sal_Int32( nPort ) ) ); } return aBuf.makeStringAndClear(); } diff --git a/ucb/source/ucp/webdav/SerfUri.hxx b/ucb/source/ucp/webdav/SerfUri.hxx index 89298c09b2bb..15b0a6be60fb 100644 --- a/ucb/source/ucp/webdav/SerfUri.hxx +++ b/ucb/source/ucp/webdav/SerfUri.hxx @@ -39,18 +39,18 @@ class SerfUri { private: apr_uri_t mAprUri; - ::rtl::OUString mURI; - ::rtl::OUString mScheme; - ::rtl::OUString mUserInfo; - ::rtl::OUString mHostName; + OUString mURI; + OUString mScheme; + OUString mUserInfo; + OUString mHostName; sal_Int32 mPort; - ::rtl::OUString mPath; + OUString mPath; void init( const apr_uri_t * pUri ); void calculateURI (); public: - SerfUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + SerfUri( const OUString & inUri ) throw ( DAVException ); SerfUri( const apr_uri_t * inUri ) throw ( DAVException ); ~SerfUri( ); @@ -62,36 +62,36 @@ class SerfUri { return &mAprUri; } - const ::rtl::OUString & GetURI( void ) const + const OUString & GetURI( void ) const { return mURI; }; - const ::rtl::OUString & GetScheme( void ) const + const OUString & GetScheme( void ) const { return mScheme; }; - const ::rtl::OUString & GetUserInfo( void ) const + const OUString & GetUserInfo( void ) const { return mUserInfo; }; - const ::rtl::OUString & GetHost( void ) const + const OUString & GetHost( void ) const { return mHostName; }; sal_Int32 GetPort( void ) const { return mPort; }; - const ::rtl::OUString & GetPath( void ) const + const OUString & GetPath( void ) const { return mPath; }; - ::rtl::OUString GetPathBaseName ( void ) const; + OUString GetPathBaseName ( void ) const; - ::rtl::OUString GetPathBaseNameUnescaped ( void ) const; + OUString GetPathBaseNameUnescaped ( void ) const; - void SetScheme (const ::rtl::OUString& scheme) + void SetScheme (const OUString& scheme) { mScheme = scheme; calculateURI (); }; - void AppendPath (const ::rtl::OUString& rPath); + void AppendPath (const OUString& rPath); - static ::rtl::OUString escapeSegment( const ::rtl::OUString& segment ); - static ::rtl::OUString unescape( const ::rtl::OUString& string ); + static OUString escapeSegment( const OUString& segment ); + static OUString unescape( const OUString& string ); // "host:port", omit ":port" for port 80 and 443 - static rtl::OUString makeConnectionEndPointString( - const rtl::OUString & rHostName, + static OUString makeConnectionEndPointString( + const OUString & rHostName, int nPort ); - rtl::OUString makeConnectionEndPointString() const + OUString makeConnectionEndPointString() const { return makeConnectionEndPointString( GetHost(), GetPort() ); } }; diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx index 828cb42d11bc..3a953d2e55ef 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.cxx @@ -29,40 +29,40 @@ using namespace com::sun::star; struct UCBDeadPropertyValueParseContext { - rtl::OUString * pType; - rtl::OUString * pValue; + OUString * pType; + OUString * pValue; UCBDeadPropertyValueParseContext() : pType( 0 ), pValue( 0 ) {} ~UCBDeadPropertyValueParseContext() { delete pType; delete pValue; } }; // static -const rtl::OUString UCBDeadPropertyValue::aTypeString - = rtl::OUString::createFromAscii( "string" ); -const rtl::OUString UCBDeadPropertyValue::aTypeLong - = rtl::OUString::createFromAscii( "long" ); -const rtl::OUString UCBDeadPropertyValue::aTypeShort - = rtl::OUString::createFromAscii( "short" ); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean - = rtl::OUString::createFromAscii( "boolean" ); -const rtl::OUString UCBDeadPropertyValue::aTypeChar - = rtl::OUString::createFromAscii( "char" ); -const rtl::OUString UCBDeadPropertyValue::aTypeByte - = rtl::OUString::createFromAscii( "byte" ); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper - = rtl::OUString::createFromAscii( "hyper" ); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat - = rtl::OUString::createFromAscii( "float" ); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble - = rtl::OUString::createFromAscii( "double" ); +const OUString UCBDeadPropertyValue::aTypeString + = OUString::createFromAscii( "string" ); +const OUString UCBDeadPropertyValue::aTypeLong + = OUString::createFromAscii( "long" ); +const OUString UCBDeadPropertyValue::aTypeShort + = OUString::createFromAscii( "short" ); +const OUString UCBDeadPropertyValue::aTypeBoolean + = OUString::createFromAscii( "boolean" ); +const OUString UCBDeadPropertyValue::aTypeChar + = OUString::createFromAscii( "char" ); +const OUString UCBDeadPropertyValue::aTypeByte + = OUString::createFromAscii( "byte" ); +const OUString UCBDeadPropertyValue::aTypeHyper + = OUString::createFromAscii( "hyper" ); +const OUString UCBDeadPropertyValue::aTypeFloat + = OUString::createFromAscii( "float" ); +const OUString UCBDeadPropertyValue::aTypeDouble + = OUString::createFromAscii( "double" ); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre - = rtl::OUString::createFromAscii( "<ucbprop><type>" ); -const rtl::OUString UCBDeadPropertyValue::aXMLMid - = rtl::OUString::createFromAscii( "</type><value>" ); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd - = rtl::OUString::createFromAscii( "</value></ucbprop>" ); +const OUString UCBDeadPropertyValue::aXMLPre + = OUString::createFromAscii( "<ucbprop><type>" ); +const OUString UCBDeadPropertyValue::aXMLMid + = OUString::createFromAscii( "</type><value>" ); +const OUString UCBDeadPropertyValue::aXMLEnd + = OUString::createFromAscii( "</value></ucbprop>" ); #define STATE_TOP (1) @@ -116,7 +116,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Type already set!" ); pCtx->pType - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; case STATE_VALUE: @@ -124,7 +124,7 @@ extern "C" int UCBDeadPropertyValue_chardata_callback( "UCBDeadPropertyValue_endelement_callback - " "Value already set!" ); pCtx->pValue - = new rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = new OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); break; } return 0; // zero to continue, non-zero to abort parsing @@ -162,7 +162,7 @@ extern "C" int UCBDeadPropertyValue_endelement_callback( */ ////////////////////////////////////////////////////////////////////////// -static rtl::OUString encodeValue( const rtl::OUString & rValue ) +static OUString encodeValue( const OUString & rValue ) { // Note: I do not use the usual & + < + > encoding, because // I want to prevent any XML parser from trying to 'understand' @@ -177,7 +177,7 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) // PROPFIND: // - parser replaces < by > ==> error (not well formed) - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nCount = rValue.getLength(); @@ -194,14 +194,14 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) else aResult.append( c ); } - return rtl::OUString( aResult ); + return OUString( aResult ); } /* ////////////////////////////////////////////////////////////////////////// -static rtl::OUString decodeValue( const rtl::OUString & rValue ) +static OUString decodeValue( const OUString & rValue ) { - rtl::OUStringBuffer aResult; + OUStringBuffer aResult; const sal_Unicode * pValue = rValue.getStr(); sal_Int32 nPos = 0; @@ -219,7 +219,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -232,7 +232,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -248,7 +248,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -259,7 +259,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -273,7 +273,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -284,7 +284,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -298,14 +298,14 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_ENSURE( sal_False, "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -314,7 +314,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) nPos++; } - return rtl::OUString( aResult ); + return OUString( aResult ); } */ @@ -322,7 +322,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) // static bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) { - if ( ( rType != getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( ( rType != getCppuType( static_cast< const OUString * >( 0 ) ) ) && ( rType != getCppuType( static_cast< const sal_Int32 * >( 0 ) ) ) && @@ -348,7 +348,7 @@ bool UCBDeadPropertyValue::supportsType( const uno::Type & rType ) ////////////////////////////////////////////////////////////////////////// // static -bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, +bool UCBDeadPropertyValue::createFromXML( const OString & /*rInData*/, uno::Any & /*rOutData*/ ) { bool success = false; @@ -375,7 +375,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, if ( aCtx.pType && aCtx.pValue ) { // Decode aCtx.pValue! It may contain XML reserved chars. - rtl::OUString aStringValue = decodeValue( *aCtx.pValue ); + OUString aStringValue = decodeValue( *aCtx.pValue ); if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeString ) ) { rOutData <<= aStringValue; @@ -391,7 +391,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString::createFromAscii( "true" ) ) ) + OUString::createFromAscii( "true" ) ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -435,17 +435,17 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & /*rInData*/, ////////////////////////////////////////////////////////////////////////// // static bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // <ucbprop><type>the_type</type><value>the_value</value></ucbprop> // Check property type. Extract type and value as string. const uno::Type& rType = rInData.getValueType(); - rtl::OUString aStringValue; - rtl::OUString aStringType; + OUString aStringValue; + OUString aStringType; - if ( rType == getCppuType( static_cast< const rtl::OUString * >( 0 ) ) ) + if ( rType == getCppuType( static_cast< const OUString * >( 0 ) ) ) { // string rInData >>= aStringValue; @@ -456,7 +456,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // long sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeLong; } else if ( rType == getCppuType( static_cast< const sal_Int16 * >( 0 ) ) ) @@ -464,7 +464,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // short sal_Int32 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeShort; } else if ( rType == getCppuBooleanType() ) @@ -472,7 +472,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // boolean sal_Bool bValue = false; rInData >>= bValue; - aStringValue = rtl::OUString::valueOf( bValue ); + aStringValue = OUString::valueOf( bValue ); aStringType = aTypeBoolean; } else if ( rType == getCppuCharType() ) @@ -480,7 +480,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // char sal_Unicode cValue = 0; rInData >>= cValue; - aStringValue = rtl::OUString::valueOf( cValue ); + aStringValue = OUString::valueOf( cValue ); aStringType = aTypeChar; } else if ( rType == getCppuType( static_cast< const sal_Int8 * >( 0 ) ) ) @@ -488,7 +488,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // byte sal_Int8 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( sal_Unicode( nValue ) ); + aStringValue = OUString::valueOf( sal_Unicode( nValue ) ); aStringType = aTypeByte; } else if ( rType == getCppuType( static_cast< const sal_Int64 * >( 0 ) ) ) @@ -496,7 +496,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // hyper sal_Int64 nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeHyper; } else if ( rType == getCppuType( static_cast< const float * >( 0 ) ) ) @@ -504,7 +504,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // float float nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeFloat; } else if ( rType == getCppuType( static_cast< const double * >( 0 ) ) ) @@ -512,7 +512,7 @@ bool UCBDeadPropertyValue::toXML( const uno::Any & rInData, // double double nValue = 0; rInData >>= nValue; - aStringValue = rtl::OUString::valueOf( nValue ); + aStringValue = OUString::valueOf( nValue ); aStringType = aTypeDouble; } else diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index 7ed138fa7c86..be752b28cb69 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -31,27 +31,27 @@ namespace http_dav_ucp class UCBDeadPropertyValue { private: - static const rtl::OUString aTypeString; - static const rtl::OUString aTypeLong; - static const rtl::OUString aTypeShort; - static const rtl::OUString aTypeBoolean; - static const rtl::OUString aTypeChar; - static const rtl::OUString aTypeByte; - static const rtl::OUString aTypeHyper; - static const rtl::OUString aTypeFloat; - static const rtl::OUString aTypeDouble; - - static const rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + static const OUString aTypeString; + static const OUString aTypeLong; + static const OUString aTypeShort; + static const OUString aTypeBoolean; + static const OUString aTypeChar; + static const OUString aTypeByte; + static const OUString aTypeHyper; + static const OUString aTypeFloat; + static const OUString aTypeDouble; + + static const OUString aXMLPre; + static const OUString aXMLMid; + static const OUString aXMLEnd; public: static bool supportsType( const com::sun::star::uno::Type & rType ); - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Any & rOutData ); static bool toXML( const com::sun::star::uno::Any & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index ed7d56cfe6f3..d2fad399f4ad 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -188,7 +188,7 @@ uno::Any SAL_CALL Content::queryInterface( const uno::Type & rType ) m_xSMgr, uno::UNO_QUERY_THROW ); uno::Reference< uno::XComponentContext > xCtx; xCtx.set( xProps->getPropertyValue( - rtl::OUString( "DefaultContext" ) ), + OUString( "DefaultContext" ) ), uno::UNO_QUERY_THROW ); uno::Reference< task::XInteractionHandler > xIH( @@ -323,21 +323,21 @@ uno::Sequence< uno::Type > SAL_CALL Content::getTypes() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getImplementationName() +OUString SAL_CALL Content::getImplementationName() throw( uno::RuntimeException ) { - return rtl::OUString::createFromAscii( + return OUString::createFromAscii( "com.sun.star.comp.ucb.WebDAVContent" ); } //========================================================================= // virtual -uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() +uno::Sequence< OUString > SAL_CALL Content::getSupportedServiceNames() throw( uno::RuntimeException ) { - uno::Sequence< rtl::OUString > aSNS( 1 ); + uno::Sequence< OUString > aSNS( 1 ); aSNS.getArray()[ 0 ] - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString::createFromAscii( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -348,7 +348,7 @@ uno::Sequence< rtl::OUString > SAL_CALL Content::getSupportedServiceNames() //========================================================================= // virtual -rtl::OUString SAL_CALL Content::getContentType() +OUString SAL_CALL Content::getContentType() throw( uno::RuntimeException ) { sal_Bool bFolder = sal_False; @@ -366,9 +366,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + return OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + return OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -387,7 +387,7 @@ uno::Any SAL_CALL Content::execute( uno::RuntimeException ) { OSL_TRACE( ">>>>> Content::execute: start: command: %s, env: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr(), Environment.is() ? "present" : "missing" ); @@ -404,7 +404,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -425,7 +425,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -437,7 +437,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -477,7 +477,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -498,7 +498,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -560,7 +560,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -581,7 +581,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -621,7 +621,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), @@ -646,7 +646,7 @@ uno::Any SAL_CALL Content::execute( } OSL_TRACE( "<<<<< Content::execute: end: command: %s", - rtl::OUStringToOString( aCommand.Name, + OUStringToOString( aCommand.Name, RTL_TEXTENCODING_UTF8 ).getStr() ); return aRet; @@ -683,7 +683,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) //========================================================================= // virtual -void SAL_CALL Content::addProperty( const rtl::OUString& Name, +void SAL_CALL Content::addProperty( const OUString& Name, sal_Int16 Attributes, const uno::Any& DefaultValue ) throw( beans::PropertyExistException, @@ -810,7 +810,7 @@ void SAL_CALL Content::addProperty( const rtl::OUString& Name, //========================================================================= // virtual -void SAL_CALL Content::removeProperty( const rtl::OUString& Name ) +void SAL_CALL Content::removeProperty( const OUString& Name ) throw( beans::UnknownPropertyException, beans::NotRemoveableException, uno::RuntimeException ) @@ -940,14 +940,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); + = OUString::createFromAscii( WEBDAV_CONTENT_TYPE ); aSeq.getArray()[ 0 ].Attributes = ucb::ContentInfoAttribute::INSERT_WITH_INPUTSTREAM | ucb::ContentInfoAttribute::KIND_DOCUMENT; beans::Property aProp; m_pProvider->getProperty( - rtl::OUString( "Title" ), aProp ); + OUString( "Title" ), aProp ); uno::Sequence< beans::Property > aDocProps( 1 ); aDocProps.getArray()[ 0 ] = aProp; @@ -955,7 +955,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); + = OUString::createFromAscii( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -981,23 +981,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) ( Info.Type != WEBDAV_CONTENT_TYPE ) ) return uno::Reference< ucb::XContent >(); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); OSL_ENSURE( !aURL.isEmpty(), "WebdavContent::createNewContent - empty identifier!" ); if ( ( aURL.lastIndexOf( '/' ) + 1 ) != aURL.getLength() ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString::createFromAscii( "New_Collection" ); + aURL += OUString::createFromAscii( "New_Collection" ); isCollection = sal_True; } else { - aURL += rtl::OUString::createFromAscii( "New_Content" ); + aURL += OUString::createFromAscii( "New_Content" ); isCollection = sal_False; } @@ -1021,7 +1021,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // <scheme>:// -> "" // <scheme>://foo -> "" @@ -1030,7 +1030,7 @@ rtl::OUString Content::getParentURL() // <scheme>://foo/bar/ -> <scheme>://foo/ // <scheme>://foo/bar/abc -> <scheme>://foo/bar/ - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nPos = aURL.lastIndexOf( '/' ); if ( nPos == ( aURL.getLength() - 1 ) ) @@ -1044,9 +1044,9 @@ rtl::OUString Content::getParentURL() nPos1 = aURL.lastIndexOf( '/', nPos1 ); if ( nPos1 == -1 ) - return rtl::OUString(); + return OUString(); - return rtl::OUString( aURL.copy( 0, nPos + 1 ) ); + return OUString( aURL.copy( 0, nPos + 1 ) ); } //========================================================================= @@ -1061,7 +1061,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( const uno::Sequence< beans::Property >& rProperties, const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const rtl::OUString& rContentId ) + const OUString& rContentId ) { // Note: Empty sequence means "get values of all supported properties". @@ -1148,7 +1148,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xProps; std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< lang::XMultiServiceFactory > xSMgr; uno::Reference< ucb::XContentIdentifier > xIdentifier; @@ -1168,7 +1168,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( { xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { // All properties are already in cache! No server access needed. @@ -1200,7 +1200,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xCachedProps.reset( new ContentProperties( *m_xCachedProps.get() ) ); - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( xCachedProps->containsAllNames( rProperties, aMissingProps ) ) { @@ -1216,7 +1216,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( !bHasAll ) { // Only DAV resources support PROPFIND - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( rProperties.getLength() ); @@ -1227,11 +1227,11 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString & rName = rProperties[ n ].Name; + const OUString & rName = rProperties[ n ].Name; - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = m_aFailedPropNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = m_aFailedPropNames.end(); while ( it != end ) @@ -1297,7 +1297,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( if ( bNetworkAccessAllowed ) { // All properties obtained already? - std::vector< rtl::OUString > aMissingProps; + std::vector< OUString > aMissingProps; if ( !( xProps.get() && xProps->containsAllNames( rProperties, aMissingProps ) ) @@ -1306,7 +1306,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Possibly the missing props can be obtained using a HEAD // request. - std::vector< rtl::OUString > aHeaderNames; + std::vector< OUString > aHeaderNames; ContentProperties::UCBNamesToHTTPNames( rProperties, aHeaderNames, @@ -1366,7 +1366,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1376,16 +1376,16 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( xProps.reset( new ContentProperties( aUnescapedTitle, false ) ); else xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); xProps->addProperty( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), uno::makeAny( false ), true ); xProps->addProperty( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), uno::makeAny( true ), true ); } @@ -1402,12 +1402,12 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( sal_Int32 nCount = rProperties.getLength(); for ( sal_Int32 n = 0; n < nCount; ++n ) { - const rtl::OUString rName = rProperties[ n ].Name; + const OUString rName = rProperties[ n ].Name; if ( rName == "BaseURI" ) { // Add BaseURI property, if requested. xProps->addProperty( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), uno::makeAny( getBaseURI( xResAccess ) ), true ); } @@ -1416,10 +1416,10 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( // Add CreatableContentsInfo property, if requested. sal_Bool bFolder = sal_False; xProps->getValue( - rtl::OUString( "IsFolder" ) ) + OUString( "IsFolder" ) ) >>= bFolder; xProps->addProperty( - rtl::OUString( "CreatableContentsInfo" ), + OUString( "CreatableContentsInfo" ), uno::makeAny( bFolder ? queryCreatableContentsInfo() : uno::Sequence< ucb::ContentInfo >() ), @@ -1490,8 +1490,8 @@ uno::Sequence< uno::Any > Content::setPropertyValues( sal_Bool bTriedToGetAdditonalPropSet = sal_False; sal_Bool bExchange = sal_False; - rtl::OUString aNewTitle; - rtl::OUString aOldTitle; + OUString aNewTitle; + OUString aOldTitle; sal_Int32 nTitlePos = -1; uno::Reference< beans::XPropertySetInfo > xInfo; @@ -1501,7 +1501,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( for ( sal_Int32 n = 0; n < nCount; ++n ) { const beans::PropertyValue& rValue = pValues[ n ]; - const rtl::OUString & rName = rValue.Name; + const OUString & rName = rValue.Name; beans::Property aTmpProp; xProvider->getProperty( rName, aTmpProp ); @@ -1510,7 +1510,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1524,7 +1524,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1532,7 +1532,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1540,13 +1540,13 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "Title" ) { - rtl::OUString aNewValue; + OUString aNewValue; if ( rValue.Value >>= aNewValue ) { // No empty titles! @@ -1574,7 +1574,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1583,7 +1583,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); @@ -1592,7 +1592,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1613,7 +1613,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // PROPPATCH::set would add the property automatically, which // is not allowed for "setPropertyValues" command! aRet[ n ] <<= beans::UnknownPropertyException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; @@ -1623,7 +1623,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1631,7 +1631,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1639,7 +1639,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1648,7 +1648,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1656,7 +1656,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1722,7 +1722,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } @@ -1785,9 +1785,9 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Assemble new content identifier... - rtl::OUString aNewURL = getParentURL(); + OUString aNewURL = getParentURL(); if ( aNewURL.lastIndexOf( '/' ) != ( aNewURL.getLength() - 1 ) ) - aNewURL += rtl::OUString::createFromAscii( "/" ); + aNewURL += OUString::createFromAscii( "/" ); aNewURL += SerfUri::escapeSegment( aNewTitle ); @@ -1826,18 +1826,18 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= uno::Exception( - rtl::OUString::createFromAscii( "Exchange failed!" ), + OUString::createFromAscii( "Exchange failed!" ), static_cast< cppu::OWeakObject * >( this ) ); } } catch ( DAVException const & e ) { // Do not set new title! - aNewTitle = rtl::OUString(); + aNewTitle = OUString(); // Set error . aRet[ nTitlePos ] <<= MapDAVException( e, sal_True ); @@ -1848,7 +1848,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString::createFromAscii( "Title" ); + aEvent.PropertyName = OUString::createFromAscii( "Title" ); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1897,7 +1897,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; aMsg.appendAscii( "Non-folder resource cannot be " "opened as folder! Wrong Open Mode!" ); @@ -1923,14 +1923,14 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); // Unreachable } - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< io::XOutputStream > xOut = uno::Reference< io::XOutputStream >( rArg.Sink, uno::UNO_QUERY ); if ( xOut.is() ) @@ -1948,7 +1948,7 @@ uno::Any Content::open( } DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1993,7 +1993,7 @@ uno::Any Content::open( // fill inputsream sync; return if all data present DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; uno::Reference< io::XInputStream > xIn = xResAccess->GET( aHeaders, aResource, xEnv ); @@ -2030,7 +2030,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2117,7 +2117,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2136,13 +2136,13 @@ void Content::queryChildren( ContentRefList& rChildren ) ::ucbhelper::ContentRefList aAllContents; m_xProvider->queryExistingContents( aAllContents ); - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); sal_Int32 nURLPos = aURL.lastIndexOf( '/' ); if ( nURLPos != ( aURL.getLength() - 1 ) ) { // No trailing slash found. Append. - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); } sal_Int32 nLen = aURL.getLength(); @@ -2153,7 +2153,7 @@ void Content::queryChildren( ContentRefList& rChildren ) while ( it != end ) { ::ucbhelper::ContentImplHelperRef xChild = (*it); - rtl::OUString aChildURL + OUString aChildURL = xChild->getIdentifier()->getContentIdentifier(); // Is aURL a prefix of aChildURL? @@ -2185,7 +2185,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; std::auto_ptr< DAVResourceAccess > xResAccess; { @@ -2203,11 +2203,11 @@ void Content::insert( { OSL_ENSURE( sal_False, "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString::createFromAscii( "Title" ); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString::createFromAscii( "Title" ); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2236,7 +2236,7 @@ void Content::insert( { #undef ERROR ucb::UnsupportedNameClashException aEx( - rtl::OUString::createFromAscii( "Unable to write without overwrite!" ), + OUString::createFromAscii( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2273,7 +2273,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2283,7 +2283,7 @@ void Content::insert( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); @@ -2301,9 +2301,9 @@ void Content::insert( if ( bTransient ) { // Assemble new content identifier... - rtl::OUString aURL = getParentURL(); + OUString aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += aEscapedTitle; @@ -2353,7 +2353,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { SerfUri aURI( aURL ); @@ -2366,7 +2366,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2400,7 +2400,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2443,7 +2443,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { SerfUri sourceURI( rArgs.SourceURL ); @@ -2452,21 +2452,21 @@ void Content::transfer( // Check source's and target's URL scheme // - const rtl::OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); + const OUString aScheme = sourceURI.GetScheme().toAsciiLowerCase(); if ( aScheme == WEBDAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString::createFromAscii( HTTPS_URL_SCHEME ) ); + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); } else { @@ -2475,7 +2475,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); @@ -2485,10 +2485,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString::createFromAscii( HTTP_URL_SCHEME ) ); + OUString::createFromAscii( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2501,14 +2501,14 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString::createFromAscii( + OUString::createFromAscii( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2516,15 +2516,15 @@ void Content::transfer( if ( aTitle == "/" ) { // kso: ??? - aTitle = rtl::OUString(); + aTitle = OUString(); } targetURI.AppendPath( aTitle ); - rtl::OUString aTargetURL = xIdentifier->getContentIdentifier(); + OUString aTargetURL = xIdentifier->getContentIdentifier(); if ( ( aTargetURL.lastIndexOf( '/' ) + 1 ) != aTargetURL.getLength() ) - aTargetURL += rtl::OUString::createFromAscii( "/" ); + aTargetURL += OUString::createFromAscii( "/" ); aTargetURL += aTitle; @@ -2623,7 +2623,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2642,7 +2642,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2666,7 +2666,7 @@ void Content::destroy( sal_Bool bDeletePhysical ) throw( uno::Exception ) { // @@@ take care about bDeletePhysical -> trashcan support - rtl::OUString aURL = m_xIdentifier->getContentIdentifier(); + OUString aURL = m_xIdentifier->getContentIdentifier(); uno::Reference< ucb::XContent > xThis = this; @@ -2730,7 +2730,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString::createFromAscii( "http://ucb.openoffice.org" ); + <<= OUString::createFromAscii( "http://ucb.openoffice.org" ); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2739,7 +2739,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2805,7 +2805,7 @@ sal_Bool Content::exchangeIdentity( // Fail, if a content with given id already exists. // if ( !hasData( xNewId ) ) { - rtl::OUString aOldURL = m_xIdentifier->getContentIdentifier(); + OUString aOldURL = m_xIdentifier->getContentIdentifier(); aGuard.clear(); if ( exchange( xNewId ) ) @@ -2825,9 +2825,9 @@ sal_Bool Content::exchangeIdentity( // Create new content identifier for the child... uno::Reference< ucb::XContentIdentifier > xOldChildId = xChild->getIdentifier(); - rtl::OUString aOldChildURL + OUString aOldChildURL = xOldChildId->getContentIdentifier(); - rtl::OUString aNewChildURL + OUString aNewChildURL = aOldChildURL.replaceAt( 0, aOldURL.getLength(), @@ -2864,7 +2864,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString::createFromAscii( "IsFolder" ); + aProperties[ 0 ].Name = OUString::createFromAscii( "IsFolder" ); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2887,12 +2887,12 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) // Map DAVException... uno::Any aException; - rtl::OUString aURL; + OUString aURL; if ( m_bTransient ) { aURL = getParentURL(); if ( aURL.lastIndexOf( '/' ) != ( aURL.getLength() - 1 ) ) - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); aURL += m_aEscapedTitle; } @@ -2907,13 +2907,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Not found!" ), + OUString::createFromAscii( "Not found!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2948,7 +2948,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_LOOKUP: aException <<= ucb::InteractiveNetworkResolveNameException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2965,7 +2965,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_HTTP_CONNECT: aException <<= ucb::InteractiveNetworkConnectException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, e.getData() ); @@ -2986,7 +2986,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_INVALID_ARG: aException <<= lang::IllegalArgumentException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), -1 ); break; @@ -2995,7 +2995,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) #if 1 aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3004,13 +3004,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString::createFromAscii("Uri"), -1, + OUString::createFromAscii("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString::createFromAscii( "Locked!" ), + OUString::createFromAscii( "Locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_LOCKING_VIOLATION, @@ -3022,7 +3022,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString::createFromAscii( "Locked (self)!" ), + OUString::createFromAscii( "Locked (self)!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -3032,7 +3032,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString::createFromAscii( "Not locked!" ), + OUString::createFromAscii( "Not locked!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3041,7 +3041,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString::createFromAscii( "Lock expired!" ), + OUString::createFromAscii( "Lock expired!" ), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3050,7 +3050,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) default: aException <<= ucb::InteractiveNetworkGeneralException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR ); break; @@ -3085,7 +3085,7 @@ void Content::cancelCommandExecution( } //========================================================================= -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3093,8 +3093,8 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) // First, try to obtain value of response header "Content-Location". if ( m_xCachedProps.get() ) { - rtl::OUString aLocation; - m_xCachedProps->getValue( rtl::OUString( + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( aLocation.getLength() ) { @@ -3112,7 +3112,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3128,8 +3128,8 @@ const Content::ResourceType & Content::getResourceType( ResourceType eResourceType; eResourceType = m_eResourceType; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); try @@ -3138,16 +3138,16 @@ const Content::ResourceType & Content::getResourceType( // used when loading documents... along with identifying whether // this is a DAV resource. std::vector< DAVResource > resources; - std::vector< rtl::OUString > aPropNames; + std::vector< OUString > aPropNames; uno::Sequence< beans::Property > aProperties( 5 ); aProperties[ 0 ].Name - = rtl::OUString::createFromAscii( "IsFolder" ); + = OUString::createFromAscii( "IsFolder" ); aProperties[ 1 ].Name - = rtl::OUString::createFromAscii( "IsDocument" ); + = OUString::createFromAscii( "IsDocument" ); aProperties[ 2 ].Name - = rtl::OUString::createFromAscii( "IsReadOnly" ); + = OUString::createFromAscii( "IsReadOnly" ); aProperties[ 3 ].Name - = rtl::OUString::createFromAscii( "MediaType" ); + = OUString::createFromAscii( "MediaType" ); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 1e649f3071c1..6ffbd222b072 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -77,13 +77,13 @@ class Content : public ::ucbhelper::ContentImplHelper, std::auto_ptr< DAVResourceAccess > m_xResAccess; std::auto_ptr< CachableContentProperties > m_xCachedProps; // locally cached props - rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; ResourceType m_eResourceType; ContentProvider* m_pProvider; // No need for a ref, base class holds object bool m_bTransient; bool m_bCollection; bool m_bDidGetOrHead; - std::vector< rtl::OUString > m_aFailedPropNames; + std::vector< OUString > m_aFailedPropNames; private: virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > @@ -92,7 +92,7 @@ private: virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > getCommands( const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv ); - virtual ::rtl::OUString getParentURL(); + virtual OUString getParentURL(); sal_Bool isFolder( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) @@ -120,7 +120,7 @@ private: exchangeIdentity( const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContentIdentifier >& xNewId ); - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); const ResourceType & @@ -215,16 +215,16 @@ public: XTYPEPROVIDER_DECL() // XServiceInfo - virtual ::rtl::OUString SAL_CALL + virtual OUString SAL_CALL getImplementationName() throw( ::com::sun::star::uno::RuntimeException ); - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL + virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( ::com::sun::star::uno::RuntimeException ); // XContent - virtual rtl::OUString SAL_CALL + virtual OUString SAL_CALL getContentType() throw( com::sun::star::uno::RuntimeException ); @@ -243,7 +243,7 @@ public: // XPropertyContainer virtual void SAL_CALL - addProperty( const rtl::OUString& Name, + addProperty( const OUString& Name, sal_Int16 Attributes, const com::sun::star::uno::Any& DefaultValue ) throw( com::sun::star::beans::PropertyExistException, @@ -252,7 +252,7 @@ public: com::sun::star::uno::RuntimeException ); virtual void SAL_CALL - removeProperty( const rtl::OUString& Name ) + removeProperty( const OUString& Name ) throw( com::sun::star::beans::UnknownPropertyException, com::sun::star::beans::NotRemoveableException, com::sun::star::uno::RuntimeException ); @@ -286,7 +286,7 @@ public: const ContentProperties& rData, const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, - const ::rtl::OUString& rContentId ); + const OUString& rContentId ); }; } diff --git a/ucb/source/ucp/webdav/webdavcontentcaps.cxx b/ucb/source/ucp/webdav/webdavcontentcaps.cxx index 8a0e57ae90a8..f075ba0d6665 100644 --- a/ucb/source/ucp/webdav/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav/webdavcontentcaps.cxx @@ -46,7 +46,7 @@ using namespace http_dav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -62,15 +62,15 @@ bool ContentProvider::getProperty( // Mandatory UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "ContentType" ), + OUString( "ContentType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "IsDocument" ), + OUString( "IsDocument" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -78,7 +78,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -86,16 +86,16 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "Title" ), + OUString( "Title" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); // Optional UCB properties. m_pProps->insert( beans::Property( - rtl::OUString( "DateCreated" ), + OUString( "DateCreated" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -103,7 +103,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "DateModified" ), + OUString( "DateModified" ), -1, getCppuType( static_cast< const util::DateTime * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -111,15 +111,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "MediaType" ), + OUString( "MediaType" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( "Size" ), + OUString( "Size" ), -1, getCppuType( static_cast< const sal_Int64 * >( 0 ) ), beans::PropertyAttribute::BOUND @@ -127,15 +127,15 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "BaseURI" ), + OUString( "BaseURI" ), -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); m_pProps->insert( beans::Property( - rtl::OUString( + OUString( "CreatableContentsInfo" ), -1, getCppuType( static_cast< @@ -149,7 +149,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::CREATIONDATE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -157,14 +157,14 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::DISPLAYNAME, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); m_pProps->insert( beans::Property( DAVProperties::GETCONTENTLANGUAGE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -172,7 +172,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTLENGTH, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -180,7 +180,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETCONTENTTYPE , -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -188,7 +188,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETETAG, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -196,7 +196,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::GETLASTMODIFIED, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -213,7 +213,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::RESOURCETYPE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND | beans::PropertyAttribute::READONLY ) ); @@ -231,7 +231,7 @@ bool ContentProvider::getProperty( beans::Property( DAVProperties::EXECUTABLE, -1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ) ); } } @@ -256,7 +256,7 @@ bool ContentProvider::getProperty( rProp = beans::Property( rPropName, - 1, - getCppuType( static_cast< const rtl::OUString * >( 0 ) ), + getCppuType( static_cast< const OUString * >( 0 ) ), beans::PropertyAttribute::BOUND ); } @@ -289,7 +289,7 @@ uno::Sequence< beans::Property > Content::getProperties( xProvider.set( m_pProvider ); } - typedef std::set< rtl::OUString > StringSet; + typedef std::set< OUString > StringSet; StringSet aPropSet; // No server access for just created (not yet committed) objects. @@ -330,8 +330,8 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Bool bHasCreatableInfos = sal_False; { - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); - std::set< rtl::OUString >::const_iterator end = aPropSet.end(); + std::set< OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator end = aPropSet.end(); while ( it != end ) { if ( !bHasCreationDate && @@ -401,21 +401,21 @@ uno::Sequence< beans::Property > Content::getProperties( // Add mandatory properties. if ( !bHasContentType ) aPropSet.insert( - rtl::OUString( "ContentType" ) ); + OUString( "ContentType" ) ); if ( !bHasIsDocument ) aPropSet.insert( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); if ( !bHasIsFolder ) aPropSet.insert( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); if ( !bHasTitle ) { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "Title" ) ); + OUString( "Title" ) ); } // Add optional properties. @@ -424,34 +424,34 @@ uno::Sequence< beans::Property > Content::getProperties( { // Always present since it can be calculated from content's URI. aPropSet.insert( - rtl::OUString( "BaseURI" ) ); + OUString( "BaseURI" ) ); } if ( !bHasDateCreated && bHasCreationDate ) aPropSet.insert( - rtl::OUString( "DateCreated" ) ); + OUString( "DateCreated" ) ); if ( !bHasDateModified && bHasGetLastModified ) aPropSet.insert( - rtl::OUString( "DateModified" ) ); + OUString( "DateModified" ) ); if ( !bHasMediaType && bHasGetContentType ) aPropSet.insert( - rtl::OUString( "MediaType" ) ); + OUString( "MediaType" ) ); if ( !bHasSize && bHasGetContentLength ) aPropSet.insert( - rtl::OUString( "Size" ) ); + OUString( "Size" ) ); if ( !bHasCreatableInfos ) aPropSet.insert( - rtl::OUString( + OUString( "CreatableContentsInfo" ) ); // Add cached properties, if present and still missing. if ( xCachedProps.get() ) { - const std::set< rtl::OUString >::const_iterator set_end + const std::set< OUString >::const_iterator set_end = aPropSet.end(); const std::auto_ptr< PropertyValueMap > & xProps @@ -473,7 +473,7 @@ uno::Sequence< beans::Property > Content::getProperties( sal_Int32 nCount = aPropSet.size(); uno::Sequence< beans::Property > aProperties( nCount ); - std::set< rtl::OUString >::const_iterator it = aPropSet.begin(); + std::set< OUString >::const_iterator it = aPropSet.begin(); beans::Property aProp; for ( sal_Int32 n = 0; n < nCount; ++n, ++it ) @@ -500,23 +500,23 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 0 ] = ucb::CommandInfo( - rtl::OUString( "getCommandInfo" ), + OUString( "getCommandInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 1 ] = ucb::CommandInfo( - rtl::OUString( "getPropertySetInfo" ), + OUString( "getPropertySetInfo" ), -1, getCppuVoidType() ); aCmdInfo[ 2 ] = ucb::CommandInfo( - rtl::OUString( "getPropertyValues" ), + OUString( "getPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::Property > * >( 0 ) ) ); aCmdInfo[ 3 ] = ucb::CommandInfo( - rtl::OUString( "setPropertyValues" ), + OUString( "setPropertyValues" ), -1, getCppuType( static_cast< uno::Sequence< beans::PropertyValue > * >( 0 ) ) ); @@ -527,18 +527,18 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 4 ] = ucb::CommandInfo( - rtl::OUString( "delete" ), + OUString( "delete" ), -1, getCppuBooleanType() ); aCmdInfo[ 5 ] = ucb::CommandInfo( - rtl::OUString( "insert" ), + OUString( "insert" ), -1, getCppuType( static_cast< ucb::InsertCommandArgument * >( 0 ) ) ); aCmdInfo[ 6 ] = ucb::CommandInfo( - rtl::OUString( "open" ), + OUString( "open" ), -1, getCppuType( static_cast< ucb::OpenCommandArgument2 * >( 0 ) ) ); @@ -549,7 +549,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -582,13 +582,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "transfer" ), + OUString( "transfer" ), -1, getCppuType( static_cast< ucb::TransferInfo * >( 0 ) ) ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( + OUString( "createNewContent" ), -1, getCppuType( static_cast< ucb::ContentInfo * >( 0 ) ) ); @@ -603,13 +603,13 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( { aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "lock" ), + OUString( "lock" ), -1, getCppuVoidType() ); nPos++; aCmdInfo[ nPos ] = ucb::CommandInfo( - rtl::OUString( "unlock" ), + OUString( "unlock" ), -1, getCppuVoidType() ); nPos++; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.cxx b/ucb/source/ucp/webdav/webdavdatasupplier.cxx index 1d1523ff84de..a50bb7e312bf 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.cxx @@ -43,7 +43,7 @@ namespace http_dav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -126,13 +126,13 @@ DataSupplier::~DataSupplier() //========================================================================= // virtual -rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) +OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) { osl::Guard< osl::Mutex > aGuard( m_pImpl->m_aMutex ); if ( nIndex < m_pImpl->m_aResults.size() ) { - rtl::OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; + OUString aId = m_pImpl->m_aResults[ nIndex ]->aId; if ( aId.getLength() ) { // Already cached. @@ -142,23 +142,23 @@ rtl::OUString DataSupplier::queryContentIdentifierString( sal_uInt32 nIndex ) if ( getResult( nIndex ) ) { - rtl::OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); + OUString aId = m_pImpl->m_xContent->getResourceAccess().getURL(); const ContentProperties& props = *( m_pImpl->m_aResults[ nIndex ]->pData ); if ( ( aId.lastIndexOf( '/' ) + 1 ) != aId.getLength() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString::createFromAscii( "/" ); + aId += OUString::createFromAscii( "/" ); m_pImpl->m_aResults[ nIndex ]->aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -179,7 +179,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( aId.getLength() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -342,7 +342,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -350,9 +350,9 @@ sal_Bool DataSupplier::getData() // needed to get a valid ContentProperties::pIsFolder value, which // is needed for OpenMode handling. - std::vector< rtl::OUString >::const_iterator it + std::vector< OUString >::const_iterator it = propertyNames.begin(); - std::vector< rtl::OUString >::const_iterator end + std::vector< OUString >::const_iterator end = propertyNames.end(); while ( it != end ) @@ -389,7 +389,7 @@ sal_Bool DataSupplier::getData() { SerfUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -409,7 +409,7 @@ sal_Bool DataSupplier::getData() try { SerfUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -443,7 +443,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsFolder" ) ); rValue >>= bFolder; @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( + OUString( "IsDocument" ) ); rValue >>= bDocument; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 32db6aa01f1a..c645c47cae00 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -48,7 +48,7 @@ public: virtual ~DataSupplier(); - virtual rtl::OUString queryContentIdentifierString( sal_uInt32 nIndex ); + virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ); virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ); diff --git a/ucb/source/ucp/webdav/webdavprovider.cxx b/ucb/source/ucp/webdav/webdavprovider.cxx index 21befa3fb5ea..0d4d0916bd9d 100644 --- a/ucb/source/ucp/webdav/webdavprovider.cxx +++ b/ucb/source/ucp/webdav/webdavprovider.cxx @@ -78,9 +78,9 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1( ContentProvider, - rtl::OUString::createFromAscii( + OUString::createFromAscii( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString::createFromAscii( + OUString::createFromAscii( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= @@ -107,7 +107,7 @@ ContentProvider::queryContent( { // Check URL scheme... - const rtl::OUString aScheme + const OUString aScheme = Identifier->getContentProviderScheme().toAsciiLowerCase(); if ( aScheme != HTTP_URL_SCHEME && aScheme != HTTPS_URL_SCHEME && aScheme != WEBDAV_URL_SCHEME && aScheme != DAV_URL_SCHEME && @@ -115,7 +115,7 @@ ContentProvider::queryContent( throw ucb::IllegalIdentifierException(); // Normalize URL and create new Id, if nessacary. - rtl::OUString aURL = Identifier->getContentIdentifier(); + OUString aURL = Identifier->getContentIdentifier(); // At least: <scheme> + "://" if ( aURL.getLength() < ( aScheme.getLength() + 3 ) ) @@ -133,7 +133,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -141,7 +141,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTP_URL_SCHEME ) ); bNewId = true; } @@ -149,7 +149,7 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString::createFromAscii( + OUString::createFromAscii( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -165,7 +165,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString::createFromAscii( "/" ); + aURL += OUString::createFromAscii( "/" ); bNewId = true; } } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index a09e420c91b2..ee5169ca0de4 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -104,7 +104,7 @@ public: rtl::Reference< DAVSessionFactory > getDAVSessionFactory() { return m_xDAVSessionFactory; } - bool getProperty( const ::rtl::OUString & rPropName, + bool getProperty( const OUString & rPropName, ::com::sun::star::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index 32489d3a6ee4..f61efc81e220 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -48,10 +48,10 @@ namespace WebDAVNamespace_last }; - WebDAVNamespace StrToWebDAVNamespace(const rtl::OUString& rStr) + WebDAVNamespace StrToWebDAVNamespace(const OUString& rStr) { - static ::rtl::OUString aStrDAV(::rtl::OUString::createFromAscii("DAV:")); - static ::rtl::OUString aStrUcbOpenofficeOrgDAVProps(::rtl::OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); + static OUString aStrDAV(OUString::createFromAscii("DAV:")); + static OUString aStrUcbOpenofficeOrgDAVProps(OUString::createFromAscii("http://ucb.openoffice.org/dav/props/")); if(rStr.equals(aStrDAV)) { @@ -97,33 +97,33 @@ namespace WebDAVName_last }; - WebDAVName StrToWebDAVName(const rtl::OUString& rStr) + WebDAVName StrToWebDAVName(const OUString& rStr) { - typedef std::hash_map< rtl::OUString, WebDAVName, rtl::OUStringHash > WebDAVNameMapper; - typedef std::pair< rtl::OUString, WebDAVName > WebDAVNameValueType; + typedef std::hash_map< OUString, WebDAVName, OUStringHash > WebDAVNameMapper; + typedef std::pair< OUString, WebDAVName > WebDAVNameValueType; static WebDAVNameMapper aWebDAVNameMapperList; if(aWebDAVNameMapperList.empty()) { - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("response"), WebDAVName_response)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("href"), WebDAVName_href)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("propstat"), WebDAVName_propstat)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("prop"), WebDAVName_prop)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("collection"), WebDAVName_collection)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("locktype"), WebDAVName_locktype)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("write"), WebDAVName_write)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("shared"), WebDAVName_shared)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("status"), WebDAVName_status)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); - aWebDAVNameMapperList.insert(WebDAVNameValueType(rtl::OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("multistatus"), WebDAVName_multistatus)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("response"), WebDAVName_response)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("href"), WebDAVName_href)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("propstat"), WebDAVName_propstat)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("prop"), WebDAVName_prop)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("resourcetype"), WebDAVName_resourcetype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("collection"), WebDAVName_collection)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontenttype"), WebDAVName_getcontenttype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("supportedlock"), WebDAVName_supportedlock)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockentry"), WebDAVName_lockentry)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("lockscope"), WebDAVName_lockscope)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("exclusive"), WebDAVName_exclusive)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("locktype"), WebDAVName_locktype)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("write"), WebDAVName_write)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("shared"), WebDAVName_shared)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("status"), WebDAVName_status)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getlastmodified"), WebDAVName_getlastmodified)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("creationdate"), WebDAVName_creationdate)); + aWebDAVNameMapperList.insert(WebDAVNameValueType(OUString::createFromAscii("getcontentlength"), WebDAVName_getcontentlength)); } const WebDAVNameMapper::const_iterator aResult(aWebDAVNameMapperList.find(rStr)); @@ -144,37 +144,37 @@ namespace namespace { - typedef std::map< ::rtl::OUString, ::rtl::OUString > NamespaceMap; - typedef std::pair< const ::rtl::OUString, ::rtl::OUString > NamespaceValueType; + typedef std::map< OUString, OUString > NamespaceMap; + typedef std::pair< const OUString, OUString > NamespaceValueType; class WebDAVContext { private: WebDAVContext* mpParent; NamespaceMap maNamespaceMap; - ::rtl::OUString maWhiteSpace; + OUString maWhiteSpace; - ::rtl::OUString maNamespace; - ::rtl::OUString maName; + OUString maNamespace; + OUString maName; WebDAVNamespace maWebDAVNamespace; WebDAVName maWebDAVName; // local helpers void parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs); - ::rtl::OUString mapNamespaceToken(const ::rtl::OUString& rToken) const; - void splitName(const ::rtl::OUString& rSource); + OUString mapNamespaceToken(const OUString& rToken) const; + void splitName(const OUString& rSource); public: - WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); + WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs); ~WebDAVContext(); WebDAVContext* getParent() const { return mpParent; } - ::rtl::OUString& getWhiteSpace() { return maWhiteSpace; } - void setWhiteSpace(const ::rtl::OUString& rNew) { maWhiteSpace = rNew; } + OUString& getWhiteSpace() { return maWhiteSpace; } + void setWhiteSpace(const OUString& rNew) { maWhiteSpace = rNew; } - const ::rtl::OUString& getNamespace() const { return maNamespace; } - const ::rtl::OUString& getName() const { return maName; } + const OUString& getNamespace() const { return maNamespace; } + const OUString& getName() const { return maName; } const WebDAVNamespace getWebDAVNamespace() const { return maWebDAVNamespace; } const WebDAVName getWebDAVName() const { return maWebDAVName; } }; @@ -182,11 +182,11 @@ namespace void WebDAVContext::parseForNamespaceTokens(const uno::Reference< xml::sax::XAttributeList >& xAttribs) { const sal_Int16 nAttributes(xAttribs->getLength()); - static ::rtl::OUString aStrXmlns(::rtl::OUString::createFromAscii("xmlns")); + static OUString aStrXmlns(OUString::createFromAscii("xmlns")); for(sal_Int16 a(0); a < nAttributes; a++) { - const ::rtl::OUString aName(xAttribs->getNameByIndex(a)); + const OUString aName(xAttribs->getNameByIndex(a)); const sal_Int32 nLen(aName.getLength()); if(nLen) @@ -197,7 +197,7 @@ namespace if(-1 != nIndex && nIndex + 1 < nLen) { - const ::rtl::OUString aToken(aName.copy(nIndex + 1)); + const OUString aToken(aName.copy(nIndex + 1)); maNamespaceMap.insert(NamespaceValueType(aToken, xAttribs->getValueByIndex(a))); } @@ -206,7 +206,7 @@ namespace } } - ::rtl::OUString WebDAVContext::mapNamespaceToken(const ::rtl::OUString& rToken) const + OUString WebDAVContext::mapNamespaceToken(const OUString& rToken) const { NamespaceMap::const_iterator iter = maNamespaceMap.find(rToken); @@ -227,7 +227,7 @@ namespace } } - void WebDAVContext::splitName(const ::rtl::OUString& rSource) + void WebDAVContext::splitName(const OUString& rSource) { const sal_Int32 nLen(rSource.getLength()); maNamespace = ""; @@ -245,7 +245,7 @@ namespace } } - WebDAVContext::WebDAVContext(WebDAVContext* pParent, const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) + WebDAVContext::WebDAVContext(WebDAVContext* pParent, const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs) : mpParent(pParent), maNamespaceMap(), maWhiteSpace(), @@ -293,12 +293,12 @@ namespace std::vector< http_dav_ucp::DAVResourceInfo > maResult_PropName; WebDAVContext* mpContext; - ::rtl::OUString maHref; - ::rtl::OUString maStatus; + OUString maHref; + OUString maStatus; std::vector< http_dav_ucp::DAVPropertyValue > maResponseProperties; std::vector< http_dav_ucp::DAVPropertyValue > maPropStatProperties; - std::vector< ::rtl::OUString > maResponseNames; - std::vector< ::rtl::OUString > maPropStatNames; + std::vector< OUString > maResponseNames; + std::vector< OUString > maPropStatNames; uno::Sequence< ucb::LockEntry > maLockEntries; ucb::LockScope maLockScope; ucb::LockType maLockType; @@ -355,11 +355,11 @@ namespace // Methods XDocumentHandler virtual void SAL_CALL startDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL endDocument( ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL ignorableWhitespace( const ::rtl::OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); - virtual void SAL_CALL processingInstruction( const ::rtl::OUString& aTarget, const ::rtl::OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (xml::sax::SAXException, uno::RuntimeException); + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (xml::sax::SAXException, uno::RuntimeException); virtual void SAL_CALL setDocumentLocator( const uno::Reference< xml::sax::XLocator >& xLocator ) throw (xml::sax::SAXException, uno::RuntimeException); const std::vector< http_dav_ucp::DAVResource >& getResult_PropFind() const { return maResult_PropFind; } @@ -405,7 +405,7 @@ namespace OSL_ENSURE(!mpContext, "Parser end with existing content (!)"); } - void SAL_CALL WebDAVResponseParser::startElement( const ::rtl::OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::startElement( const OUString& aName, const uno::Reference< xml::sax::XAttributeList >& xAttribs ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); @@ -498,7 +498,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::endElement( const ::rtl::OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::endElement( const OUString& aName ) throw (xml::sax::SAXException, uno::RuntimeException) { const sal_Int32 nLen(aName.getLength()); OSL_ENSURE(mpContext, "Parser EndElement without content (!)"); @@ -550,7 +550,7 @@ namespace // getlastmodified end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getlastmodified")); + static OUString aStr(OUString::createFromAscii("DAV:getlastmodified")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -564,7 +564,7 @@ namespace // creationdate end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:creationdate")); + static OUString aStr(OUString::createFromAscii("DAV:creationdate")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -587,12 +587,12 @@ namespace // resourcetype end, check for collection if(hasParent(WebDAVName_prop)) { - static rtl::OUString aStrA(rtl::OUString::createFromAscii("DAV:resourcetype")); - static rtl::OUString aStrB(rtl::OUString::createFromAscii("collection")); + static OUString aStrA(OUString::createFromAscii("DAV:resourcetype")); + static OUString aStrB(OUString::createFromAscii("collection")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStrA; - aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : rtl::OUString()); + aDAVPropertyValue.Value <<= (mbResourceTypeCollection ? aStrB : OUString()); maPropStatProperties.push_back(aDAVPropertyValue); } break; @@ -602,7 +602,7 @@ namespace // getcontentlength end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontentlength")); + static OUString aStr(OUString::createFromAscii("DAV:getcontentlength")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -616,7 +616,7 @@ namespace // getcontenttype end, safe if content is correct if(propertyIsReady()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:getcontenttype")); + static OUString aStr(OUString::createFromAscii("DAV:getcontenttype")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -630,7 +630,7 @@ namespace // supportedlock end if(hasParent(WebDAVName_prop) && maLockEntries.hasElements()) { - static rtl::OUString aStr(rtl::OUString::createFromAscii("DAV:supportedlock")); + static OUString aStr(OUString::createFromAscii("DAV:supportedlock")); http_dav_ucp::DAVPropertyValue aDAVPropertyValue; aDAVPropertyValue.Name = aStr; @@ -689,7 +689,7 @@ namespace // propstat end, check status if(maStatus.getLength()) { - static ::rtl::OUString aStrStatusOkay(::rtl::OUString::createFromAscii("HTTP/1.1 200 OK")); + static OUString aStrStatusOkay(OUString::createFromAscii("HTTP/1.1 200 OK")); if(maStatus.equals(aStrStatusOkay)) { @@ -759,7 +759,7 @@ namespace } } - void SAL_CALL WebDAVResponseParser::characters( const ::rtl::OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::characters( const OUString& aChars ) throw (xml::sax::SAXException, uno::RuntimeException) { // collect whitespace over evtl. several calls in mpContext OSL_ENSURE(mpContext, "Parser characters without content (!)"); @@ -768,16 +768,16 @@ namespace if(mpContext && nLen) { // remove leading/trailing blanks and CRLF - const ::rtl::OUString aTrimmedChars(aChars.trim()); + const OUString aTrimmedChars(aChars.trim()); if(aTrimmedChars.getLength()) { - ::rtl::OUString aNew(mpContext->getWhiteSpace()); + OUString aNew(mpContext->getWhiteSpace()); if(aNew.getLength()) { // add one char when appending (see html1.1 spec) - aNew += ::rtl::OUString(sal_Unicode(' ')); + aNew += OUString(sal_Unicode(' ')); } aNew += aTrimmedChars; @@ -786,11 +786,11 @@ namespace } } - void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const ::rtl::OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } - void SAL_CALL WebDAVResponseParser::processingInstruction( const ::rtl::OUString& /*aTarget*/, const ::rtl::OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) + void SAL_CALL WebDAVResponseParser::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) throw (xml::sax::SAXException, uno::RuntimeException) { } |