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

[Stephan Bergmann]

 ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx |   47 -----------------------
 ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx |    8 ---
 ucb/source/ucp/webdav/DAVResourceAccess.cxx      |   47 -----------------------
 ucb/source/ucp/webdav/DAVResourceAccess.hxx      |    8 ---
 4 files changed, 110 deletions(-)

New commits:
commit 85ccbb6f2eec06e10ef38a6e4ade37bdff4b6f3a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Jan 27 15:41:22 2017 +0100

    Don't worry, Kai, it's still in the git repo
    
    57558f61e9aa1a45f12a2f72d7a0359303d00be2 "#i108938# - commented out unused
    member fuction."
    
    Change-Id: I4972d0ff98f8fa21de4fa6506bc1bcbc7088f6d3

diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
index c20173a..a86ce2c 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx
@@ -968,53 +968,6 @@ void DAVResourceAccess::LOCK(
     while ( bRetry );
 }
 
-#if 0 // currently not used, but please don't remove code
-
-// refresh existing lock.
-sal_Int64 DAVResourceAccess::LOCK(
-    sal_Int64 nTimeout,
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
-{
-    initialize();
-
-    sal_Int64 nNewTimeout = 0;
-    int errorCount = 0;
-    bool bRetry;
-    do
-    {
-        bRetry = false;
-        try
-        {
-            DAVRequestHeaders aHeaders;
-            getUserRequestHeaders( xEnv,
-                                   getRequestURI(),
-                                   ucb::WebDAVHTTPMethod_LOCK,
-                                   aHeaders );
-
-            nNewTimeout = m_xSession->LOCK( getRequestURI(),
-                                            nTimeout,
-                                            DAVRequestEnvironment(
-                                                getRequestURI(),
-                                                new DAVAuthListener_Impl(
-                                                    xEnv, m_aURL ),
-                                            aHeaders, xEnv ) );
-        }
-        catch ( const DAVException & e )
-        {
-            errorCount++;
-            bRetry = handleException( e, errorCount );
-            if ( !bRetry )
-                throw;
-        }
-    }
-    while ( bRetry );
-
-    return nNewTimeout;
-}
-#endif
-
-
 void DAVResourceAccess::UNLOCK(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
 {
diff --git a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
index 3667b9a..be1191b 100644
--- a/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx
@@ -201,14 +201,6 @@ public:
     LOCK( css::ucb::Lock & inLock,
           const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
-#if 0 // currently not used, but please don't remove code
-    // refresh existing lock.
-    sal_Int64
-    LOCK( sal_Int64 nTimeout,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
-#endif
-
     /// @throws DAVException
     void
     UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.cxx b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
index f1eb8ba..68501d0 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.cxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.cxx
@@ -923,53 +923,6 @@ void DAVResourceAccess::LOCK(
     while ( bRetry );
 }
 
-#if 0 // currently not used, but please don't remove code
-
-// refresh existing lock.
-sal_Int64 DAVResourceAccess::LOCK(
-    sal_Int64 nTimeout,
-    const uno::Reference< ucb::XCommandEnvironment > & xEnv )
-  throw ( DAVException )
-{
-    initialize();
-
-    sal_Int64 nNewTimeout = 0;
-    int errorCount = 0;
-    bool bRetry;
-    do
-    {
-        bRetry = false;
-        try
-        {
-            DAVRequestHeaders aHeaders;
-            getUserRequestHeaders( xEnv,
-                                   getRequestURI(),
-                                   ucb::WebDAVHTTPMethod_LOCK,
-                                   aHeaders );
-
-            nNewTimeout = m_xSession->LOCK( getRequestURI(),
-                                            nTimeout,
-                                            DAVRequestEnvironment(
-                                                getRequestURI(),
-                                                new DAVAuthListener_Impl(
-                                                    xEnv, m_aURL ),
-                                            aHeaders, xEnv ) );
-        }
-        catch ( DAVException & e )
-        {
-            errorCount++;
-            bRetry = handleException( e, errorCount );
-            if ( !bRetry )
-                throw;
-        }
-    }
-    while ( bRetry );
-
-    return nNewTimeout;
-}
-#endif
-
-
 void DAVResourceAccess::UNLOCK(
     const uno::Reference< ucb::XCommandEnvironment > & xEnv )
 {
diff --git a/ucb/source/ucp/webdav/DAVResourceAccess.hxx b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
index 44f7f39..4f20f21 100644
--- a/ucb/source/ucp/webdav/DAVResourceAccess.hxx
+++ b/ucb/source/ucp/webdav/DAVResourceAccess.hxx
@@ -177,14 +177,6 @@ public:
     LOCK( css::ucb::Lock & inLock,
           const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );
 
-#if 0 // currently not used, but please don't remove code
-    // refresh existing lock.
-    sal_Int64
-    LOCK( sal_Int64 nTimeout,
-          const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv )
-        throw ( DAVException );
-#endif
-
     /// @throws DAVException
     void
     UNLOCK( const css::uno::Reference< css::ucb::XCommandEnvironment > & xEnv );