diff options
Diffstat (limited to 'ucb/source/ucp/webdav-neon')
42 files changed, 770 insertions, 775 deletions
diff --git a/ucb/source/ucp/webdav-neon/ContentProperties.cxx b/ucb/source/ucp/webdav-neon/ContentProperties.cxx index d2f5437abc4d..fcc3c90d2f40 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.cxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.cxx @@ -103,16 +103,16 @@ ContentProperties::ContentProperties( const DAVResource& rResource ) NeonUri aURI( rResource.uri ); m_aEscapedTitle = aURI.GetPathBaseName(); - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( aURI.GetPathBaseNameUnescaped() ), true ); } catch ( DAVException const & ) { - (*m_xProps)[ rtl::OUString("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( - rtl::OUString( + OUString( "*** unknown ***" ) ), true ); } @@ -135,24 +135,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("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); - (*m_xProps)[ rtl::OUString("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("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("Title") ] + (*m_xProps)[ OUString("Title") ] = PropertyValue( uno::makeAny( rTitle ), true ); } @@ -174,7 +174,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; @@ -184,7 +184,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 ) @@ -195,7 +195,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(); @@ -220,7 +220,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 */ ) { ////////////////////////////////////////////////////////////// @@ -307,7 +307,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 */ ) { ////////////////////////////////////////////////////////////// @@ -328,17 +328,17 @@ void ContentProperties::UCBNamesToHTTPNames( if ( rProp.Name == "DateModified" ) { propertyNames.push_back( - rtl::OUString("Last-Modified") ); + OUString("Last-Modified") ); } else if ( rProp.Name == "MediaType" ) { propertyNames.push_back( - rtl::OUString("Content-Type") ); + OUString("Content-Type") ); } else if ( rProp.Name == "Size" ) { propertyNames.push_back( - rtl::OUString("Content-Length") ); + OUString("Content-Length") ); } else { @@ -351,14 +351,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. @@ -371,15 +371,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 { @@ -405,19 +405,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.equals( 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("DateCreated") ] + (*m_xProps)[ OUString("DateCreated") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::DISPLAYNAME ) ) @@ -429,10 +429,10 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( DAVProperties::GETCONTENTLENGTH ) ) { // Map DAV:getcontentlength to UCP:Size - rtl::OUString aValue; + OUString aValue; rValue >>= aValue; - (*m_xProps)[ rtl::OUString("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName == "Content-Length" ) @@ -441,16 +441,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("Size") ] + (*m_xProps)[ OUString("Size") ] = PropertyValue( uno::makeAny( aValue.toInt64() ), true ); } else if ( rName.equals( DAVProperties::GETCONTENTTYPE ) ) { // Map DAV:getcontenttype to UCP:MediaType (1:1) - (*m_xProps)[ rtl::OUString("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } else if ( rName == "Content-Type" ) @@ -459,7 +459,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("MediaType") ] + (*m_xProps)[ OUString("MediaType") ] = PropertyValue( rValue, true ); } // else if ( rName.equals( DAVProperties::GETETAG ) ) @@ -468,12 +468,12 @@ void ContentProperties::addProperty( const rtl::OUString & rName, else if ( rName.equals( 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("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } else if ( rName == "Last-Modified" ) @@ -482,12 +482,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("DateModified") ] + (*m_xProps)[ OUString("DateModified") ] = PropertyValue( uno::makeAny( aDate ), true ); } // else if ( rName.equals( DAVProperties::LOCKDISCOVERY ) ) @@ -495,20 +495,20 @@ void ContentProperties::addProperty( const rtl::OUString & rName, // } else if ( rName.equals( 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("IsFolder") ] + (*m_xProps)[ OUString("IsFolder") ] = PropertyValue( uno::makeAny( bFolder ), true ); - (*m_xProps)[ rtl::OUString("IsDocument") ] + (*m_xProps)[ OUString("IsDocument") ] = PropertyValue( uno::makeAny( sal_Bool( !bFolder ) ), true ); - (*m_xProps)[ rtl::OUString("ContentType") ] + (*m_xProps)[ OUString("ContentType") ] = PropertyValue( uno::makeAny( bFolder - ? rtl::OUString( WEBDAV_COLLECTION_TYPE ) - : rtl::OUString( WEBDAV_CONTENT_TYPE ) ), true ); + ? OUString( WEBDAV_COLLECTION_TYPE ) + : OUString( WEBDAV_CONTENT_TYPE ) ), true ); } // else if ( rName.equals( DAVProperties::SOURCE ) ) // { @@ -531,25 +531,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-neon/ContentProperties.hxx b/ucb/source/ucp/webdav-neon/ContentProperties.hxx index 4f64c016823a..6022439364af 100644 --- a/ucb/source/ucp/webdav-neon/ContentProperties.hxx +++ b/ucb/source/ucp/webdav-neon/ContentProperties.hxx @@ -49,7 +49,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 ); } @@ -57,7 +57,7 @@ struct equalString struct hashString { - size_t operator()( const rtl::OUString & rName ) const + size_t operator()( const OUString & rName ) const { return rName.hashCode(); } @@ -91,7 +91,7 @@ public: typedef boost::unordered_map < - rtl::OUString, + OUString, PropertyValue, hashString, equalString @@ -108,17 +108,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 @@ -130,7 +130,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 @@ -143,7 +143,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 @@ -152,16 +152,16 @@ 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 entry. - void addProperty( const rtl::OUString & rName, + void addProperty( const OUString & rName, const com::sun::star::uno::Any & rValue, bool bIsCaseSensitive ); @@ -170,7 +170,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. @@ -178,7 +178,7 @@ public: { return m_xProps; } private: - ::rtl::OUString m_aEscapedTitle; + OUString m_aEscapedTitle; std::auto_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; @@ -186,7 +186,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 @@ -207,11 +207,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-neon/DAVAuthListener.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx index 7e4a34b56564..1d9e665280a0 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListener.hxx @@ -41,10 +41,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 ) = 0; }; diff --git a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx index db5f44655659..7428c358ebd5 100644 --- a/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav-neon/DAVAuthListenerImpl.hxx @@ -53,24 +53,24 @@ namespace webdav_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 ); 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-neon/DAVException.hxx b/ucb/source/ucp/webdav-neon/DAVException.hxx index 376f7ff337ed..4c3ab54bc930 100644 --- a/ucb/source/ucp/webdav-neon/DAVException.hxx +++ b/ucb/source/ucp/webdav-neon/DAVException.hxx @@ -140,25 +140,25 @@ class DAVException private: ExceptionCode mExceptionCode; - rtl::OUString mData; + OUString mData; sal_uInt16 mStatusCode; public: DAVException( ExceptionCode inExceptionCode ) : mExceptionCode( inExceptionCode ), 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 ), mStatusCode( nStatusCode ) {}; ~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-neon/DAVProperties.cxx b/ucb/source/ucp/webdav-neon/DAVProperties.cxx index 29e972f231a5..a95aea3482f4 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.cxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.cxx @@ -32,28 +32,28 @@ using namespace webdav_ucp; -const ::rtl::OUString DAVProperties::CREATIONDATE("DAV:creationdate"); -const ::rtl::OUString DAVProperties::DISPLAYNAME("DAV:displayname"); -const ::rtl::OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); -const ::rtl::OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); -const ::rtl::OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); -const ::rtl::OUString DAVProperties::GETETAG("DAV:getetag"); -const ::rtl::OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); -const ::rtl::OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); -const ::rtl::OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); -const ::rtl::OUString DAVProperties::SOURCE("DAV:source"); -const ::rtl::OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); - -const ::rtl::OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); - -void DAVProperties::createNeonPropName( const rtl::OUString & rFullName, +const OUString DAVProperties::CREATIONDATE("DAV:creationdate"); +const OUString DAVProperties::DISPLAYNAME("DAV:displayname"); +const OUString DAVProperties::GETCONTENTLANGUAGE("DAV:getcontentlanguage"); +const OUString DAVProperties::GETCONTENTLENGTH("DAV:getcontentlength"); +const OUString DAVProperties::GETCONTENTTYPE("DAV:getcontenttype"); +const OUString DAVProperties::GETETAG("DAV:getetag"); +const OUString DAVProperties::GETLASTMODIFIED("DAV:getlastmodified"); +const OUString DAVProperties::LOCKDISCOVERY("DAV:lockdiscovery"); +const OUString DAVProperties::RESOURCETYPE("DAV:resourcetype"); +const OUString DAVProperties::SOURCE("DAV:source"); +const OUString DAVProperties::SUPPORTEDLOCK("DAV:supportedlock"); + +const OUString DAVProperties::EXECUTABLE("http://apache.org/dav/props/executable"); + +void DAVProperties::createNeonPropName( const OUString & rFullName, NeonPropName & rName ) { if ( rFullName.startsWith( "DAV:" ) ) { rName.nspace = "DAV:"; rName.name - = strdup( rtl::OUStringToOString( + = strdup( OUStringToOString( rFullName.copy( RTL_CONSTASCII_LENGTH( "DAV:" ) ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -61,7 +61,7 @@ void DAVProperties::createNeonPropName( 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/" ) ), @@ -71,7 +71,7 @@ void DAVProperties::createNeonPropName( 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/" ) ), @@ -81,8 +81,8 @@ void DAVProperties::createNeonPropName( 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"> @@ -99,19 +99,19 @@ void DAVProperties::createNeonPropName( 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 ).getStr() ); } } 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.isEmpty() ) { @@ -130,7 +130,7 @@ void DAVProperties::createUCBPropName( const char * nspace, DAVProperties::GETETAG.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::GETLASTMODIFIED.matchIgnoreAsciiCase( aName, 4 ) || DAVProperties::SOURCE.matchIgnoreAsciiCase( aName, 4 ) ) - aNameSpace = rtl::OUString( "DAV:" ); + aNameSpace = OUString( "DAV:" ); } // Note: Concatenating strings BEFORE comparing against known namespaces @@ -156,11 +156,11 @@ void DAVProperties::createUCBPropName( const char * nspace, else { // Create property name that encodes, namespace and name ( XML ). - rFullName = rtl::OUString("<prop:"); + rFullName = OUString("<prop:"); rFullName += aName; - rFullName += rtl::OUString( " xmlns:prop=\"" ); + rFullName += OUString( " xmlns:prop=\"" ); rFullName += aNameSpace; - rFullName += rtl::OUString( "\">" ); + rFullName += OUString( "\">" ); } } diff --git a/ucb/source/ucp/webdav-neon/DAVProperties.hxx b/ucb/source/ucp/webdav-neon/DAVProperties.hxx index 2cf049ffa672..dbd967feaf4d 100644 --- a/ucb/source/ucp/webdav-neon/DAVProperties.hxx +++ b/ucb/source/ucp/webdav-neon/DAVProperties.hxx @@ -36,24 +36,24 @@ namespace webdav_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 SOURCE; - static const ::rtl::OUString SUPPORTEDLOCK; - static const ::rtl::OUString EXECUTABLE; + 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 SOURCE; + static const OUString SUPPORTEDLOCK; + static const OUString EXECUTABLE; - static void createNeonPropName( const rtl::OUString & rFullName, + static void createNeonPropName( const OUString & rFullName, NeonPropName & rName ); static void createUCBPropName ( const char * nspace, const char * name, - rtl::OUString & rFullName ); + OUString & rFullName ); static bool isUCBDeadProperty( const NeonPropName & rName ); }; diff --git a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx index 6f3862d376fa..3c435bab51c9 100644 --- a/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav-neon/DAVRequestEnvironment.hxx @@ -34,19 +34,19 @@ namespace webdav_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; uno::Reference< ucb::XCommandEnvironment > m_xEnv; -DAVRequestEnvironment( const rtl::OUString & rRequestURI, +DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, const uno::Reference< ucb::XCommandEnvironment > & xEnv) diff --git a/ucb/source/ucp/webdav-neon/DAVResource.hxx b/ucb/source/ucp/webdav-neon/DAVResource.hxx index d12e08e5cca7..eeba4efa5dce 100644 --- a/ucb/source/ucp/webdav-neon/DAVResource.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResource.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp struct DAVPropertyValue { - rtl::OUString Name; + OUString Name; com::sun::star::uno::Any Value; bool IsCaseSensitive; @@ -48,19 +48,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 webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index 61f4969308d0..a3976b92b871 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -53,10 +53,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 ) { if ( m_xEnv.is() ) @@ -77,7 +77,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() ); @@ -106,8 +106,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 { @@ -141,7 +141,7 @@ int DAVAuthListener_Impl::authenticate( DAVResourceAccess::DAVResourceAccess( const uno::Reference< uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ) + const OUString & rURL ) : m_aURL( rURL ), m_xSessionFactory( rSessionFactory ), m_xContext( rxContext ) @@ -194,7 +194,7 @@ void DAVResourceAccess::OPTIONS( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "OPTIONS" ), + OUString( "OPTIONS" ), aHeaders ); m_xSession->OPTIONS( getRequestURI(), @@ -219,7 +219,7 @@ void DAVResourceAccess::OPTIONS( //========================================================================= 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 ) @@ -237,7 +237,7 @@ void DAVResourceAccess::PROPFIND( getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -279,7 +279,7 @@ void DAVResourceAccess::PROPFIND( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPFIND" ), + OUString( "PROPFIND" ), aHeaders ); m_xSession->PROPFIND( getRequestURI(), @@ -319,7 +319,7 @@ void DAVResourceAccess::PROPPATCH( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "PROPPATCH" ), + OUString( "PROPPATCH" ), aHeaders ); m_xSession->PROPPATCH( getRequestURI(), @@ -342,7 +342,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 ) @@ -359,7 +359,7 @@ void DAVResourceAccess::HEAD( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("HEAD"), + OUString("HEAD"), aHeaders ); m_xSession->HEAD( getRequestURI(), @@ -399,7 +399,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -440,7 +440,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -463,7 +463,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 ) @@ -481,7 +481,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); xStream = m_xSession->GET( getRequestURI(), @@ -509,7 +509,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 ) @@ -526,7 +526,7 @@ void DAVResourceAccess::GET( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("GET"), + OUString("GET"), aHeaders ); m_xSession->GET( getRequestURI(), @@ -611,7 +611,7 @@ void DAVResourceAccess::PUT( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("PUT"), + OUString("PUT"), aHeaders ); m_xSession->PUT( getRequestURI(), @@ -634,8 +634,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 ) @@ -663,7 +663,7 @@ uno::Reference< io::XInputStream > DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); xStream = m_xSession->POST( getRequestURI(), @@ -697,8 +697,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 ) @@ -726,7 +726,7 @@ void DAVResourceAccess::POST( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("POST"), + OUString("POST"), aHeaders ); m_xSession->POST( getRequestURI(), @@ -774,7 +774,7 @@ void DAVResourceAccess::MKCOL( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MKCOL"), + OUString("MKCOL"), aHeaders ); m_xSession->MKCOL( getRequestURI(), @@ -796,8 +796,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 ) @@ -814,7 +814,7 @@ void DAVResourceAccess::COPY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("COPY"), + OUString("COPY"), aHeaders ); m_xSession->COPY( rSourcePath, @@ -838,8 +838,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 ) @@ -856,7 +856,7 @@ void DAVResourceAccess::MOVE( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("MOVE"), + OUString("MOVE"), aHeaders ); m_xSession->MOVE( rSourcePath, @@ -895,7 +895,7 @@ void DAVResourceAccess::DESTROY( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString( "DESTROY" ), + OUString( "DESTROY" ), aHeaders ); m_xSession->DESTROY( getRequestURI(), @@ -934,7 +934,7 @@ void DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); m_xSession->LOCK( getRequestURI(), @@ -976,7 +976,7 @@ sal_Int64 DAVResourceAccess::LOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("LOCK"), + OUString("LOCK"), aHeaders ); nNewTimeout = m_xSession->LOCK( getRequestURI(), @@ -1018,7 +1018,7 @@ void DAVResourceAccess::UNLOCK( DAVRequestHeaders aHeaders; getUserRequestHeaders( xEnv, getRequestURI(), - rtl::OUString("UNLOCK"), + OUString("UNLOCK"), aHeaders ); m_xSession->UNLOCK( getRequestURI(), @@ -1047,12 +1047,12 @@ void DAVResourceAccess::setFlags( const uno::Sequence< beans::NamedValue >& rFla } //========================================================================= -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. } //========================================================================= @@ -1064,7 +1064,7 @@ void DAVResourceAccess::initialize() if ( m_aPath.isEmpty() ) { NeonUri aURI( m_aURL ); - rtl::OUString aPath( aURI.GetPath() ); + OUString aPath( aURI.GetPath() ); /* #134089# - Check URI */ if ( aPath.isEmpty() ) @@ -1098,7 +1098,7 @@ void DAVResourceAccess::initialize() } //========================================================================= -const rtl::OUString & DAVResourceAccess::getRequestURI() const +const OUString & DAVResourceAccess::getRequestURI() const { OSL_ENSURE( m_xSession.is(), "DAVResourceAccess::getRequestURI - Not initialized!" ); @@ -1114,8 +1114,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() ) @@ -1130,7 +1130,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 ) @@ -1164,7 +1164,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-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 99446236bf69..b4bf18ef53e2 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -53,8 +53,8 @@ class DAVSessionFactory; class DAVResourceAccess { osl::Mutex m_aMutex; - rtl::OUString m_aURL; - rtl::OUString m_aPath; + OUString m_aURL; + OUString m_aPath; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; @@ -68,7 +68,7 @@ public: com::sun::star::uno::XComponentContext > & rxContext, rtl::Reference< DAVSessionFactory > const & rSessionFactory, - const rtl::OUString & rURL ); + const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); DAVResourceAccess & operator=( const DAVResourceAccess & rOther ); @@ -76,12 +76,12 @@ public: void setFlags( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) throw ( DAVException ); - 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; } @@ -100,7 +100,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 ) @@ -121,7 +121,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 ) @@ -140,7 +140,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 ) @@ -149,7 +149,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 ) @@ -163,8 +163,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< @@ -172,8 +172,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< @@ -188,16 +188,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 ) @@ -238,13 +238,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( const DAVException & e, int errorCount ) throw ( DAVException ); diff --git a/ucb/source/ucp/webdav-neon/DAVSession.hxx b/ucb/source/ucp/webdav-neon/DAVSession.hxx index 120879d91bf8..b5dad245b356 100644 --- a/ucb/source/ucp/webdav-neon/DAVSession.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSession.hxx @@ -68,7 +68,7 @@ public: } } - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ) = 0; virtual sal_Bool UsesProxy() = 0; @@ -76,81 +76,81 @@ public: // DAV methods // - 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< @@ -158,39 +158,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-neon/DAVSessionFactory.cxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx index 2534af78f628..2f595557bdd0 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx @@ -39,7 +39,7 @@ DAVSessionFactory::~DAVSessionFactory() } rtl::Reference< DAVSession > DAVSessionFactory::createDAVSession( - const ::rtl::OUString & inUri, + const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags, const uno::Reference< uno::XComponentContext > & rxContext ) throw( DAVException ) diff --git a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx index c29ec718e86f..b45ce9ffcde3 100644 --- a/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx @@ -61,14 +61,14 @@ public: ~DAVSessionFactory() SAL_THROW(()); rtl::Reference< DAVSession > - createDAVSession( const ::rtl::OUString & inUri, + createDAVSession( const OUString & inUri, const ::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ::uno::Reference< ::uno::XComponentContext >& rxContext ) throw( DAVException ); ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xContext; } 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-neon/DAVTypes.hxx b/ucb/source/ucp/webdav-neon/DAVTypes.hxx index fcdfc2cda72c..b3da92c0a533 100644 --- a/ucb/source/ucp/webdav-neon/DAVTypes.hxx +++ b/ucb/source/ucp/webdav-neon/DAVTypes.hxx @@ -72,11 +72,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-neon/DateTimeHelper.cxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx index f47e29714880..4bf2ea8f0291 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.cxx @@ -36,8 +36,6 @@ using namespace com::sun::star::util; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; bool DateTimeHelper::ISO8601_To_DateTime (const OUString& s, DateTime& dateTime) diff --git a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx index 6964bc620a18..b3166c2ca00c 100644 --- a/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav-neon/DateTimeHelper.hxx @@ -45,16 +45,16 @@ namespace webdav_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-neon/LinkSequence.cxx b/ucb/source/ucp/webdav-neon/LinkSequence.cxx index 26c5673eeab8..32fafb4bc7b9 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.cxx @@ -98,13 +98,13 @@ extern "C" int LinkSequence_chardata_callback( { case STATE_DST: pCtx->pLink->Destination - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasDestination = true; break; case STATE_SRC: pCtx->pLink->Source - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasSource = true; break; } @@ -135,7 +135,7 @@ extern "C" int LinkSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LinkSequence::createFromXML( const rtl::OString & rInData, +bool LinkSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Link > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 7; // </link> @@ -191,16 +191,16 @@ bool LinkSequence::createFromXML( const rtl::OString & rInData, ////////////////////////////////////////////////////////////////////////// // static bool LinkSequence::toXML( const uno::Sequence< ucb::Link > & rInData, - rtl::OUString & rOutData ) + OUString & rOutData ) { // <link><src>value</src><dst>value</dst></link><link><src>.... sal_Int32 nCount = rInData.getLength(); if ( nCount ) { - rtl::OUString aPre( "<link><src>" ); - rtl::OUString aMid( "</src><dst>" ); - rtl::OUString aEnd( "</dst></link>" ); + OUString aPre( "<link><src>" ); + OUString aMid( "</src><dst>" ); + OUString aEnd( "</dst></link>" ); for ( sal_Int32 n = 0; n < nCount; ++n ) { diff --git a/ucb/source/ucp/webdav-neon/LinkSequence.hxx b/ucb/source/ucp/webdav-neon/LinkSequence.hxx index 109ea8de33dd..ceec0f347e13 100644 --- a/ucb/source/ucp/webdav-neon/LinkSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LinkSequence.hxx @@ -39,12 +39,12 @@ namespace webdav_ucp class LinkSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rOutData ); static bool toXML( const com::sun::star::uno::Sequence< com::sun::star::ucb::Link > & rInData, - rtl::OUString & rOutData ); + OUString & rOutData ); }; } diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx index 075af0132ee8..746ca58bd8f2 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.cxx @@ -183,7 +183,7 @@ extern "C" int LockEntrySequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockEntrySequence::createFromXML( const rtl::OString & rInData, +bool LockEntrySequence::createFromXML( const OString & rInData, uno::Sequence< ucb::LockEntry > & rOutData ) { diff --git a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx index 7c91f4e6cf23..62556e11c01b 100644 --- a/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockEntrySequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockEntrySequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::LockEntry > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/LockSequence.cxx b/ucb/source/ucp/webdav-neon/LockSequence.cxx index 3b31b1f9fa11..06d501fb0c38 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.cxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.cxx @@ -178,9 +178,9 @@ extern "C" int LockSequence_chardata_callback( case STATE_OWNER: { // collect raw XML data... (owner contains ANY) - rtl::OUString aValue; + OUString aValue; pCtx->pLock->Owner >>= aValue; - aValue += rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + aValue += OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->pLock->Owner <<= aValue; break; } @@ -207,7 +207,7 @@ extern "C" int LockSequence_chardata_callback( buf, len, "Second-", 7, 7 ) == 0 ) { pCtx->pLock->Timeout - = rtl::OString( buf + 7, len - 7 ).toInt64(); + = OString( buf + 7, len - 7 ).toInt64(); pCtx->hasTimeout = true; } // else if ( rtl_str_shortenedCompareIgnoreCase_WithLength( @@ -229,7 +229,7 @@ extern "C" int LockSequence_chardata_callback( sal_Int32 nPos = pCtx->pLock->LockTokens.getLength(); pCtx->pLock->LockTokens.realloc( nPos + 1 ); pCtx->pLock->LockTokens[ nPos ] - = rtl::OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); + = OUString( buf, len, RTL_TEXTENCODING_ASCII_US ); pCtx->hasHREF = true; break; } @@ -310,7 +310,7 @@ extern "C" int LockSequence_endelement_callback( ////////////////////////////////////////////////////////////////////////// // static -bool LockSequence::createFromXML( const rtl::OString & rInData, +bool LockSequence::createFromXML( const OString & rInData, uno::Sequence< ucb::Lock > & rOutData ) { const sal_Int32 TOKEN_LENGTH = 13; // </activelock> diff --git a/ucb/source/ucp/webdav-neon/LockSequence.hxx b/ucb/source/ucp/webdav-neon/LockSequence.hxx index 746d72176c73..fc9db6679c9f 100644 --- a/ucb/source/ucp/webdav-neon/LockSequence.hxx +++ b/ucb/source/ucp/webdav-neon/LockSequence.hxx @@ -39,7 +39,7 @@ namespace webdav_ucp class LockSequence { public: - static bool createFromXML( const rtl::OString & rInData, + static bool createFromXML( const OString & rInData, com::sun::star::uno::Sequence< com::sun::star::ucb::Lock > & rOutData ); }; diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx index 8763a9b5c32e..5040b690943e 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.cxx @@ -38,15 +38,15 @@ namespace { void process_headers( ne_request * req, DAVResource & rResource, - const std::vector< ::rtl::OUString > & rHeaderNames ) + const std::vector< OUString > & rHeaderNames ) { void * cursor = NULL; const char * name, *value; while ( ( cursor = ne_response_header_iterate( req, cursor, &name, &value ) ) != NULL ) { - rtl::OUString aHeaderName( rtl::OUString::createFromAscii( name ) ); - rtl::OUString aHeaderValue( rtl::OUString::createFromAscii( value ) ); + OUString aHeaderName( OUString::createFromAscii( name ) ); + OUString aHeaderValue( OUString::createFromAscii( value ) ); // Note: Empty vector means that all headers are requested. bool bIncludeIt = ( rHeaderNames.empty() ); @@ -54,9 +54,9 @@ void process_headers( ne_request * req, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( rHeaderNames.begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( rHeaderNames.end() ); while ( it != end ) @@ -90,8 +90,8 @@ void process_headers( ne_request * req, extern osl::Mutex aGlobalNeonMutex; NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ) @@ -103,7 +103,7 @@ NeonHeadRequest::NeonHeadRequest( HttpSession * inSession, // header fields. ne_request * req = ne_request_create( inSession, "HEAD", - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); diff --git a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx index b0a9fea47c53..a328418d4db5 100644 --- a/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonHeadRequest.hxx @@ -41,8 +41,8 @@ class NeonHeadRequest public: // named / allprop NeonHeadRequest( HttpSession* inSession, - const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, + const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, int & nError ); ~NeonHeadRequest(); diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx index 951601fc1e11..04608a63f725 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.cxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.cxx @@ -145,12 +145,12 @@ void NeonLockStore::registerSession( HttpSession * pHttpSession ) ne_lockstore_register( m_pNeonLockStore, pHttpSession ); } -NeonLock * NeonLockStore::findByUri( rtl::OUString const & rUri ) +NeonLock * NeonLockStore::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_pNeonLockStore, &aUri ); } diff --git a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx index c8f0f0fcba99..c6bd4f5e48a4 100644 --- a/ucb/source/ucp/webdav-neon/NeonLockStore.hxx +++ b/ucb/source/ucp/webdav-neon/NeonLockStore.hxx @@ -78,7 +78,7 @@ public: void registerSession( HttpSession * pHttpSession ); - NeonLock * findByUri( rtl::OUString const & rUri ); + NeonLock * findByUri( OUString const & rUri ); void addLock( NeonLock * pLock, rtl::Reference< NeonSession > const & xSession, diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx index 6f05906e8b64..0f10513d5b34 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.cxx @@ -43,19 +43,16 @@ using namespace com::sun::star::ucb; using namespace std; using namespace webdav_ucp; -using ::rtl::OUString; -using ::rtl::OString; -using ::rtl::OStringToOUString; namespace { // strip "DAV:" namespace from XML snippets to avoid // parser error (undeclared namespace) later on. - rtl::OString stripDavNamespace( const rtl::OString & in ) + OString stripDavNamespace( const OString & in ) { - const rtl::OString inXML( in.toAsciiLowerCase() ); + const OString inXML( in.toAsciiLowerCase() ); - rtl::OStringBuffer buf; + OStringBuffer buf; sal_Int32 start = 0; sal_Int32 end = inXML.indexOf( "dav:" ); while ( end != -1 ) @@ -76,7 +73,7 @@ namespace } buf.append( inXML.copy( start ) ); - return rtl::OString( buf.makeStringAndClear() ); + return OString( buf.makeStringAndClear() ); } } diff --git a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx index 9febb56faf0c..fd714246c9db 100644 --- a/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx +++ b/ucb/source/ucp/webdav-neon/NeonPropFindRequest.hxx @@ -45,7 +45,7 @@ public: NeonPropFindRequest( HttpSession* inSession, const char* inPath, const Depth inDepth, - const std::vector< ::rtl::OUString > & inPropNames, + const std::vector< OUString > & inPropNames, std::vector< DAVResource > & ioResources, int & nError ); // propnames diff --git a/ucb/source/ucp/webdav-neon/NeonSession.cxx b/ucb/source/ucp/webdav-neon/NeonSession.cxx index 5dcafe634d18..34a193732d5e 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.cxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.cxx @@ -82,12 +82,12 @@ using namespace webdav_ucp; struct RequestData { // POST - rtl::OUString aContentType; - rtl::OUString aReferer; + OUString aContentType; + OUString aReferer; RequestData() {} - RequestData( const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + RequestData( const OUString & rContentType, + const OUString & rReferer ) : aContentType( rContentType ), aReferer( rReferer ) {} }; @@ -116,7 +116,7 @@ typedef boost::unordered_map > RequestDataMap; -static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText ) +static sal_uInt16 makeStatusCode( const OUString & rStatusText ) { // Extract status code from session error string. Unfortunately // neon provides no direct access to the status code... @@ -150,7 +150,7 @@ static bool noKeepAlive( const uno::Sequence< beans::NamedValue >& rFlags ) std::find_if(pAry,pAry+nLen, boost::bind(comphelper::TNamedValueEqualFunctor(), _1, - rtl::OUString("KeepAlive")))); + OUString("KeepAlive")))); if ( pValue != pAry+nLen && !pValue->Value.get<sal_Bool>() ) return true; @@ -161,7 +161,7 @@ struct NeonRequestContext { uno::Reference< io::XOutputStream > xOutputStream; rtl::Reference< NeonInputStream > xInputStream; - const std::vector< ::rtl::OUString > * pHeaderNames; + const std::vector< OUString > * pHeaderNames; DAVResource * pResource; NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm ) @@ -173,13 +173,13 @@ struct NeonRequestContext pHeaderNames( 0 ), pResource( 0 ) {} NeonRequestContext( uno::Reference< io::XOutputStream > & xOutStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( xOutStrm ), xInputStream( 0 ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} NeonRequestContext( const rtl::Reference< NeonInputStream > & xInStrm, - const std::vector< ::rtl::OUString > & inHeaderNames, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : xOutputStream( 0 ), xInputStream( xInStrm ), pHeaderNames( &inHeaderNames ), pResource( &ioResource ) {} @@ -255,8 +255,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, // abort return -1; } - rtl::OUString theUserName; - rtl::OUString thePassWord; + OUString theUserName; + OUString thePassWord; if ( attempt == 0 ) { @@ -266,7 +266,7 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, try { NeonUri uri( theSession->getRequestEnvironment().m_aRequestURI ); - rtl::OUString aUserInfo( uri.GetUserInfo() ); + OUString aUserInfo( uri.GetUserInfo() ); if ( !aUserInfo.isEmpty() ) { sal_Int32 nPos = aUserInfo.indexOf( '@' ); @@ -290,9 +290,9 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, else { // username buffer is prefilled with user name from last attempt. - theUserName = rtl::OUString::createFromAscii( inoutUserName ); + theUserName = OUString::createFromAscii( inoutUserName ); // @@@ Neon does not initialize password buffer (last checked: 0.22.0). - //thePassWord = rtl::OUString::createFromAscii( inoutPassWord ); + //thePassWord = OUString::createFromAscii( inoutPassWord ); } bool bCanUseSystemCreds = false; @@ -306,14 +306,14 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, #endif int theRetVal = pListener->authenticate( - rtl::OUString::createFromAscii( inRealm ), + OUString::createFromAscii( inRealm ), theSession->getHostName(), theUserName, thePassWord, bCanUseSystemCreds); - rtl::OString aUser( - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); + OString aUser( + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ) ); if ( aUser.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -321,8 +321,8 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, return -1; } - rtl::OString aPass( - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); + OString aPass( + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ) ); if ( aPass.getLength() > ( NE_ABUFSIZ - 1 ) ) { OSL_FAIL( @@ -331,19 +331,19 @@ extern "C" int NeonSession_NeonAuth( void * inUserData, } strcpy( inoutUserName, // #100211# - checked - rtl::OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( theUserName, RTL_TEXTENCODING_UTF8 ).getStr() ); strcpy( inoutPassWord, // #100211# - checked - rtl::OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); + OUStringToOString( thePassWord, RTL_TEXTENCODING_UTF8 ).getStr() ); return theRetVal; } namespace { - ::rtl::OUString GetHostnamePart( const ::rtl::OUString& _rRawString ) + OUString GetHostnamePart( const OUString& _rRawString ) { - ::rtl::OUString sPart; - ::rtl::OUString sPartId("CN="); + OUString sPart; + OUString sPartId("CN="); sal_Int32 nContStart = _rRawString.indexOf( sPartId ); if ( nContStart != -1 ) { @@ -378,7 +378,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, failures = 0; char * dn = ne_ssl_readable_dname( ne_ssl_cert_subject( cert ) ); - rtl::OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); + OUString cert_subject( dn, strlen( dn ), RTL_TEXTENCODING_UTF8, 0 ); ne_free( dn ); @@ -405,7 +405,7 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, return 1; uno::Reference< xml::crypto::XXMLSecurityContext > xSecurityContext( - xSEInitializer->createSecurityContext( rtl::OUString() ) ); + xSEInitializer->createSecurityContext( OUString() ) ); uno::Reference< xml::crypto::XSecurityEnvironment > xSecurityEnv( xSecurityContext->getSecurityEnvironment() ); @@ -413,11 +413,11 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, //The end entity certificate char * eeCertB64 = ne_ssl_cert_export( cert ); - rtl::OString sEECertB64( eeCertB64 ); + OString sEECertB64( eeCertB64 ); uno::Reference< security::XCertificate > xEECert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sEECertB64, RTL_TEXTENCODING_ASCII_US ) ) ); ne_free( eeCertB64 ); eeCertB64 = 0; @@ -434,12 +434,12 @@ extern "C" int NeonSession_CertificationNotify( void *userdata, break; char * imCertB64 = ne_ssl_cert_export( issuerCert ); - rtl::OString sInterMediateCertB64( imCertB64 ); + OString sInterMediateCertB64( imCertB64 ); ne_free( imCertB64 ); uno::Reference< security::XCertificate> xImCert( xSecurityEnv->createCertificateFromAscii( - rtl::OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); + OStringToOUString( sInterMediateCertB64, RTL_TEXTENCODING_ASCII_US ) ) ); if ( xImCert.is() ) vecCerts.push_back( xImCert ); } @@ -532,8 +532,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Content-Type:" ) == NULL ) { - rtl::OString aType - = rtl::OUStringToOString( (*it).second.aContentType, + OString aType + = OUStringToOString( (*it).second.aContentType, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Content-Type: ", aType.getStr(), EOL, NULL ); @@ -545,8 +545,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, char * pData = headers->data; if ( strstr( pData, "Referer:" ) == NULL ) { - rtl::OString aReferer - = rtl::OUStringToOString( (*it).second.aReferer, + OString aReferer + = OUStringToOString( (*it).second.aReferer, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, "Referer: ", aReferer.getStr(), EOL, NULL ); @@ -562,11 +562,11 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req, while ( it1 != end1 ) { - rtl::OString aHeader - = rtl::OUStringToOString( (*it1).first, + OString aHeader + = OUStringToOString( (*it1).first, RTL_TEXTENCODING_UTF8 ); - rtl::OString aValue - = rtl::OUStringToOString( (*it1).second, + OString aValue + = OUStringToOString( (*it1).second, RTL_TEXTENCODING_UTF8 ); ne_buffer_concat( headers, aHeader.getStr(), ": ", aValue.getStr(), EOL, NULL ); @@ -588,7 +588,7 @@ NeonLockStore NeonSession::m_aNeonLockStore; NeonSession::NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const uno::Sequence< beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ) @@ -704,10 +704,10 @@ void NeonSession::Init() { osl::Guard< osl::Mutex > theGlobalGuard( aGlobalNeonMutex ); m_pHttpSession = ne_session_create( - rtl::OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aScheme, RTL_TEXTENCODING_UTF8 ).getStr(), /* theUri.GetUserInfo(), @@@ for FTP via HTTP proxy, but not supported by Neon */ - rtl::OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), + OUStringToOString( m_aHostName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nPort ); } @@ -720,7 +720,7 @@ void NeonSession::Init() m_aNeonLockStore.registerSession( m_pHttpSession ); if ( m_aScheme.equalsIgnoreAsciiCase( - rtl::OUString( "https" ) ) ) + OUString( "https" ) ) ) { // Set a failure callback for certificate check ne_ssl_set_verify( @@ -775,7 +775,7 @@ void NeonSession::Init() if ( !m_aProxyName.isEmpty() ) { ne_session_proxy( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( m_aProxyName, RTL_TEXTENCODING_UTF8 ).getStr(), m_nProxyPort ); @@ -799,7 +799,7 @@ void NeonSession::Init() } } -sal_Bool NeonSession::CanUse( const rtl::OUString & inUri, +sal_Bool NeonSession::CanUse( const OUString & inUri, const uno::Sequence< beans::NamedValue >& rFlags ) { try @@ -824,7 +824,7 @@ sal_Bool NeonSession::UsesProxy() return !m_aProxyName.isEmpty() ; } -void NeonSession::OPTIONS( const rtl::OUString & inPath, +void NeonSession::OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -837,7 +837,7 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, memset( &servercaps, 0, sizeof( servercaps ) ); int theRetVal = ne_options( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), &servercaps ); @@ -848,9 +848,9 @@ void NeonSession::OPTIONS( const rtl::OUString & inPath, outCapabilities.executable = !!servercaps.dav_executable; } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::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 ) @@ -861,7 +861,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, inPropNames, @@ -871,7 +871,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPFIND( const rtl::OUString & inPath, +void NeonSession::PROPFIND( const OUString & inPath, const Depth inDepth, std::vector< DAVResourceInfo > & ioResInfo, const DAVRequestEnvironment & rEnv ) @@ -883,7 +883,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, int theRetVal = NE_OK; NeonPropFindRequest theRequest( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), inDepth, ioResInfo, @@ -892,7 +892,7 @@ void NeonSession::PROPFIND( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PROPPATCH( const rtl::OUString & inPath, +void NeonSession::PROPPATCH( const OUString & inPath, const std::vector< ProppatchValue > & inValues, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -940,7 +940,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, { pItems[ n ].type = ne_propset; - rtl::OUString aStringValue; + OUString aStringValue; if ( DAVProperties::isUCBDeadProperty( *pName ) ) { // DAV dead property added by WebDAV UCP? @@ -984,7 +984,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, } } pItems[ n ].value - = strdup( rtl::OUStringToOString( aStringValue, + = strdup( OUStringToOString( aStringValue, RTL_TEXTENCODING_UTF8 ).getStr() ); } else @@ -1003,7 +1003,7 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, pItems[ n ].name = 0; theRetVal = ne_proppatch( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), pItems ); } @@ -1020,8 +1020,8 @@ void NeonSession::PROPPATCH( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::HEAD( const ::rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +void NeonSession::HEAD( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) @@ -1041,7 +1041,7 @@ void NeonSession::HEAD( const ::rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, +NeonSession::GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1052,7 +1052,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, false, @@ -1063,7 +1063,7 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::GET( const OUString & inPath, uno::Reference< io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1074,7 +1074,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, false, @@ -1084,8 +1084,8 @@ void NeonSession::GET( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::GET( const rtl::OUString & inPath, - const std::vector< ::rtl::OUString > & inHeaderNames, +NeonSession::GET( const OUString & inPath, + const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1100,7 +1100,7 @@ NeonSession::GET( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockReader, true, @@ -1111,9 +1111,9 @@ NeonSession::GET( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::GET( const rtl::OUString & inPath, +void NeonSession::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 ) @@ -1127,7 +1127,7 @@ void NeonSession::GET( const rtl::OUString & inPath, NeonRequestContext aCtx( ioOutputStream, inHeaderNames, ioResource ); int theRetVal = GET( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), NeonSession_ResponseBlockWriter, true, @@ -1136,7 +1136,7 @@ void NeonSession::GET( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::PUT( const rtl::OUString & inPath, +void NeonSession::PUT( const OUString & inPath, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1150,7 +1150,7 @@ void NeonSession::PUT( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = PUT( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1160,9 +1160,9 @@ void NeonSession::PUT( const rtl::OUString & inPath, } uno::Reference< io::XInputStream > -NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1178,7 +1178,7 @@ NeonSession::POST( const rtl::OUString & inPath, rtl::Reference< NeonInputStream > xInputStream( new NeonInputStream ); NeonRequestContext aCtx( xInputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1192,9 +1192,9 @@ NeonSession::POST( const rtl::OUString & inPath, return uno::Reference< io::XInputStream >( xInputStream.get() ); } -void NeonSession::POST( const rtl::OUString & inPath, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer, +void NeonSession::POST( const OUString & inPath, + const OUString & rContentType, + const OUString & rReferer, const uno::Reference< io::XInputStream > & inInputStream, uno::Reference< io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) @@ -1210,7 +1210,7 @@ void NeonSession::POST( const rtl::OUString & inPath, NeonRequestContext aCtx( oOutputStream ); int theRetVal = POST( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr(), reinterpret_cast< const char * >( aDataToSend.getConstArray() ), @@ -1222,7 +1222,7 @@ void NeonSession::POST( const rtl::OUString & inPath, HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::MKCOL( const rtl::OUString & inPath, +void NeonSession::MKCOL( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1231,14 +1231,14 @@ void NeonSession::MKCOL( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_mkcol( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); } -void NeonSession::COPY( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::COPY( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1253,18 +1253,18 @@ void NeonSession::COPY( const rtl::OUString & inSourceURL, int theRetVal = ne_copy( m_pHttpSession, inOverWrite ? 1 : 0, NE_DEPTH_INFINITE, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::MOVE( const rtl::OUString & inSourceURL, - const rtl::OUString & inDestinationURL, +void NeonSession::MOVE( const OUString & inSourceURL, + const OUString & inDestinationURL, const DAVRequestEnvironment & rEnv, sal_Bool inOverWrite ) throw ( DAVException ) @@ -1277,17 +1277,17 @@ void NeonSession::MOVE( const rtl::OUString & inSourceURL, NeonUri theDestinationUri( inDestinationURL ); int theRetVal = ne_move( m_pHttpSession, inOverWrite ? 1 : 0, - rtl::OUStringToOString( + OUStringToOString( theSourceUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr(), - rtl::OUStringToOString( + OUStringToOString( theDestinationUri.GetPath(), RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inSourceURL, rEnv ); } -void NeonSession::DESTROY( const rtl::OUString & inPath, +void NeonSession::DESTROY( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1296,7 +1296,7 @@ void NeonSession::DESTROY( const rtl::OUString & inPath, Init( rEnv ); int theRetVal = ne_delete( m_pHttpSession, - rtl::OUStringToOString( + OUStringToOString( inPath, RTL_TEXTENCODING_UTF8 ).getStr() ); HandleError( theRetVal, inPath, rEnv ); @@ -1332,7 +1332,7 @@ namespace } // namespace // Set new lock -void NeonSession::LOCK( const ::rtl::OUString & inPath, +void NeonSession::LOCK( const OUString & inPath, ucb::Lock & rLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1348,7 +1348,7 @@ void NeonSession::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; @@ -1386,10 +1386,10 @@ void NeonSession::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 ); @@ -1403,12 +1403,12 @@ void NeonSession::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( "NeonSession::LOCK: created lock for %s. token: %s", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); } @@ -1417,7 +1417,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, ne_lock_destroy( theLock ); OSL_TRACE( "NeonSession::LOCK: obtaining lock for %s failed!", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1425,7 +1425,7 @@ void NeonSession::LOCK( const ::rtl::OUString & inPath, } // Refresh existing lock -sal_Int64 NeonSession::LOCK( const ::rtl::OUString & inPath, +sal_Int64 NeonSession::LOCK( const OUString & inPath, sal_Int64 nTimeout, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) @@ -1492,7 +1492,7 @@ bool NeonSession::LOCK( NeonLock * pLock, } } -void NeonSession::UNLOCK( const ::rtl::OUString & inPath, +void NeonSession::UNLOCK( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1516,7 +1516,7 @@ void NeonSession::UNLOCK( const ::rtl::OUString & inPath, else { OSL_TRACE( "NeonSession::UNLOCK: unlocking of %s failed.", - rtl::OUStringToOString( makeAbsoluteURL( inPath ), + OUStringToOString( makeAbsoluteURL( inPath ), RTL_TEXTENCODING_UTF8 ).getStr() ); } @@ -1562,7 +1562,7 @@ const ucbhelper::InternetProxyServer & NeonSession::getProxySettings() const else { return m_rProxyDecider.getProxy( m_aScheme, - rtl::OUString() /* not used */, + OUString() /* not used */, -1 /* not used */ ); } } @@ -1574,7 +1574,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 ) { @@ -1587,7 +1587,7 @@ bool containsLocktoken( const uno::Sequence< ucb::Lock > & rLocks, } // namespace -bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, +bool NeonSession::removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ) { NeonLock * theLock = m_aNeonLockStore.findByUri( inURL ); @@ -1600,7 +1600,7 @@ bool NeonSession::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 ); @@ -1637,7 +1637,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // in propfind result -> not locked OSL_TRACE( "NeonSession::removeExpiredLocktoken: Removing " " expired lock token for %s. token: %s", - rtl::OUStringToOString( inURL, + OUStringToOString( inURL, RTL_TEXTENCODING_UTF8 ).getStr(), theLock->token ); @@ -1653,7 +1653,7 @@ bool NeonSession::removeExpiredLocktoken( const rtl::OUString & inURL, // Common error handler void NeonSession::HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) { @@ -1667,7 +1667,7 @@ void NeonSession::HandleError( int nError, 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 ); @@ -1744,7 +1744,7 @@ void NeonSession::HandleError( int nError, { OSL_TRACE( "NeonSession::HandleError : Unknown Neon error code!" ); throw DAVException( DAVException::DAV_HTTP_ERROR, - rtl::OUString::createFromAscii( + OUString::createFromAscii( ne_get_error( m_pHttpSession ) ) ); } } @@ -1755,12 +1755,12 @@ namespace { void runResponseHeaderHandler( void * userdata, const char * value ) { - rtl::OUString aHeader( rtl::OUString::createFromAscii( value ) ); + OUString aHeader( OUString::createFromAscii( value ) ); sal_Int32 nPos = aHeader.indexOf( ':' ); if ( nPos != -1 ) { - rtl::OUString aHeaderName( aHeader.copy( 0, nPos ) ); + OUString aHeaderName( aHeader.copy( 0, nPos ) ); NeonRequestContext * pCtx = static_cast< NeonRequestContext * >( userdata ); @@ -1771,9 +1771,9 @@ void runResponseHeaderHandler( void * userdata, if ( !bIncludeIt ) { // Check whether this header was requested. - std::vector< ::rtl::OUString >::const_iterator it( + std::vector< OUString >::const_iterator it( pCtx->pHeaderNames->begin() ); - const std::vector< ::rtl::OUString >::const_iterator end( + const std::vector< OUString >::const_iterator end( pCtx->pHeaderNames->end() ); while ( it != end ) @@ -1881,8 +1881,8 @@ int NeonSession::POST( ne_session * sess, const char * buffer, ne_block_reader reader, void * userdata, - const rtl::OUString & rContentType, - const rtl::OUString & rReferer ) + const OUString & rContentType, + const OUString & rReferer ) { ne_request * req = ne_request_create( sess, "POST", uri ); //struct get_context ctx; @@ -2024,9 +2024,9 @@ NeonSession::getDataFromInputStream( } sal_Bool -NeonSession::isDomainMatch( rtl::OUString certHostName ) +NeonSession::isDomainMatch( OUString certHostName ) { - rtl::OUString hostName = getHostName(); + OUString hostName = getHostName(); if (hostName.equalsIgnoreAsciiCase( certHostName ) ) return sal_True; @@ -2034,7 +2034,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) if ( 0 == certHostName.indexOf( '*' ) && hostName.getLength() >= certHostName.getLength() ) { - rtl::OUString cmpStr = certHostName.copy( 1 ); + OUString cmpStr = certHostName.copy( 1 ); if ( hostName.matchIgnoreAsciiCase( cmpStr, hostName.getLength() - cmpStr.getLength() ) ) @@ -2043,7 +2043,7 @@ NeonSession::isDomainMatch( rtl::OUString certHostName ) return sal_False; } -rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const +OUString NeonSession::makeAbsoluteURL( OUString const & rURL ) const { try { @@ -2051,7 +2051,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const if ( rURL[ 0 ] != sal_Unicode( '/' ) ) { // absolute. - return rtl::OUString( rURL ); + return OUString( rURL ); } else { @@ -2060,7 +2060,7 @@ rtl::OUString NeonSession::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() ); NeonUri aNeonUri( &aUri ); ne_uri_free( &aUri ); @@ -2071,7 +2071,7 @@ rtl::OUString NeonSession::makeAbsoluteURL( rtl::OUString const & rURL ) const { } // error. - return rtl::OUString(); + return OUString(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/ucb/source/ucp/webdav-neon/NeonSession.hxx b/ucb/source/ucp/webdav-neon/NeonSession.hxx index 7bad5029cda4..b01ab990711f 100644 --- a/ucb/source/ucp/webdav-neon/NeonSession.hxx +++ b/ucb/source/ucp/webdav-neon/NeonSession.hxx @@ -46,9 +46,9 @@ class NeonSession : public DAVSession { private: osl::Mutex m_aMutex; - rtl::OUString m_aScheme; - rtl::OUString m_aHostName; - rtl::OUString m_aProxyName; + OUString m_aScheme; + OUString m_aHostName; + OUString m_aProxyName; sal_Int32 m_nPort; sal_Int32 m_nProxyPort; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > m_aFlags; @@ -71,13 +71,13 @@ protected: public: NeonSession( const rtl::Reference< DAVSessionFactory > & rSessionFactory, - const rtl::OUString& inUri, + const OUString& inUri, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags, const ucbhelper::InternetProxyDecider & rProxyDecider ) throw ( DAVException ); // DAVSession methods - virtual sal_Bool CanUse( const ::rtl::OUString & inPath, + virtual sal_Bool CanUse( const OUString & inPath, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue >& rFlags ); virtual sal_Bool UsesProxy(); @@ -86,89 +86,89 @@ public: { return m_aEnv; } virtual void - OPTIONS( const ::rtl::OUString & inPath, + OPTIONS( const OUString & inPath, DAVCapabilities & outCapabilities, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); // 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 ); 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< @@ -177,41 +177,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 ); @@ -219,14 +219,14 @@ public: virtual void abort() throw ( DAVException ); - const rtl::OUString & getHostName() const { return m_aHostName; } + const OUString & getHostName() const { return m_aHostName; } const ::uno::Reference< ::uno::XComponentContext > getComponentContext() { return m_xFactory->getComponentContext(); } const void * getRequestData() const { return m_pRequestData; } - sal_Bool isDomainMatch( rtl::OUString certHostName ); + sal_Bool isDomainMatch( OUString certHostName ); private: friend class NeonLockStore; @@ -239,13 +239,13 @@ private: // ret: true => retry request. void HandleError( int nError, - const rtl::OUString & inPath, + const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ); const ucbhelper::InternetProxyServer & getProxySettings() const; - bool removeExpiredLocktoken( const rtl::OUString & inURL, + bool removeExpiredLocktoken( const OUString & inURL, const DAVRequestEnvironment & rEnv ); // refresh lock, called by NeonLockStore::refreshLocks @@ -276,8 +276,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 > static bool getDataFromInputStream( @@ -286,7 +286,7 @@ private: com::sun::star::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); - rtl::OUString makeAbsoluteURL( rtl::OUString const & rURL ) const; + OUString makeAbsoluteURL( OUString const & rURL ) const; }; } // namespace webdav_ucp diff --git a/ucb/source/ucp/webdav-neon/NeonUri.cxx b/ucb/source/ucp/webdav-neon/NeonUri.cxx index bd2fa89c1db4..5dba6a2fd7fb 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.cxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.cxx @@ -90,22 +90,22 @@ NeonUri::NeonUri( const ne_uri * inUri ) if ( uri == 0 ) throw DAVException( DAVException::DAV_INVALID_ARG ); - init( rtl::OString( uri ), inUri ); + init( OString( uri ), inUri ); ne_free( uri ); calculateURI(); } -NeonUri::NeonUri( const rtl::OUString & inUri ) +NeonUri::NeonUri( const OUString & inUri ) throw ( DAVException ) { if ( inUri.isEmpty() ) 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 ); ne_uri theUri; @@ -121,7 +121,7 @@ NeonUri::NeonUri( const rtl::OUString & inUri ) calculateURI(); } -void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) +void NeonUri::init( const OString & rUri, const ne_uri * pUri ) { // Complete URI. const ne_uri * pUriDefs @@ -131,31 +131,31 @@ void NeonUri::init( const rtl::OString & rUri, const ne_uri * pUri ) &g_sUriDefaultsHTTPS : &g_sUriDefaultsHTTP; - mScheme = rtl::OStringToOUString( + mScheme = OStringToOUString( pUri->scheme ? pUri->scheme : pUriDefs->scheme, RTL_TEXTENCODING_UTF8 ); - mUserInfo = rtl::OStringToOUString( + mUserInfo = OStringToOUString( pUri->userinfo ? pUri->userinfo : pUriDefs->userinfo, RTL_TEXTENCODING_UTF8 ); - mHostName = rtl::OStringToOUString( + mHostName = OStringToOUString( pUri->host ? pUri->host : pUriDefs->host, RTL_TEXTENCODING_UTF8 ); mPort = pUri->port > 0 ? pUri->port : pUriDefs->port; - mPath = rtl::OStringToOUString( + mPath = OStringToOUString( pUri->path ? pUri->path : pUriDefs->path, RTL_TEXTENCODING_UTF8 ); if ( pUri->query ) { - mPath += rtl::OUString("?"); - mPath += rtl::OStringToOUString( + mPath += OUString("?"); + mPath += OStringToOUString( pUri->query, RTL_TEXTENCODING_UTF8 ); } if ( pUri->fragment ) { - mPath += rtl::OUString("#"); - mPath += rtl::OStringToOUString( + mPath += OUString("#"); + mPath += OStringToOUString( pUri->fragment, RTL_TEXTENCODING_UTF8 ); } } @@ -166,7 +166,7 @@ NeonUri::~NeonUri( ) void NeonUri::calculateURI () { - rtl::OUStringBuffer aBuf( mScheme ); + OUStringBuffer aBuf( mScheme ); aBuf.appendAscii( "://" ); if ( !mUserInfo.isEmpty() ) { @@ -206,14 +206,14 @@ void NeonUri::calculateURI () if ( bAppendPort ) { aBuf.appendAscii( ":" ); - aBuf.append( rtl::OUString::valueOf( mPort ) ); + aBuf.append( OUString::valueOf( mPort ) ); } aBuf.append( mPath ); mURI = aBuf.makeStringAndClear(); } -::rtl::OUString NeonUri::GetPathBaseName () const +OUString NeonUri::GetPathBaseName () const { sal_Int32 nPos = mPath.lastIndexOf ('/'); sal_Int32 nTrail = 0; @@ -225,7 +225,7 @@ void NeonUri::calculateURI () } if (nPos != -1) { - rtl::OUString aTemp( + OUString aTemp( mPath.copy (nPos + 1, mPath.getLength () - nPos - 1 - nTrail) ); // query, fragment present? @@ -239,7 +239,7 @@ void NeonUri::calculateURI () return aTemp; } else - return rtl::OUString("/"); + return OUString("/"); } bool NeonUri::operator== ( const NeonUri & rOther ) const @@ -247,22 +247,22 @@ bool NeonUri::operator== ( const NeonUri & rOther ) const return ( mURI == rOther.mURI ); } -::rtl::OUString NeonUri::GetPathBaseNameUnescaped () const +OUString NeonUri::GetPathBaseNameUnescaped () const { return unescape( GetPathBaseName() ); } -void NeonUri::AppendPath (const rtl::OUString& rPath) +void NeonUri::AppendPath (const OUString& rPath) { if (mPath.lastIndexOf ('/') != mPath.getLength () - 1) - mPath += rtl::OUString("/"); + mPath += OUString("/"); mPath += rPath; calculateURI (); }; // static -rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) +OUString NeonUri::escapeSegment( const OUString& segment ) { return rtl::Uri::encode( segment, rtl_UriCharClassPchar, @@ -271,7 +271,7 @@ rtl::OUString NeonUri::escapeSegment( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) +OUString NeonUri::unescape( const OUString& segment ) { return rtl::Uri::decode( segment, rtl_UriDecodeWithCharset, @@ -279,10 +279,10 @@ rtl::OUString NeonUri::unescape( const rtl::OUString& segment ) } // static -rtl::OUString NeonUri::makeConnectionEndPointString( - const rtl::OUString & rHostName, int nPort ) +OUString NeonUri::makeConnectionEndPointString( + const OUString & rHostName, int nPort ) { - rtl::OUStringBuffer aBuf; + OUStringBuffer aBuf; // Is host a numeric IPv6 address? if ( ( rHostName.indexOf( ':' ) != -1 ) && @@ -300,7 +300,7 @@ rtl::OUString NeonUri::makeConnectionEndPointString( if ( ( nPort != DEFAULT_HTTP_PORT ) && ( nPort != DEFAULT_HTTPS_PORT ) ) { aBuf.appendAscii( ":" ); - 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-neon/NeonUri.hxx b/ucb/source/ucp/webdav-neon/NeonUri.hxx index 6bf446a7ea47..0650a70e45e5 100644 --- a/ucb/source/ucp/webdav-neon/NeonUri.hxx +++ b/ucb/source/ucp/webdav-neon/NeonUri.hxx @@ -43,18 +43,18 @@ namespace webdav_ucp class NeonUri { private: - ::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 rtl::OString & rUri, const ne_uri * pUri ); + void init( const OString & rUri, const ne_uri * pUri ); void calculateURI (); public: - NeonUri( const ::rtl::OUString & inUri ) throw ( DAVException ); + NeonUri( const OUString & inUri ) throw ( DAVException ); NeonUri( const ne_uri * inUri ) throw ( DAVException ); ~NeonUri( ); @@ -62,36 +62,36 @@ class NeonUri bool operator!= ( const NeonUri & rOther ) const { return !operator==( rOther ); } - 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-neon/UCBDeadPropertyValue.cxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx index 780e45f35461..8a7cdec14cc7 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.cxx @@ -40,28 +40,28 @@ 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("string"); -const rtl::OUString UCBDeadPropertyValue::aTypeLong("long"); -const rtl::OUString UCBDeadPropertyValue::aTypeShort("short"); -const rtl::OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); -const rtl::OUString UCBDeadPropertyValue::aTypeChar("char"); -const rtl::OUString UCBDeadPropertyValue::aTypeByte("byte"); -const rtl::OUString UCBDeadPropertyValue::aTypeHyper("hyper"); -const rtl::OUString UCBDeadPropertyValue::aTypeFloat("float"); -const rtl::OUString UCBDeadPropertyValue::aTypeDouble("double"); +const OUString UCBDeadPropertyValue::aTypeString("string"); +const OUString UCBDeadPropertyValue::aTypeLong("long"); +const OUString UCBDeadPropertyValue::aTypeShort("short"); +const OUString UCBDeadPropertyValue::aTypeBoolean("boolean"); +const OUString UCBDeadPropertyValue::aTypeChar("char"); +const OUString UCBDeadPropertyValue::aTypeByte("byte"); +const OUString UCBDeadPropertyValue::aTypeHyper("hyper"); +const OUString UCBDeadPropertyValue::aTypeFloat("float"); +const OUString UCBDeadPropertyValue::aTypeDouble("double"); // static -const rtl::OUString UCBDeadPropertyValue::aXMLPre("<ucbprop><type>"); -const rtl::OUString UCBDeadPropertyValue::aXMLMid("</type><value>"); -const rtl::OUString UCBDeadPropertyValue::aXMLEnd("</value></ucbprop>"); +const OUString UCBDeadPropertyValue::aXMLPre("<ucbprop><type>"); +const OUString UCBDeadPropertyValue::aXMLMid("</type><value>"); +const OUString UCBDeadPropertyValue::aXMLEnd("</value></ucbprop>"); #define STATE_TOP (1) @@ -114,7 +114,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: @@ -122,7 +122,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 @@ -159,7 +159,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' @@ -174,7 +174,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(); @@ -195,9 +195,9 @@ static rtl::OUString encodeValue( const rtl::OUString & rValue ) } ////////////////////////////////////////////////////////////////////////// -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; @@ -214,7 +214,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos == nEnd ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } c = pValue[ nPos ]; @@ -226,7 +226,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 4 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 'e' == pValue[ nPos + 1 ] ) @@ -241,7 +241,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'l' == c ) @@ -251,7 +251,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -264,7 +264,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else if ( 'g' == c ) @@ -274,7 +274,7 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) if ( nPos > nEnd - 3 ) { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } if ( ( 't' == pValue[ nPos + 1 ] ) @@ -287,13 +287,13 @@ static rtl::OUString decodeValue( const rtl::OUString & rValue ) else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else { OSL_FAIL( "UCBDeadPropertyValue::decodeValue - syntax error!" ); - return rtl::OUString(); + return OUString(); } } else @@ -309,7 +309,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 ) ) ) && @@ -335,7 +335,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; @@ -361,7 +361,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; @@ -377,7 +377,7 @@ bool UCBDeadPropertyValue::createFromXML( const rtl::OString & rInData, else if ( aCtx.pType->equalsIgnoreAsciiCase( aTypeBoolean ) ) { if ( aStringValue.equalsIgnoreAsciiCase( - rtl::OUString("true") ) ) + OUString("true") ) ) rOutData <<= sal_Bool( sal_True ); else rOutData <<= sal_Bool( sal_False ); @@ -420,17 +420,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; @@ -441,7 +441,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 ) ) ) @@ -449,7 +449,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() ) @@ -457,7 +457,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() ) @@ -465,7 +465,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 ) ) ) @@ -473,7 +473,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 ) ) ) @@ -481,7 +481,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 ) ) ) @@ -489,7 +489,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 ) ) ) @@ -497,7 +497,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-neon/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx index c56a3f93b270..98a36a48471c 100644 --- a/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav-neon/UCBDeadPropertyValue.hxx @@ -38,27 +38,27 @@ namespace webdav_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 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 rtl::OUString aXMLPre; - static const rtl::OUString aXMLMid; - static const rtl::OUString aXMLEnd; + 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-neon/webdavcontent.cxx b/ucb/source/ucp/webdav-neon/webdavcontent.cxx index 6a3cb7b2d6cc..4ad76c4727e2 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.cxx @@ -332,20 +332,20 @@ 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( "com.sun.star.comp.ucb.WebDAVContent" ); + return OUString( "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( WEBDAV_CONTENT_SERVICE_NAME ); + = OUString( WEBDAV_CONTENT_SERVICE_NAME ); return aSNS; } @@ -356,7 +356,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; @@ -374,9 +374,9 @@ rtl::OUString SAL_CALL Content::getContentType() } if ( bFolder ) - return rtl::OUString( WEBDAV_COLLECTION_TYPE ); + return OUString( WEBDAV_COLLECTION_TYPE ); - return rtl::OUString( WEBDAV_CONTENT_TYPE ); + return OUString( WEBDAV_CONTENT_TYPE ); } //========================================================================= @@ -411,7 +411,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -431,7 +431,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -442,7 +442,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "No properties!" ), + OUString( "No properties!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -482,7 +482,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -516,7 +516,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -579,7 +579,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -599,7 +599,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -635,7 +635,7 @@ uno::Any SAL_CALL Content::execute( { ucbhelper::cancelCommandExecution( uno::makeAny( lang::IllegalArgumentException( - rtl::OUString( "Wrong argument type!" ), + OUString( "Wrong argument type!" ), static_cast< cppu::OWeakObject * >( this ), -1 ) ), Environment ); @@ -659,7 +659,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; @@ -698,7 +698,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, @@ -824,7 +824,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 ) @@ -933,14 +933,14 @@ Content::queryCreatableContentsInfo() // document. aSeq.getArray()[ 0 ].Type - = rtl::OUString( WEBDAV_CONTENT_TYPE ); + = OUString( 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; @@ -948,7 +948,7 @@ Content::queryCreatableContentsInfo() // folder. aSeq.getArray()[ 1 ].Type - = rtl::OUString( WEBDAV_COLLECTION_TYPE ); + = OUString( WEBDAV_COLLECTION_TYPE ); aSeq.getArray()[ 1 ].Attributes = ucb::ContentInfoAttribute::KIND_FOLDER; @@ -972,23 +972,23 @@ Content::createNewContent( const ucb::ContentInfo& Info ) if ( ( Info.Type != WEBDAV_COLLECTION_TYPE ) && ( 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("/"); + aURL += OUString("/"); sal_Bool isCollection; if ( Info.Type == WEBDAV_COLLECTION_TYPE ) { - aURL += rtl::OUString("New_Collection"); + aURL += OUString("New_Collection"); isCollection = sal_True; } else { - aURL += rtl::OUString("New_Content"); + aURL += OUString("New_Content"); isCollection = sal_False; } @@ -1012,7 +1012,7 @@ Content::createNewContent( const ucb::ContentInfo& Info ) //========================================================================= // virtual -rtl::OUString Content::getParentURL() +OUString Content::getParentURL() { // <scheme>:// -> "" // <scheme>://foo -> "" @@ -1021,7 +1021,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 ) ) @@ -1035,9 +1035,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 ) ); } //========================================================================= @@ -1052,7 +1052,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". @@ -1142,7 +1142,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( std::auto_ptr< ContentProperties > xCachedProps; std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP - rtl::OUString aUnescapedTitle; + OUString aUnescapedTitle; bool bHasAll = false; uno::Reference< ucb::XContentIdentifier > xIdentifier; rtl::Reference< ::ucbhelper::ContentProviderImplHelper > xProvider; @@ -1160,7 +1160,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. @@ -1192,7 +1192,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 ) ) { @@ -1208,7 +1208,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() ); @@ -1219,11 +1219,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 ) @@ -1289,7 +1289,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 ) ) @@ -1298,7 +1298,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, @@ -1358,7 +1358,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues( //xProps.reset( // new ContentProperties( aUnescapedTitle ) ); xProps->addProperty( - rtl::OUString( "Title" ), + OUString( "Title" ), uno::makeAny( aUnescapedTitle ), true ); } @@ -1368,16 +1368,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 ); } @@ -1394,12 +1394,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 ); } @@ -1408,10 +1408,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 >() ), @@ -1482,8 +1482,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; @@ -1493,7 +1493,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 ); @@ -1502,7 +1502,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1515,26 +1515,26 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsDocument" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "IsFolder" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "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! @@ -1562,7 +1562,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( catch ( DAVException const & ) { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Invalid content identifier!" ), + OUString( "Invalid content identifier!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1570,7 +1570,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= lang::IllegalArgumentException( - rtl::OUString( "Empty title not allowed!" ), + OUString( "Empty title not allowed!" ), static_cast< cppu::OWeakObject * >( this ), -1 ); } @@ -1578,7 +1578,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= beans::IllegalTypeException( - rtl::OUString( "Property value has wrong type!" ), + OUString( "Property value has wrong type!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1598,7 +1598,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( "Property is unknown!" ), + OUString( "Property is unknown!" ), static_cast< cppu::OWeakObject * >( this ) ); continue; } @@ -1607,21 +1607,21 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateCreated" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "DateModified" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else if ( rName == "MediaType" ) @@ -1629,14 +1629,14 @@ uno::Sequence< uno::Any > Content::setPropertyValues( // Read-only property! // (but could be writable, if 'getcontenttype' would be) aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } if ( rName == "CreatableContentsInfo" ) { // Read-only property! aRet[ n ] <<= lang::IllegalAccessException( - rtl::OUString( "Property is read-only!" ), + OUString( "Property is read-only!" ), static_cast< cppu::OWeakObject * >( this ) ); } else @@ -1701,7 +1701,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( else { aRet[ n ] <<= uno::Exception( - rtl::OUString( "No property set for storing the value!" ), + OUString( "No property set for storing the value!" ), static_cast< cppu::OWeakObject * >( this ) ); } } @@ -1746,9 +1746,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("/"); + aNewURL += OUString("/"); aNewURL += NeonUri::escapeSegment( aNewTitle ); @@ -1787,18 +1787,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("Exchange failed!"), + OUString("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 ); @@ -1809,7 +1809,7 @@ uno::Sequence< uno::Any > Content::setPropertyValues( { osl::Guard< osl::Mutex > aGuard( m_aMutex ); - aEvent.PropertyName = rtl::OUString("Title"); + aEvent.PropertyName = OUString("Title"); aEvent.OldValue = uno::makeAny( aOldTitle ); aEvent.NewValue = uno::makeAny( aNewTitle ); @@ -1858,7 +1858,7 @@ uno::Any Content::open( { // Error: Not a folder! - rtl::OUStringBuffer aMsg; + OUStringBuffer aMsg; if ( getResourceType( xEnv ) == FTP ) { // #114653# @@ -1893,7 +1893,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedOpenModeException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), sal_Int16( rArg.Mode ) ) ), xEnv ); @@ -1920,7 +1920,7 @@ uno::Any Content::open( xResAccess->setFlags( rArg.OpeningFlags ); DAVResource aResource; - std::vector< rtl::OUString > aHeaders; + std::vector< OUString > aHeaders; xResAccess->GET( xOut, aHeaders, aResource, xEnv ); m_bDidGetOrHead = true; @@ -1969,7 +1969,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 ); @@ -2006,7 +2006,7 @@ uno::Any Content::open( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2097,7 +2097,7 @@ void Content::post( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedDataSinkException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArg.Sink ) ), xEnv ); @@ -2116,13 +2116,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("/"); + aURL += OUString("/"); } sal_Int32 nLen = aURL.getLength(); @@ -2133,7 +2133,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? @@ -2165,7 +2165,7 @@ void Content::insert( throw( uno::Exception ) { sal_Bool bTransient, bCollection; - rtl::OUString aEscapedTitle; + OUString aEscapedTitle; SAL_WNODEPRECATED_DECLARATIONS_PUSH std::auto_ptr< DAVResourceAccess > xResAccess; SAL_WNODEPRECATED_DECLARATIONS_POP @@ -2185,11 +2185,11 @@ void Content::insert( { OSL_FAIL( "Content::insert - Title missing!" ); - uno::Sequence< rtl::OUString > aProps( 1 ); - aProps[ 0 ] = rtl::OUString("Title"); + uno::Sequence< OUString > aProps( 1 ); + aProps[ 0 ] = OUString("Title"); ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingPropertiesException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), aProps ) ), Environment ); @@ -2217,7 +2217,7 @@ void Content::insert( if ( !bTransient || ( bTransient && !bCollection ) ) { ucb::UnsupportedNameClashException aEx( - rtl::OUString( "Unable to write without overwrite!" ), + OUString( "Unable to write without overwrite!" ), static_cast< cppu::OWeakObject * >( this ), ucb::NameClash::ERROR ); @@ -2254,7 +2254,7 @@ void Content::insert( case ucbhelper::CONTINUATION_DISAPPROVE: // Abort. throw ucb::CommandFailedException( - rtl::OUString(), + OUString(), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2263,7 +2263,7 @@ void Content::insert( OSL_FAIL( "Content::insert - " "Unknown interaction selection!" ); throw ucb::CommandFailedException( - rtl::OUString( "Unknown interaction selection!" ), + OUString( "Unknown interaction selection!" ), uno::Reference< uno::XInterface >(), aExAsAny ); // break; @@ -2280,9 +2280,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("/"); + aURL += OUString("/"); aURL += aEscapedTitle; @@ -2332,7 +2332,7 @@ void Content::insert( } else { - rtl::OUString aTitle; + OUString aTitle; try { NeonUri aURI( aURL ); @@ -2345,7 +2345,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTitle ) ), @@ -2378,7 +2378,7 @@ void Content::insert( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::MissingInputStreamException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2421,7 +2421,7 @@ void Content::transfer( xResAccess.reset( new DAVResourceAccess( *m_xResAccess.get() ) ); } - rtl::OUString aTargetURI; + OUString aTargetURI; try { NeonUri sourceURI( rArgs.SourceURL ); @@ -2430,21 +2430,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( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAV_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); } else if ( aScheme == DAVS_URL_SCHEME ) { sourceURI.SetScheme( - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); } else { @@ -2453,7 +2453,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Unsupported URL scheme!" ), + OUString( "Unsupported URL scheme!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable @@ -2462,10 +2462,10 @@ void Content::transfer( if ( targetURI.GetScheme().toAsciiLowerCase() == WEBDAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); else if ( targetURI.GetScheme().toAsciiLowerCase() == DAV_URL_SCHEME ) targetURI.SetScheme( - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); // @@@ This implementation of 'transfer' only works // if the source and target are located at same host. @@ -2478,13 +2478,13 @@ void Content::transfer( { ucbhelper::cancelCommandExecution( uno::makeAny( ucb::InteractiveBadTransferURLException( - rtl::OUString( "Different hosts!" ), + OUString( "Different hosts!" ), static_cast< cppu::OWeakObject * >( this ) ) ), Environment ); // Unreachable } - rtl::OUString aTitle = rArgs.NewTitle; + OUString aTitle = rArgs.NewTitle; if ( aTitle.isEmpty() ) aTitle = sourceURI.GetPathBaseNameUnescaped(); @@ -2492,15 +2492,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("/"); + aTargetURL += OUString("/"); aTargetURL += aTitle; @@ -2599,7 +2599,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::NameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aTargetURI ) ), @@ -2618,7 +2618,7 @@ void Content::transfer( ucbhelper::cancelCommandExecution( uno::makeAny( ucb::UnsupportedNameClashException( - rtl::OUString(), + OUString(), static_cast< cppu::OWeakObject * >( this ), rArgs.NameClash ) ), Environment ); @@ -2706,7 +2706,7 @@ void Content::lock( uno::Any aOwnerAny; aOwnerAny - <<= rtl::OUString("http://ucb.openoffice.org"); + <<= OUString("http://ucb.openoffice.org"); ucb::Lock aLock( ucb::LockScope_EXCLUSIVE, @@ -2715,7 +2715,7 @@ void Content::lock( aOwnerAny, 180, // lock timeout in secs //-1, // infinite lock - uno::Sequence< ::rtl::OUString >() ); + uno::Sequence< OUString >() ); xResAccess->LOCK( aLock, Environment ); @@ -2783,7 +2783,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 ) ) @@ -2803,9 +2803,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(), @@ -2840,7 +2840,7 @@ sal_Bool Content::isFolder( } uno::Sequence< beans::Property > aProperties( 1 ); - aProperties[ 0 ].Name = rtl::OUString("IsFolder"); + aProperties[ 0 ].Name = OUString("IsFolder"); aProperties[ 0 ].Handle = -1; uno::Reference< sdbc::XRow > xRow( getPropertyValues( aProperties, xEnv ) ); if ( xRow.is() ) @@ -2863,12 +2863,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(static_cast<sal_Unicode>('/')); + aURL += OUString(static_cast<sal_Unicode>('/')); aURL += m_aEscapedTitle; } @@ -2883,13 +2883,13 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) { uno::Sequence< uno::Any > aArgs( 1 ); aArgs[ 0 ] <<= beans::PropertyValue( - rtl::OUString("Uri"), -1, + OUString("Uri"), -1, uno::makeAny(aURL), beans::PropertyState_DIRECT_VALUE); aException <<= ucb::InteractiveAugmentedIOException( - rtl::OUString("Not found!"), + OUString("Not found!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, ucb::IOErrorCode_NOT_EXISTING, @@ -2924,7 +2924,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() ); @@ -2941,7 +2941,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() ); @@ -2962,7 +2962,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; @@ -2970,7 +2970,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked!"), + OUString("Locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2980,7 +2980,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCKED_SELF: aException <<= ucb::InteractiveLockingLockedException( - rtl::OUString("Locked (self!)"), + OUString("Locked (self!)"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL, @@ -2990,7 +2990,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_NOT_LOCKED: aException <<= ucb::InteractiveLockingNotLockedException( - rtl::OUString("Not locked!"), + OUString("Not locked!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -2999,7 +2999,7 @@ uno::Any Content::MapDAVException( const DAVException & e, sal_Bool bWrite ) case DAVException::DAV_LOCK_EXPIRED: aException <<= ucb::InteractiveLockingLockExpiredException( - rtl::OUString("Lock expired!"), + OUString("Lock expired!"), static_cast< cppu::OWeakObject * >( this ), task::InteractionClassification_ERROR, aURL ); @@ -3008,7 +3008,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; @@ -3044,7 +3044,7 @@ void Content::cancelCommandExecution( //========================================================================= SAL_WNODEPRECATED_DECLARATIONS_PUSH -const rtl::OUString +const OUString Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) { osl::Guard< osl::Mutex > aGuard( m_aMutex ); @@ -3052,8 +3052,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( "Content-Location" ) ) >>= aLocation; + OUString aLocation; + m_xCachedProps->getValue( OUString( "Content-Location" ) ) >>= aLocation; if ( !aLocation.isEmpty() ) { try @@ -3070,7 +3070,7 @@ Content::getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ) } } - return rtl::OUString( rResAccess->getURL() ); + return OUString( rResAccess->getURL() ); } //========================================================================= @@ -3089,8 +3089,8 @@ Content::ResourceType Content::getResourceType( ResourceType eResourceType = UNKNOWN; - const rtl::OUString & rURL = rResAccess->getURL(); - const rtl::OUString aScheme( + const OUString & rURL = rResAccess->getURL(); + const OUString aScheme( rURL.copy( 0, rURL.indexOf( ':' ) ).toAsciiLowerCase() ); if ( aScheme == FTP_URL_SCHEME ) @@ -3105,12 +3105,12 @@ 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("IsFolder"); - aProperties[ 1 ].Name = rtl::OUString("IsDocument"); - aProperties[ 2 ].Name = rtl::OUString("IsReadOnly"); - aProperties[ 3 ].Name = rtl::OUString("MediaType"); + aProperties[ 0 ].Name = OUString("IsFolder"); + aProperties[ 1 ].Name = OUString("IsDocument"); + aProperties[ 2 ].Name = OUString("IsReadOnly"); + aProperties[ 3 ].Name = OUString("MediaType"); aProperties[ 4 ].Name = DAVProperties::SUPPORTEDLOCK; ContentProperties::UCBNamesToDAVNames( aProperties, aPropNames ); diff --git a/ucb/source/ucp/webdav-neon/webdavcontent.hxx b/ucb/source/ucp/webdav-neon/webdavcontent.hxx index 83afb3f8f5c2..ca97b6d01cbe 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontent.hxx +++ b/ucb/source/ucp/webdav-neon/webdavcontent.hxx @@ -85,13 +85,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 > @@ -100,7 +100,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 ) @@ -129,7 +129,7 @@ private: ::com::sun::star::ucb::XContentIdentifier >& xNewId ); SAL_WNODEPRECATED_DECLARATIONS_PUSH - const rtl::OUString + const OUString getBaseURI( const std::auto_ptr< DAVResourceAccess > & rResAccess ); SAL_WNODEPRECATED_DECLARATIONS_POP @@ -228,16 +228,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 ); @@ -256,7 +256,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, @@ -265,7 +265,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 ); @@ -299,7 +299,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-neon/webdavcontentcaps.cxx b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx index 0c3cd9ac6456..92a5721371ee 100644 --- a/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx +++ b/ucb/source/ucp/webdav-neon/webdavcontentcaps.cxx @@ -62,7 +62,7 @@ using namespace webdav_ucp; //========================================================================= bool ContentProvider::getProperty( - const rtl::OUString & rPropName, beans::Property & rProp, bool bStrict ) + const OUString & rPropName, beans::Property & rProp, bool bStrict ) { if ( !m_pProps ) { @@ -78,15 +78,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 @@ -94,7 +94,7 @@ bool ContentProvider::getProperty( m_pProps->insert( beans::Property( - rtl::OUString( "IsFolder" ), + OUString( "IsFolder" ), -1, getCppuBooleanType(), beans::PropertyAttribute::BOUND @@ -102,16 +102,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 @@ -119,7 +119,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 @@ -127,15 +127,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 @@ -143,15 +143,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< @@ -165,7 +165,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 ) ); @@ -173,14 +173,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 ) ); @@ -188,7 +188,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 ) ); @@ -196,7 +196,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 ) ); @@ -204,7 +204,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 ) ); @@ -212,7 +212,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 ) ); @@ -229,7 +229,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 ) ); @@ -255,7 +255,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 ) ); } } @@ -280,7 +280,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 ); } @@ -315,7 +315,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. @@ -356,8 +356,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 && @@ -427,21 +427,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. @@ -450,34 +450,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(); SAL_WNODEPRECATED_DECLARATIONS_PUSH @@ -501,7 +501,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 ) @@ -528,23 +528,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 ) ) ); @@ -555,18 +555,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 ) ) ); @@ -577,7 +577,7 @@ uno::Sequence< ucb::CommandInfo > Content::getCommands( aCmdInfo[ 7 ] = ucb::CommandInfo( - rtl::OUString( "post" ), + OUString( "post" ), -1, getCppuType( static_cast< ucb::PostCommandArgument2 * >( 0 ) ) ); @@ -610,13 +610,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 ) ) ); @@ -631,13 +631,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-neon/webdavdatasupplier.cxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx index c33be5174602..e84faf900146 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx @@ -58,7 +58,7 @@ namespace webdav_ucp struct ResultListEntry { - rtl::OUString aId; + OUString aId; uno::Reference< ucb::XContentIdentifier > xId; uno::Reference< ucb::XContent > xContent; uno::Reference< sdbc::XRow > xRow; @@ -127,13 +127,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.isEmpty() ) { // Already cached. @@ -143,23 +143,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("/"); + aId += OUString("/"); aId += props.getEscapedTitle(); if ( props.isTrailingSlash() ) - aId += rtl::OUString("/"); + aId += OUString("/"); m_pImpl->m_aResults[ nIndex ].aId = aId; return aId; } - return rtl::OUString(); + return OUString(); } //========================================================================= @@ -180,7 +180,7 @@ DataSupplier::queryContentIdentifier( sal_uInt32 nIndex ) } } - rtl::OUString aId = queryContentIdentifierString( nIndex ); + OUString aId = queryContentIdentifierString( nIndex ); if ( !aId.isEmpty() ) { uno::Reference< ucb::XContentIdentifier > xId @@ -343,7 +343,7 @@ sal_Bool DataSupplier::getData() if ( !m_pImpl->m_bCountFinal ) { - std::vector< rtl::OUString > propertyNames; + std::vector< OUString > propertyNames; ContentProperties::UCBNamesToDAVNames( getResultSet()->getProperties(), propertyNames ); @@ -351,9 +351,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 ) @@ -390,7 +390,7 @@ sal_Bool DataSupplier::getData() { NeonUri aURI( m_pImpl->m_xContent->getResourceAccess().getURL() ); - rtl::OUString aPath = aURI.GetPath(); + OUString aPath = aURI.GetPath(); if ( aPath.getStr()[ aPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -410,7 +410,7 @@ sal_Bool DataSupplier::getData() try { NeonUri aCurrURI( rRes.uri ); - rtl::OUString aCurrPath = aCurrURI.GetPath(); + OUString aCurrPath = aCurrURI.GetPath(); if ( aCurrPath.getStr()[ aCurrPath.getLength() - 1 ] == sal_Unicode( '/' ) ) @@ -444,7 +444,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsFolder" ) ); + OUString( "IsFolder" ) ); rValue >>= bFolder; if ( !bFolder ) @@ -459,7 +459,7 @@ sal_Bool DataSupplier::getData() const uno::Any & rValue = pContentProperties->getValue( - rtl::OUString( "IsDocument" ) ); + OUString( "IsDocument" ) ); rValue >>= bDocument; if ( !bDocument ) diff --git a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx index 5e97a71f03ec..6d9be6b8056b 100644 --- a/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx @@ -54,7 +54,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-neon/webdavprovider.cxx b/ucb/source/ucp/webdav-neon/webdavprovider.cxx index 01b919cc71f0..389b0c5d466f 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.cxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.cxx @@ -94,8 +94,8 @@ XTYPEPROVIDER_IMPL_3( ContentProvider, //========================================================================= XSERVICEINFO_IMPL_1_CTX( ContentProvider, - rtl::OUString( "com.sun.star.comp.WebDAVContentProvider" ), - rtl::OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); + OUString( "com.sun.star.comp.WebDAVContentProvider" ), + OUString( WEBDAV_CONTENT_PROVIDER_SERVICE_NAME ) ); //========================================================================= // @@ -121,14 +121,14 @@ 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 && aScheme != DAVS_URL_SCHEME && aScheme != FTP_URL_SCHEME ) 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 ) ) @@ -146,21 +146,21 @@ ContentProvider::queryContent( { aURL = aURL.replaceAt( 0, WEBDAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAV_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAV_URL_SCHEME_LENGTH, - rtl::OUString( HTTP_URL_SCHEME ) ); + OUString( HTTP_URL_SCHEME ) ); bNewId = true; } else if ( aScheme == DAVS_URL_SCHEME ) { aURL = aURL.replaceAt( 0, DAVS_URL_SCHEME_LENGTH, - rtl::OUString( HTTPS_URL_SCHEME ) ); + OUString( HTTPS_URL_SCHEME ) ); bNewId = true; } @@ -175,7 +175,7 @@ ContentProvider::queryContent( nPos = aURL.indexOf( '/', nPos + 1 ); if ( nPos == -1 ) { - aURL += rtl::OUString("/"); + aURL += OUString("/"); bNewId = true; } } diff --git a/ucb/source/ucp/webdav-neon/webdavprovider.hxx b/ucb/source/ucp/webdav-neon/webdavprovider.hxx index 3793868d2b45..1e4b273c8770 100644 --- a/ucb/source/ucp/webdav-neon/webdavprovider.hxx +++ b/ucb/source/ucp/webdav-neon/webdavprovider.hxx @@ -115,7 +115,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 ); }; |