diff options
| author | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-01-09 20:22:37 +0100 |
|---|---|---|
| committer | Giuseppe Castagno <giuseppe.castagno@acca-esse.eu> | 2016-07-28 09:00:03 +0000 |
| commit | f30184cc28abcfcc38c14152aa43e310e3a64a27 (patch) | |
| tree | d6d2478ea1806a5a37210779656a561fea183e7f | |
| parent | 538ea31c992acb9d47ffd783543e50e149272aac (diff) | |
tdf#101094 (3) OPTIONS: Add options implem. in DAV resource access.
Change-Id: I186a77739b40cd89a8a918fd22379eb4240292ff
Reviewed-on: https://gerrit.libreoffice.org/27607
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Giuseppe Castagno <giuseppe.castagno@acca-esse.eu>
| -rw-r--r-- | ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx | 20 | ||||
| -rw-r--r-- | ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx | 8 |
2 files changed, 12 insertions, 16 deletions
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx index f8b9d71b521e..e1ff5d6d82cf 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx @@ -164,34 +164,34 @@ DAVResourceAccess & DAVResourceAccess::operator=( return *this; } -#if 0 // currently not used, but please don't remove code - void DAVResourceAccess::OPTIONS( - DAVCapabilities & rCapabilities, - const uno::Reference< ucb::XCommandEnvironment > & xEnv ) - throw( DAVException ) + DAVOptions & rOptions, + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) + throw ( DAVException ) { initialize(); - bool bRetry; int errorCount = 0; + bool bRetry; do { bRetry = false; try { DAVRequestHeaders aHeaders; + getUserRequestHeaders( xEnv, getRequestURI(), - OUString( "OPTIONS" ), + css::ucb::WebDAVHTTPMethod_OPTIONS, aHeaders ); m_xSession->OPTIONS( getRequestURI(), - rCapabilities, + rOptions, DAVRequestEnvironment( getRequestURI(), new DAVAuthListener_Impl( xEnv, m_aURL ), - aHeaders, xEnv) ); + aHeaders, xEnv ) ); } catch ( const DAVException & e ) { @@ -203,8 +203,6 @@ void DAVResourceAccess::OPTIONS( } while ( bRetry ); } -#endif - void DAVResourceAccess::PROPFIND( const Depth nDepth, diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx index 43392b92558c..503c1befe91e 100644 --- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx +++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx @@ -86,13 +86,11 @@ public: // DAV methods - -#if 0 // currently not used, but please don't remove code void - OPTIONS( DAVCapabilities & rCapabilities, - const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv ) + OPTIONS( DAVOptions & rOptions, + const css::uno::Reference< + css::ucb::XCommandEnvironment > & xEnv ) throw ( DAVException ); -#endif // allprop & named void |