diff options
Diffstat (limited to 'ucb/source/ucp/webdav')
28 files changed, 284 insertions, 405 deletions
diff --git a/ucb/source/ucp/webdav/ContentProperties.cxx b/ucb/source/ucp/webdav/ContentProperties.cxx index 5d3187047c65..b63c51ba1448 100644 --- a/ucb/source/ucp/webdav/ContentProperties.cxx +++ b/ucb/source/ucp/webdav/ContentProperties.cxx @@ -421,7 +421,7 @@ void ContentProperties::addProperty( const DAVPropertyValue & rProp ) void ContentProperties::addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ) { if ( rName == DAVProperties::CREATIONDATE ) diff --git a/ucb/source/ucp/webdav/ContentProperties.hxx b/ucb/source/ucp/webdav/ContentProperties.hxx index 98bd884735ef..0287f09f45bd 100644 --- a/ucb/source/ucp/webdav/ContentProperties.hxx +++ b/ucb/source/ucp/webdav/ContentProperties.hxx @@ -42,20 +42,20 @@ struct DAVResource; class PropertyValue { private: - ::com::sun::star::uno::Any m_aValue; - bool m_bIsCaseSensitive; + css::uno::Any m_aValue; + bool m_bIsCaseSensitive; public: PropertyValue() : m_bIsCaseSensitive( true ) {} - explicit PropertyValue( const ::com::sun::star::uno::Any & rValue, + explicit PropertyValue( const css::uno::Any & rValue, bool bIsCaseSensitive ) : m_aValue( rValue), m_bIsCaseSensitive( bIsCaseSensitive ) {} bool isCaseSensitive() const { return m_bIsCaseSensitive; } - const ::com::sun::star::uno::Any & value() const { return m_aValue; } + const css::uno::Any & value() const { return m_aValue; } }; @@ -95,9 +95,7 @@ public: // DAVResourceAccess::PROPFIND. The result from PROPFIND // (vector< DAVResource >) can be used to create a ContentProperties // instance which can map DAV properties back to UCB properties. - static void UCBNamesToDAVNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToDAVNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -108,9 +106,7 @@ public: // DAVResourceAccess::HEAD. The result from HEAD (vector< DAVResource >) // can be used to create a ContentProperties instance which can map header // names back to UCB properties. - static void UCBNamesToHTTPNames( const com::sun::star::uno::Sequence< - com::sun::star::beans::Property > & - rProps, + static void UCBNamesToHTTPNames( const css::uno::Sequence< css::beans::Property > & rProps, std::vector< OUString > & resources, bool bIncludeUnmatched = true ); @@ -118,8 +114,7 @@ public: // this ContentProperties instance. Otherwiese, false will be returned. // rNamesNotContained contain the missing names. bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const; // adds all properties described by rProps that are actually contained in @@ -136,7 +131,7 @@ public: // overwrites probably existing entry. void addProperty( const OUString & rName, - const com::sun::star::uno::Any & rValue, + const css::uno::Any & rValue, bool bIsCaseSensitive ); // overwrites probably existing entry. @@ -156,7 +151,7 @@ private: std::unique_ptr< PropertyValueMap > m_xProps; bool m_bTrailingSlash; - static com::sun::star::uno::Any m_aEmptyAny; + static css::uno::Any m_aEmptyAny; ContentProperties & operator=( const ContentProperties & ); // n.i. @@ -179,12 +174,11 @@ public: void addProperties( const std::vector< DAVPropertyValue > & rProps ); bool containsAllNames( - const com::sun::star::uno::Sequence< - com::sun::star::beans::Property >& rProps, + const css::uno::Sequence< css::beans::Property >& rProps, std::vector< OUString > & rNamesNotContained ) const { return m_aProps.containsAllNames( rProps, rNamesNotContained ); } - const com::sun::star::uno::Any & + const css::uno::Any & getValue( const OUString & rName ) const { return m_aProps.getValue( rName ); } diff --git a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx index 2e0c91c9cf40..877b88712522 100644 --- a/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx +++ b/ucb/source/ucp/webdav/DAVAuthListenerImpl.hxx @@ -44,8 +44,7 @@ namespace http_dav_ucp public: DAVAuthListener_Impl( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment>& xEnv, + const css::uno::Reference<css::ucb::XCommandEnvironment>& xEnv, const OUString & inURL ) : m_xEnv( xEnv ), m_aURL( inURL ) { @@ -59,8 +58,7 @@ namespace http_dav_ucp bool bUsePreviousCredentials = true ) override; private: - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + const css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; const OUString m_aURL; OUString m_aPrevPassword; diff --git a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx index bc95075d2956..80ccc284f3b7 100644 --- a/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx +++ b/ucb/source/ucp/webdav/DAVRequestEnvironment.hxx @@ -34,15 +34,13 @@ struct DAVRequestEnvironment { OUString m_aRequestURI; rtl::Reference< DAVAuthListener > m_xAuthListener; -// rtl::Reference< DAVStatusListener > m_xStatusListener; -// rtl::Reference< DAVProgressListener > m_xStatusListener; DAVRequestHeaders m_aRequestHeaders; - com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; DAVRequestEnvironment( const OUString & rRequestURI, const rtl::Reference< DAVAuthListener > & xListener, const DAVRequestHeaders & rRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::ucb::XCommandEnvironment > & xEnv) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv) : m_aRequestURI( rRequestURI ), m_xAuthListener( xListener ), m_aRequestHeaders( rRequestHeaders ), diff --git a/ucb/source/ucp/webdav/DAVResource.hxx b/ucb/source/ucp/webdav/DAVResource.hxx index 77885b0bf087..5e91ba43382d 100644 --- a/ucb/source/ucp/webdav/DAVResource.hxx +++ b/ucb/source/ucp/webdav/DAVResource.hxx @@ -33,8 +33,8 @@ namespace http_dav_ucp struct DAVPropertyValue { OUString Name; - com::sun::star::uno::Any Value; - bool IsCaseSensitive; + css::uno::Any Value; + bool IsCaseSensitive; DAVPropertyValue() : IsCaseSensitive( true ) {} }; diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx index 6e51a42f99e7..b2f1af6a8c61 100644 --- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx @@ -50,16 +50,13 @@ class DAVResourceAccess OUString m_aPath; rtl::Reference< DAVSession > m_xSession; rtl::Reference< DAVSessionFactory > m_xSessionFactory; - com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > m_xContext; + css::uno::Reference< css::uno::XComponentContext > m_xContext; std::vector< SerfUri > m_aRedirectURIs; public: DAVResourceAccess() : m_xSessionFactory( 0 ) {} - DAVResourceAccess( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext > & rContext, - rtl::Reference< - DAVSessionFactory > const & rSessionFactory, + DAVResourceAccess( const css::uno::Reference< css::uno::XComponentContext > & rContext, + rtl::Reference< DAVSessionFactory > const & rSessionFactory, const OUString & rURL ); DAVResourceAccess( const DAVResourceAccess & rOther ); @@ -83,139 +80,114 @@ public: PROPFIND( const Depth nDepth, const std::vector< OUString > & rPropertyNames, std::vector< DAVResource > & rResources, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // propnames void PROPFIND( const Depth nDepth, std::vector< DAVResourceInfo > & rResInfo, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void PROPPATCH( const std::vector< ProppatchValue > & rValues, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void HEAD( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > - GET( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + css::uno::Reference< css::io::XInputStream > + GET( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + GET( css::uno::Reference< css::io::XOutputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > GET( const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > GET( DAVRequestHeaders & rRequestHeaders, const std::vector< rtl::OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - GET( com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rStream, + GET( css::uno::Reference< css::io::XOutputStream > & rStream, const std::vector< OUString > & rHeaderNames, // empty == 'all' DAVResource & rResource, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - PUT( const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + PUT( const css::uno::Reference< css::io::XInputStream > & rStream, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); - com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + css::uno::Reference< css::io::XInputStream > 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< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void POST( const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & rInputStream, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & rOutputStream, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& xEnv ) + const css::uno::Reference< css::io::XInputStream > & rInputStream, + css::uno::Reference< css::io::XOutputStream > & rOutputStream, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) throw ( DAVException ); void - MKCOL( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + MKCOL( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void COPY( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void MOVE( const OUString & rSourcePath, const OUString & rDestinationURI, bool bOverwrite, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void - DESTROY( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + DESTROY( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); // set new lock. void - LOCK( com::sun::star::ucb::Lock & inLock, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + LOCK( css::ucb::Lock & inLock, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw( DAVException ); #if 0 // currently not used, but please don't remove code // refresh existing lock. sal_Int64 LOCK( sal_Int64 nTimeout, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); #endif void - UNLOCK( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) + UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); void @@ -225,10 +197,9 @@ public: // helper static void getUserRequestHeaders( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, const rtl::OUString & rURI, - com::sun::star::ucb::WebDAVHTTPMethod eMethod, + css::ucb::WebDAVHTTPMethod eMethod, DAVRequestHeaders & rRequestHeaders ); private: diff --git a/ucb/source/ucp/webdav/DAVSession.hxx b/ucb/source/ucp/webdav/DAVSession.hxx index 0647a544a5c8..83caf7c92c51 100644 --- a/ucb/source/ucp/webdav/DAVSession.hxx +++ b/ucb/source/ucp/webdav/DAVSession.hxx @@ -100,18 +100,17 @@ public: const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -120,34 +119,30 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& o, + css::uno::Reference< css::io::XOutputStream >& o, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream >& s, + const css::uno::Reference< css::io::XInputStream >& s, const DAVRequestEnvironment & rEnv ) throw( DAVException ) = 0; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; 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< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; @@ -173,7 +168,7 @@ public: // set new lock. virtual void LOCK( const OUString & inPath, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) = 0; diff --git a/ucb/source/ucp/webdav/DAVSessionFactory.hxx b/ucb/source/ucp/webdav/DAVSessionFactory.hxx index 55e01f2c03fa..c1a8025b3fec 100644 --- a/ucb/source/ucp/webdav/DAVSessionFactory.hxx +++ b/ucb/source/ucp/webdav/DAVSessionFactory.hxx @@ -51,9 +51,7 @@ public: rtl::Reference< DAVSession > createDAVSession( const OUString & inUri, - const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& - rxContext ) + const css::uno::Reference< css::uno::XComponentContext >& rxContext ) throw( DAVException ); private: diff --git a/ucb/source/ucp/webdav/DAVTypes.hxx b/ucb/source/ucp/webdav/DAVTypes.hxx index 2c576757a772..e0130ab995a9 100644 --- a/ucb/source/ucp/webdav/DAVTypes.hxx +++ b/ucb/source/ucp/webdav/DAVTypes.hxx @@ -65,12 +65,12 @@ enum ProppatchOperation { PROPSET = 0, PROPREMOVE = 1 }; struct ProppatchValue { ProppatchOperation operation; - OUString name; - com::sun::star::uno::Any value; + OUString name; + css::uno::Any value; ProppatchValue( const ProppatchOperation o, const OUString & n, - const com::sun::star::uno::Any & v ) + const css::uno::Any & v ) : operation( o ), name( n ), value( v ) {} }; diff --git a/ucb/source/ucp/webdav/DateTimeHelper.hxx b/ucb/source/ucp/webdav/DateTimeHelper.hxx index eede6f8229e9..91d1e2be9bc5 100644 --- a/ucb/source/ucp/webdav/DateTimeHelper.hxx +++ b/ucb/source/ucp/webdav/DateTimeHelper.hxx @@ -41,14 +41,14 @@ private: static sal_Int32 convertMonthToInt (const OUString& ); static bool ISO8601_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); static bool RFC2068_To_DateTime (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); public: static bool convert (const OUString&, - ::com::sun::star::util::DateTime& ); + css::util::DateTime& ); }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/PropertyMap.hxx b/ucb/source/ucp/webdav/PropertyMap.hxx index 25ed28639517..63f345810a02 100644 --- a/ucb/source/ucp/webdav/PropertyMap.hxx +++ b/ucb/source/ucp/webdav/PropertyMap.hxx @@ -29,8 +29,8 @@ namespace http_dav_ucp { struct equalPropertyName { - bool operator()( const ::com::sun::star::beans::Property & p1, - const ::com::sun::star::beans::Property & p2 ) const + bool operator()( const css::beans::Property & p1, + const css::beans::Property & p2 ) const { return !!( p1.Name == p2.Name ); } @@ -38,7 +38,7 @@ struct equalPropertyName struct hashPropertyName { - size_t operator()( const ::com::sun::star::beans::Property & p ) const + size_t operator()( const css::beans::Property & p ) const { return p.Name.hashCode(); } @@ -46,7 +46,7 @@ struct hashPropertyName typedef std::unordered_set < - ::com::sun::star::beans::Property, + css::beans::Property, hashPropertyName, equalPropertyName > diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx index 8c9ee4a91ebc..470e730615ba 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.cxx @@ -26,7 +26,7 @@ namespace http_dav_ucp SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + const css::uno::Reference< SerfInputStream > & xioInStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream( xioInStrm ) , xOutputStream() @@ -37,7 +37,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const css::uno::Reference< SerfInputStream > & xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) @@ -50,7 +50,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , xInputStream() , xOutputStream( xioOutStrm ) @@ -61,7 +61,7 @@ SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, SerfGetReqProcImpl::SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) diff --git a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx index 2c382398508c..a91c5405f73a 100644 --- a/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfGetReqProcImpl.hxx @@ -37,21 +37,21 @@ class SerfGetReqProcImpl : public SerfRequestProcessorImpl public: SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + const css::uno::Reference< SerfInputStream > & xioInStrm ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm, + const css::uno::Reference< SerfInputStream > & xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ); SerfGetReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm, + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource ); @@ -71,8 +71,8 @@ protected: void handleEndOfResponseData( serf_bucket_t * inSerfResponseBucket ) override; private: - com::sun::star::uno::Reference< SerfInputStream > xInputStream; - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + css::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< css::io::XOutputStream > xOutputStream; const std::vector< OUString > * mpHeaderNames; DAVResource* mpResource; }; diff --git a/ucb/source/ucp/webdav/SerfInputStream.cxx b/ucb/source/ucp/webdav/SerfInputStream.cxx index 0c3a5b68d054..66ef8bb8c20f 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.cxx +++ b/ucb/source/ucp/webdav/SerfInputStream.cxx @@ -73,11 +73,11 @@ Any SerfInputStream::queryInterface( const Type &type ) // "Reads" the specified number of bytes from the stream sal_Int32 SAL_CALL SerfInputStream::readBytes( - ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) { // Work out how much we're actually going to write sal_Int32 theBytes2Read = nBytesToRead; @@ -102,11 +102,11 @@ sal_Int32 SAL_CALL SerfInputStream::readBytes( // readSomeBytes sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( - ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) { // Warning: What should this be doing ? return readBytes( aData, nMaxBytesToRead ); @@ -117,10 +117,10 @@ sal_Int32 SAL_CALL SerfInputStream::readSomeBytes( // Moves the current stream position forward void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) { mPos += nBytesToSkip; if ( mPos >= mLen ) @@ -132,9 +132,9 @@ void SAL_CALL SerfInputStream::skipBytes( sal_Int32 nBytesToSkip ) // Returns the number of unread bytes currently remaining on the stream sal_Int32 SAL_CALL SerfInputStream::available( ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) { return sal::static_int_cast<sal_Int32>(mLen - mPos); } @@ -143,9 +143,9 @@ sal_Int32 SAL_CALL SerfInputStream::available( ) // closeInput void SAL_CALL SerfInputStream::closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) { } @@ -153,25 +153,25 @@ void SAL_CALL SerfInputStream::closeInput() // seek void SAL_CALL SerfInputStream::seek( sal_Int64 location ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException ) { if ( location < 0 ) - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); if ( location <= mLen ) mPos = location; else - throw ::com::sun::star::lang::IllegalArgumentException(); + throw css::lang::IllegalArgumentException(); } // getPosition sal_Int64 SAL_CALL SerfInputStream::getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::IOException, + css::uno::RuntimeException ) { return mPos; } @@ -180,8 +180,8 @@ sal_Int64 SAL_CALL SerfInputStream::getPosition() // getLength sal_Int64 SAL_CALL SerfInputStream::getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) + throw( css::io::IOException, + css::uno::RuntimeException ) { return mLen; } diff --git a/ucb/source/ucp/webdav/SerfInputStream.hxx b/ucb/source/ucp/webdav/SerfInputStream.hxx index 81c42e538874..328a79ca5ea7 100644 --- a/ucb/source/ucp/webdav/SerfInputStream.hxx +++ b/ucb/source/ucp/webdav/SerfInputStream.hxx @@ -36,12 +36,12 @@ namespace http_dav_ucp // A simple XInputStream implementation provided specifically for use // by the DAVSession::GET method. -class SerfInputStream : public ::com::sun::star::io::XInputStream, - public ::com::sun::star::io::XSeekable, +class SerfInputStream : public css::io::XInputStream, + public css::io::XSeekable, public ::cppu::OWeakObject { private: - com::sun::star::uno::Sequence< sal_Int8 > mInputBuffer; + css::uno::Sequence< sal_Int8 > mInputBuffer; sal_Int64 mLen; sal_Int64 mPos; @@ -53,9 +53,8 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, void AddToStream( const char * inBuf, sal_Int32 inLen ); // XInterface - virtual com::sun::star::uno::Any SAL_CALL queryInterface( - const ::com::sun::star::uno::Type & type ) - throw( ::com::sun::star::uno::RuntimeException ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & type ) + throw( css::uno::RuntimeException ) override; virtual void SAL_CALL acquire() throw () override @@ -68,50 +67,50 @@ class SerfInputStream : public ::com::sun::star::io::XInputStream, // XInputStream virtual sal_Int32 SAL_CALL readBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL readSomeBytes( - ::com::sun::star::uno::Sequence< sal_Int8 > & aData, + css::uno::Sequence< sal_Int8 > & aData, sal_Int32 nMaxBytesToRead ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::BufferSizeExceededException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::BufferSizeExceededException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int32 SAL_CALL available() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual void SAL_CALL closeInput() - throw( ::com::sun::star::io::NotConnectedException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::NotConnectedException, + css::io::IOException, + css::uno::RuntimeException ) override; // XSeekable virtual void SAL_CALL seek( sal_Int64 location ) - throw( ::com::sun::star::lang::IllegalArgumentException, - ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::lang::IllegalArgumentException, + css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getPosition() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::IOException, + css::uno::RuntimeException ) override; virtual sal_Int64 SAL_CALL getLength() - throw( ::com::sun::star::io::IOException, - ::com::sun::star::uno::RuntimeException ) override; + throw( css::io::IOException, + css::uno::RuntimeException ) override; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx index 89d4e2fe5bf7..08c757627a62 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.cxx @@ -32,7 +32,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ) + const css::uno::Reference< SerfInputStream > & xioInStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpPostData( inData ) , mnPostDataLen( inDataLen ) @@ -49,7 +49,7 @@ SerfPostReqProcImpl::SerfPostReqProcImpl( const char* inPath, apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ) + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ) : SerfRequestProcessorImpl( inPath, inRequestHeaders ) , mpPostData( inData ) , mnPostDataLen( inDataLen ) diff --git a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx index 9d04e27ef22f..4696f7fe5898 100644 --- a/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPostReqProcImpl.hxx @@ -37,7 +37,7 @@ public: apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< SerfInputStream > & xioInStrm ); + const css::uno::Reference< SerfInputStream > & xioInStrm ); SerfPostReqProcImpl( const char* inPath, const DAVRequestHeaders& inRequestHeaders, @@ -45,7 +45,7 @@ public: apr_size_t inDataLen, const char* inContentType, const char* inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > & xioOutStrm ); + const css::uno::Reference< css::io::XOutputStream > & xioOutStrm ); virtual ~SerfPostReqProcImpl(); @@ -64,8 +64,8 @@ private: apr_size_t mnPostDataLen; const char* mpContentType; const char* mpReferer; - com::sun::star::uno::Reference< SerfInputStream > xInputStream; - com::sun::star::uno::Reference< com::sun::star::io::XOutputStream > xOutputStream; + css::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< css::io::XOutputStream > xOutputStream; }; diff --git a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx index 955cebd1c7b8..4c3db5db7c92 100644 --- a/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx +++ b/ucb/source/ucp/webdav/SerfPropFindReqProcImpl.hxx @@ -67,7 +67,7 @@ private: std::vector< DAVResourceInfo > * mpResInfo; const bool mbOnlyPropertyNames; - com::sun::star::uno::Reference< SerfInputStream > xInputStream; + css::uno::Reference< SerfInputStream > xInputStream; }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx index cb3ab7e48d9d..ff6b2e63af2b 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.cxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.cxx @@ -129,7 +129,7 @@ bool SerfRequestProcessor::processPropPatch( const std::vector< ProppatchValue > } // GET -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mpProcImpl = new SerfGetReqProcImpl( mPathStr, @@ -141,7 +141,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser } // GET inclusive header fields -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) @@ -157,7 +157,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< Ser } // GET -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mpProcImpl = new SerfGetReqProcImpl( mPathStr, @@ -169,7 +169,7 @@ bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com } // GET inclusive header fields -bool SerfRequestProcessor::processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, +bool SerfRequestProcessor::processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ) @@ -223,7 +223,7 @@ bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( SerfSession::getAprPool(), @@ -247,7 +247,7 @@ bool SerfRequestProcessor::processPost( const char* inData, apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ) { mContentType = apr_pstrdup( SerfSession::getAprPool(), diff --git a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx index 771981ee0d22..301b9f5952ed 100644 --- a/ucb/source/ucp/webdav/SerfRequestProcessor.hxx +++ b/ucb/source/ucp/webdav/SerfRequestProcessor.hxx @@ -64,21 +64,21 @@ public: apr_status_t& outSerfStatus ); // GET - bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // GET inclusive header fields - bool processGet( const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + bool processGet( const css::uno::Reference< SerfInputStream >& xioInStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); // GET - bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + bool processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); // GET inclusive header fields - bool processGet( const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + bool processGet( const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, apr_status_t& outSerfStatus ); @@ -98,7 +98,7 @@ public: apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< SerfInputStream >& xioInStrm, + const css::uno::Reference< SerfInputStream >& xioInStrm, apr_status_t& outSerfStatus ); // POST @@ -106,7 +106,7 @@ public: apr_size_t inDataLen, const OUString & inContentType, const OUString & inReferer, - const com::sun::star::uno::Reference< com::sun::star::io::XOutputStream >& xioOutStrm, + const css::uno::Reference< css::io::XOutputStream >& xioOutStrm, apr_status_t& outSerfStatus ); // DELETE diff --git a/ucb/source/ucp/webdav/SerfSession.hxx b/ucb/source/ucp/webdav/SerfSession.hxx index e595c17da44c..bf0ee4f0d99e 100644 --- a/ucb/source/ucp/webdav/SerfSession.hxx +++ b/ucb/source/ucp/webdav/SerfSession.hxx @@ -147,19 +147,18 @@ public: bool isHeadRequestInProgress(); - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > GET( const OUString & inPath, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, @@ -168,8 +167,7 @@ public: virtual void GET( const OUString & inPath, - com::sun::star::uno::Reference< - com::sun::star::io::XOutputStream > & ioOutputStream, + css::uno::Reference< css::io::XOutputStream > & ioOutputStream, const std::vector< OUString > & inHeaderNames, DAVResource & ioResource, const DAVRequestEnvironment & rEnv ) @@ -177,17 +175,15 @@ public: virtual void PUT( const OUString & inPath, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; - virtual com::sun::star::uno::Reference< com::sun::star::io::XInputStream > + virtual css::uno::Reference< css::io::XInputStream > POST( const OUString & inPath, const OUString & rContentType, const OUString & rReferer, - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & inInputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -195,10 +191,8 @@ public: 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< - com::sun::star::io::XOutputStream > & oOutputStream, + const css::uno::Reference< css::io::XInputStream > & inInputStream, + css::uno::Reference< css::io::XOutputStream > & oOutputStream, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -227,7 +221,7 @@ public: // set new lock. virtual void LOCK( const OUString & inURL, - com::sun::star::ucb::Lock & inLock, + css::ucb::Lock & inLock, const DAVRequestEnvironment & rEnv ) throw ( DAVException ) override; @@ -273,42 +267,12 @@ private: // unlock, called by SerfLockStore::~SerfLockStore void UNLOCK( const OUString& rLock ); - /* - // low level GET implementation, used by public GET implementations - static int GET( serf_connection_t * sess, - const char * uri, - //ne_block_reader reader, - bool getheaders, - void * userdata ); - - // Buffer-based PUT implementation. Serf only has file descriptor- - // based API. - static int PUT( serf_connection_t * sess, - const char * uri, - const char * buffer, - size_t size ); - - // Buffer-based POST implementation. Serf only has file descriptor- - // based API. - int POST( serf_connection_t * sess, - const char * uri, - const char * buffer, - //ne_block_reader reader, - void * userdata, - const OUString & rContentType, - const OUString & rReferer ); - */ - // Helper: XInputStream -> Sequence< sal_Int8 > static bool getDataFromInputStream( - const com::sun::star::uno::Reference< - com::sun::star::io::XInputStream > & xStream, - com::sun::star::uno::Sequence< sal_Int8 > & rData, + const css::uno::Reference< + css::io::XInputStream > & xStream, + css::uno::Sequence< sal_Int8 > & rData, bool bAppendTrailingZeroByte ); - - /* - OUString makeAbsoluteURL( OUString const & rURL ) const; - */ }; } // namespace http_dav_ucp diff --git a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx index c76da376b1d7..c1cd5addfd9c 100644 --- a/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx +++ b/ucb/source/ucp/webdav/UCBDeadPropertyValue.hxx @@ -46,11 +46,11 @@ private: static const OUString aXMLEnd; public: - static bool supportsType( const com::sun::star::uno::Type & rType ); + static bool supportsType( const css::uno::Type & rType ); static bool createFromXML( const OString & rInData, - com::sun::star::uno::Any & rOutData ); - static bool toXML( const com::sun::star::uno::Any & rInData, + css::uno::Any & rOutData ); + static bool toXML( const css::uno::Any & rInData, OUString & rOutData ); }; diff --git a/ucb/source/ucp/webdav/webdavcontent.cxx b/ucb/source/ucp/webdav/webdavcontent.cxx index 9dbfd921721f..1fb3547f7de6 100644 --- a/ucb/source/ucp/webdav/webdavcontent.cxx +++ b/ucb/source/ucp/webdav/webdavcontent.cxx @@ -848,7 +848,7 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ ) -void Content::addProperty( const com::sun::star::ucb::PropertyCommandArgument &aCmdArg, +void Content::addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, const uno::Reference< ucb::XCommandEnvironment >& xEnv ) throw( beans::PropertyExistException, beans::IllegalTypeException, diff --git a/ucb/source/ucp/webdav/webdavcontent.hxx b/ucb/source/ucp/webdav/webdavcontent.hxx index 364b5478c68a..5aa918015156 100644 --- a/ucb/source/ucp/webdav/webdavcontent.hxx +++ b/ucb/source/ucp/webdav/webdavcontent.hxx @@ -66,7 +66,7 @@ class ContentProperties; class CachableContentProperties; class Content : public ::ucbhelper::ContentImplHelper, - public com::sun::star::ucb::XContentCreator + public css::ucb::XContentCreator { enum ResourceType { @@ -87,142 +87,118 @@ class Content : public ::ucbhelper::ContentImplHelper, std::vector< OUString > m_aFailedPropNames; private: - virtual com::sun::star::uno::Sequence< com::sun::star::beans::Property > - getProperties( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; - virtual com::sun::star::uno::Sequence< com::sun::star::ucb::CommandInfo > - getCommands( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::beans::Property > + getProperties( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; + virtual css::uno::Sequence< css::ucb::CommandInfo > + getCommands( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) override; virtual OUString getParentURL() override; - bool isFolder( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + bool isFolder( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Sequence< css::beans::Property >& rProperties, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); - ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > - setPropertyValues( const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::PropertyValue >& rValues, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + css::uno::Sequence< css::uno::Any > + setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& rValues, + const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); typedef rtl::Reference< Content > ContentRef; typedef std::list< ContentRef > ContentRefList; void queryChildren( ContentRefList& rChildren); bool - exchangeIdentity( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& xNewId ); + exchangeIdentity( const css::uno::Reference< css::ucb::XContentIdentifier >& xNewId ); const OUString getBaseURI( const std::unique_ptr< DAVResourceAccess > & rResAccess ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv ) - throw ( ::com::sun::star::uno::Exception ); + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv ) + throw ( css::uno::Exception ); ResourceType - getResourceType( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XCommandEnvironment >& xEnv, + getResourceType( const css::uno::Reference< css::ucb::XCommandEnvironment >& xEnv, const std::unique_ptr< DAVResourceAccess > & rResAccess, bool * networkAccessAllowed = 0 ) - throw ( ::com::sun::star::uno::Exception ); + throw ( css::uno::Exception ); // Command "open" - com::sun::star::uno::Any open( - const com::sun::star::ucb::OpenCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + css::uno::Any open( + const css::ucb::OpenCommandArgument2 & rArg, + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); // Command "post" - void post( const com::sun::star::ucb::PostCommandArgument2 & rArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv ) - throw( ::com::sun::star::uno::Exception ); + void post( const css::ucb::PostCommandArgument2 & rArg, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + throw( css::uno::Exception ); // Command "insert" - void insert( const ::com::sun::star::uno::Reference< - ::com::sun::star::io::XInputStream > & xInputStream, + void insert( const css::uno::Reference< css::io::XInputStream > & xInputStream, bool bReplaceExisting, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "transfer" - void transfer( const ::com::sun::star::ucb::TransferInfo & rArgs, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void transfer( const css::ucb::TransferInfo & rArgs, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "delete" void destroy( bool bDeletePhysical ) - throw( ::com::sun::star::uno::Exception ); + throw( css::uno::Exception ); // Command "lock" - void lock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void lock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); // Command "unlock" - void unlock( const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( ::com::sun::star::uno::Exception ); + void unlock( const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception ); - ::com::sun::star::uno::Any MapDAVException( const DAVException & e, + css::uno::Any MapDAVException( const DAVException & e, bool bWrite ); void cancelCommandExecution( const DAVException & e, - const ::com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > & xEnv, + const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv, bool bWrite = false ) - throw( ::com::sun::star::uno::Exception ); + throw( css::uno::Exception ); static bool shouldAccessNetworkAfterException( const DAVException & e ); bool supportsExclusiveWriteLock( - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ); // XPropertyContainer replacement - void addProperty( const com::sun::star::ucb::PropertyCommandArgument &aCmdArg, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ); + void addProperty( const css::ucb::PropertyCommandArgument &aCmdArg, + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException ); void removeProperty( const rtl::OUString& Name, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ); + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException ); public: - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory ) - throw ( ::com::sun::star::ucb::ContentCreationException ); - Content( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rxContext, + throw ( css::ucb::ContentCreationException ); + Content( const css::uno::Reference< css::uno::XComponentContext >& rxContext, ContentProvider* pProvider, - const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier, + const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier, rtl::Reference< DAVSessionFactory > const & rSessionFactory, bool isCollection ) - throw ( ::com::sun::star::ucb::ContentCreationException ); + throw ( css::ucb::ContentCreationException ); virtual ~Content(); // XInterface @@ -242,59 +218,56 @@ public: // XServiceInfo virtual OUString SAL_CALL getImplementationName() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; - virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( ::com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XContent virtual OUString SAL_CALL getContentType() - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XCommandProcessor - virtual com::sun::star::uno::Any SAL_CALL - execute( const com::sun::star::ucb::Command& aCommand, + virtual css::uno::Any SAL_CALL + execute( const css::ucb::Command& aCommand, sal_Int32 CommandId, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& Environment ) - throw( com::sun::star::uno::Exception, - com::sun::star::ucb::CommandAbortedException, - com::sun::star::uno::RuntimeException ) override; + const css::uno::Reference< css::ucb::XCommandEnvironment >& Environment ) + throw( css::uno::Exception, + css::ucb::CommandAbortedException, + css::uno::RuntimeException ) override; virtual void SAL_CALL abort( sal_Int32 CommandId ) - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; // XPropertyContainer virtual void SAL_CALL addProperty( const OUString& Name, sal_Int16 Attributes, - const com::sun::star::uno::Any& DefaultValue ) - throw( com::sun::star::beans::PropertyExistException, - com::sun::star::beans::IllegalTypeException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException ) override; + const css::uno::Any& DefaultValue ) + throw( css::beans::PropertyExistException, + css::beans::IllegalTypeException, + css::lang::IllegalArgumentException, + css::uno::RuntimeException ) override; virtual void SAL_CALL removeProperty( const OUString& Name ) - throw( com::sun::star::beans::UnknownPropertyException, - com::sun::star::beans::NotRemoveableException, - com::sun::star::uno::RuntimeException ) override; + throw( css::beans::UnknownPropertyException, + css::beans::NotRemoveableException, + css::uno::RuntimeException ) override; // Additional interfaces // XContentCreator - virtual com::sun::star::uno::Sequence< - com::sun::star::ucb::ContentInfo > SAL_CALL + virtual css::uno::Sequence< css::ucb::ContentInfo > SAL_CALL queryCreatableContentsInfo() - throw( com::sun::star::uno::RuntimeException ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContent > SAL_CALL - createNewContent( const com::sun::star::ucb::ContentInfo& Info ) - throw( com::sun::star::uno::RuntimeException ) override; + throw( css::uno::RuntimeException ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + createNewContent( const css::ucb::ContentInfo& Info ) + throw( css::uno::RuntimeException ) override; // Non-interface methods. @@ -303,14 +276,11 @@ public: DAVResourceAccess & getResourceAccess() { return *m_xResAccess; } // Called from resultset data supplier. - static ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow > - getPropertyValues( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rContext, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::Property >& rProperties, + static css::uno::Reference< css::sdbc::XRow > + getPropertyValues( const css::uno::Reference< css::uno::XComponentContext >& rContext, + const css::uno::Sequence< css::beans::Property >& rProperties, const ContentProperties& rData, - const rtl::Reference< - ::ucbhelper::ContentProviderImplHelper >& rProvider, + const rtl::Reference< ::ucbhelper::ContentProviderImplHelper >& rProvider, const OUString& rContentId ); }; diff --git a/ucb/source/ucp/webdav/webdavdatasupplier.hxx b/ucb/source/ucp/webdav/webdavdatasupplier.hxx index 0bdd8273e5bb..b22f110d90d7 100644 --- a/ucb/source/ucp/webdav/webdavdatasupplier.hxx +++ b/ucb/source/ucp/webdav/webdavdatasupplier.hxx @@ -41,18 +41,16 @@ private: bool getData(); public: - DataSupplier( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DataSupplier( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rContent, sal_Int32 nOpenMode); virtual ~DataSupplier(); virtual OUString queryContentIdentifierString( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< - com::sun::star::ucb::XContentIdentifier > + virtual css::uno::Reference< css::ucb::XContentIdentifier > queryContentIdentifier( sal_uInt32 nIndex ) override; - virtual com::sun::star::uno::Reference< com::sun::star::ucb::XContent > + virtual css::uno::Reference< css::ucb::XContent > queryContent( sal_uInt32 nIndex ) override; virtual bool getResult( sal_uInt32 nIndex ) override; @@ -61,14 +59,14 @@ public: virtual sal_uInt32 currentCount() override; virtual bool isCountFinal() override; - virtual com::sun::star::uno::Reference< com::sun::star::sdbc::XRow > + virtual css::uno::Reference< css::sdbc::XRow > queryPropertyValues( sal_uInt32 nIndex ) override; virtual void releasePropertyValues( sal_uInt32 nIndex ) override; virtual void close() override; virtual void validate() - throw( com::sun::star::ucb::ResultSetException ) override; + throw( css::ucb::ResultSetException ) override; }; } diff --git a/ucb/source/ucp/webdav/webdavprovider.hxx b/ucb/source/ucp/webdav/webdavprovider.hxx index 8d696545a941..47521d6ae468 100644 --- a/ucb/source/ucp/webdav/webdavprovider.hxx +++ b/ucb/source/ucp/webdav/webdavprovider.hxx @@ -68,8 +68,7 @@ class ContentProvider : public ::ucbhelper::ContentProviderImplHelper PropertyMap * m_pProps; public: - explicit ContentProvider( const ::com::sun::star::uno::Reference< - ::com::sun::star::uno::XComponentContext >& rContext ); + explicit ContentProvider( const css::uno::Reference< css::uno::XComponentContext >& rContext ); virtual ~ContentProvider(); // XInterface @@ -102,18 +101,16 @@ public: css::lang::XMultiServiceFactory >& rxServiceMgr ); // XContentProvider - virtual ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContent > SAL_CALL - queryContent( const ::com::sun::star::uno::Reference< - ::com::sun::star::ucb::XContentIdentifier >& Identifier ) - throw( ::com::sun::star::ucb::IllegalIdentifierException, - ::com::sun::star::uno::RuntimeException ) override; + virtual css::uno::Reference< css::ucb::XContent > SAL_CALL + queryContent( const css::uno::Reference< css::ucb::XContentIdentifier >& Identifier ) + throw( css::ucb::IllegalIdentifierException, + css::uno::RuntimeException ) override; // Non-interface methods. bool getProperty( const OUString & rPropName, - ::com::sun::star::beans::Property & rProp, + css::beans::Property & rProp, bool bStrict = false ); }; diff --git a/ucb/source/ucp/webdav/webdavresponseparser.cxx b/ucb/source/ucp/webdav/webdavresponseparser.cxx index b04ea8188799..6c97031be6b9 100644 --- a/ucb/source/ucp/webdav/webdavresponseparser.cxx +++ b/ucb/source/ucp/webdav/webdavresponseparser.cxx @@ -287,7 +287,7 @@ namespace WebDAVResponseParserMode_Lock }; - class WebDAVResponseParser : public cppu::WeakImplHelper< com::sun::star::xml::sax::XDocumentHandler > + class WebDAVResponseParser : public cppu::WeakImplHelper< css::xml::sax::XDocumentHandler > { private: std::vector< ucb::Lock > maResult_Lock; diff --git a/ucb/source/ucp/webdav/webdavresultset.hxx b/ucb/source/ucp/webdav/webdavresultset.hxx index 7b7af17ad496..31b1a01c3d96 100644 --- a/ucb/source/ucp/webdav/webdavresultset.hxx +++ b/ucb/source/ucp/webdav/webdavresultset.hxx @@ -32,20 +32,17 @@ namespace http_dav_ucp { class DynamicResultSet : public ::ucbhelper::ResultSetImplHelper { rtl::Reference< Content > m_xContent; - com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment > m_xEnv; + css::uno::Reference< css::ucb::XCommandEnvironment > m_xEnv; private: virtual void initStatic() override; virtual void initDynamic() override; public: - DynamicResultSet( const com::sun::star::uno::Reference< - com::sun::star::uno::XComponentContext >& rxContext, + DynamicResultSet( const css::uno::Reference< css::uno::XComponentContext >& rxContext, const rtl::Reference< Content >& rxContent, - const com::sun::star::ucb::OpenCommandArgument2& rCommand, - const com::sun::star::uno::Reference< - com::sun::star::ucb::XCommandEnvironment >& rxEnv ); + const css::ucb::OpenCommandArgument2& rCommand, + const css::uno::Reference< css::ucb::XCommandEnvironment >& rxEnv ); }; } |