--- ooo-build-2.4.1.9/patches/src680/apply.webdav	2008-08-17 11:43:47 +0400

+++ ooo-build-2.4.1.9/patches/src680/apply	2008-08-17 11:45:55 +0400

@@ -583,7 +583,7 @@ ucb-gnome-vfs-read-more.diff, i#0, jhole

 # webdav did strange things when it tried to answer on SupportsActiveStreaming

 # property

 # FIXME: file upstream together with the above

-ucb-gnome-vfs-lock-webdav.diff, i#0, n#294620, jholesov

+#ucb-gnome-vfs-lock-webdav.diff, i#0, n#294620, jholesov

 # Fix locking of .xls files

 # FIXME: this is as conservative as possible - a larger redesign appreciated

@@ -615,41 +615,41 @@ gnome-vfs-properties.diff, n#264585, jho

 # WebDAV locking

 # It is in this section because it needs part of the gvfs-related patches

-webdav-locking.diff, n#346711, i#29152, jholesov

+#webdav-locking.diff, n#346711, i#29152, jholesov

 # Fix the behaviour for the servers that do not support locking

-webdav-locking-not-locking-servers.diff, n#346711, i#29152, jholesov

+#webdav-locking-not-locking-servers.diff, n#346711, i#29152, jholesov

 # Implement uploading the changed stream to the server

-webdav-locking-stream-can-save.diff, n#346711, i#29152, jholesov

+#webdav-locking-stream-can-save.diff, n#346711, i#29152, jholesov

 # Serve dav:// and webdav:// protocols in the WebDAV UCP

-webdav-locking-serve-dav-uri.diff, n#346713, i#29152, jholesov

+#webdav-locking-serve-dav-uri.diff, n#346713, i#29152, jholesov

 # Fix the runtime for neon 0.24

-webdav-locking-neon24.diff, n#357048, i#29152, jholesov

+#webdav-locking-neon24.diff, n#357048, i#29152, jholesov

 # Fix Save As

-webdav-locking-save-as.diff, i#29152, jholesov

+#webdav-locking-save-as.diff, i#29152, jholesov

 # Catch possible exceptions in flush(), otherwise can crash

-webdav-locking-catch-flush-exceptions.diff, n#363093, i#29152, jholesov

+#webdav-locking-catch-flush-exceptions.diff, n#363093, i#29152, jholesov

 # The http(s)/dav(s)/webdav(s) protocols can contain even username/passwd

-webdav-locking-can-have-username.diff, n#363363, i#29152, jholesov

+#webdav-locking-can-have-username.diff, n#363363, i#29152, jholesov

 # ne_lockstore_add() must be called _after_ ne_lock()

-webdav-locking-lockstore.diff, i#29152, jholesov

+#webdav-locking-lockstore.diff, i#29152, jholesov

 # unlock the stream on crash/terminate/...

-webdav-locking-unlock-on-crash.diff, i#29152, jholesov

+#webdav-locking-unlock-on-crash.diff, i#29152, jholesov

 # don't lock for infinite, instead set timeout to 3 minutes, and refresh 30

 # sec before expiration

-webdav-locking-refresh-lock.diff, n#403724, jholesov

+#webdav-locking-refresh-lock.diff, n#403724, jholesov

 # workaround a bug in neon 0.24 that breaks ne_lock_refresh()

-webdav-locking-neon-refresh-hack.diff, n#403724, jholesov

+#webdav-locking-neon-refresh-hack.diff, n#403724, jholesov

 # NOT LOCKING RELATED!

 # Move gnome-vfs out of the startup sequence, load it only when needed