ooo-build r11562 - in trunk: . patches/src680

[jholesovsky svn gnome org]

Author: jholesovsky
Date: Wed Feb 13 15:08:50 2008
New Revision: 11562
URL: http://svn.gnome.org/viewvc/ooo-build?rev=11562&view=rev

Log:
        * patches/src680/webdav-locking-stream-can-save.diff,
          patches/src680/webdav-locking-not-locking-servers.diff: Update for
          servers that do not support locking.


Modified:
   trunk/ChangeLog
   trunk/patches/src680/webdav-locking-not-locking-servers.diff
   trunk/patches/src680/webdav-locking-stream-can-save.diff

Modified: trunk/patches/src680/webdav-locking-not-locking-servers.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-not-locking-servers.diff	(original)
+++ trunk/patches/src680/webdav-locking-not-locking-servers.diff	Wed Feb 13 15:08:50 2008
@@ -1,5 +1,5 @@
 diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
-index f1ddbf0..eb85c85 100644
+index f1ddbf0..6407df0 100644
 --- ucb/source/ucp/webdav/NeonSession.cxx
 +++ ucb/source/ucp/webdav/NeonSession.cxx
 @@ -213,6 +213,12 @@ static sal_uInt16 makeStatusCode( const rtl::OUString & rStatusText )
@@ -65,7 +65,7 @@
  	throw ( DAVException )
  {
      osl::Guard< osl::Mutex > theGuard( m_aMutex );
-@@ -1587,20 +1579,31 @@ sal_Bool NeonSession::Lockit( ucb::Lock & rLock, bool bLockit )
+@@ -1587,21 +1579,35 @@ sal_Bool NeonSession::Lockit( ucb::Lock & rLock, bool bLockit )
          ne_lockstore_add( m_NeonLockStore, theLock );
      }
  
@@ -100,13 +100,17 @@
 +                    rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "a locking error occured" ) ),
 +                    uno::Reference< ucb::XCommandProcessor >() );
 +        }
-+#if OSL_DEBUG_LEVEL > 0
 +        else
++        {
++#if OSL_DEBUG_LEVEL > 0
 +            fprintf( stderr, "WebDAV: failed to lock the file, status code is: %d\n", getStatusCode( m_pHttpSession ) );
  #endif
++            ne_lockstore_remove( m_NeonLockStore, theLock );
++        }
      }
      else
-@@ -1614,14 +1617,10 @@ sal_Bool NeonSession::Lockit( ucb::Lock & rLock, bool bLockit )
+     {
+@@ -1614,14 +1620,10 @@ sal_Bool NeonSession::Lockit( ucb::Lock & rLock, bool bLockit )
  #if OSL_DEBUG_LEVEL > 0
              fprintf( stderr, "WebDAV: going to unlock the URL, the token is: %s\n", theLock->token );
  #endif

Modified: trunk/patches/src680/webdav-locking-stream-can-save.diff
==============================================================================
--- trunk/patches/src680/webdav-locking-stream-can-save.diff	(original)
+++ trunk/patches/src680/webdav-locking-stream-can-save.diff	Wed Feb 13 15:08:50 2008
@@ -141,7 +141,7 @@
          rtl::Reference< DAVSessionFactory > rDAVFactory( new DAVSessionFactory() );
          
 diff --git a/ucb/source/ucp/webdav/NeonSession.cxx b/ucb/source/ucp/webdav/NeonSession.cxx
-index eb85c85..b2d7979 100644
+index eb85c85..a4e0042 100644
 --- ucb/source/ucp/webdav/NeonSession.cxx
 +++ ucb/source/ucp/webdav/NeonSession.cxx
 @@ -629,6 +629,8 @@ extern "C" void NeonSession_PreSendRequest( ne_request * req,
@@ -268,6 +268,15 @@
      }
  
      if ( bLockit )
+@@ -1606,7 +1617,7 @@ void NeonSession::Lockit( ucb::Lock & rLock, bool bLockit )
+ #if OSL_DEBUG_LEVEL > 0
+             fprintf( stderr, "WebDAV: failed to lock the file, status code is: %d\n", getStatusCode( m_pHttpSession ) );
+ #endif
+-            ne_lockstore_remove( m_NeonLockStore, theLock );
++            ne_lockstore_remove( s_aNeonLockStore, theLock );
+         }
+     }
+     else
 diff --git a/ucb/source/ucp/webdav/NeonSession.hxx b/ucb/source/ucp/webdav/NeonSession.hxx
 index 4f1798f..7ac692d 100644
 --- ucb/source/ucp/webdav/NeonSession.hxx