[Libreoffice-commits] core.git: ucb/source

[Giuseppe Castagno]

 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx |   20 +++++++++-----------
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx |    8 +++-----
 2 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit f30184cc28abcfcc38c14152aa43e310e3a64a27
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Sat Jan 9 20:22:37 2016 +0100

    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 at libreoffice.org>
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>

diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index f8b9d71..e1ff5d6 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 43392b9..503c1be 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