Author: pescetti
Date: Thu Sep 24 23:25:09 2015
New Revision: 1705196
URL: http://svn.apache.org/viewvc?rev=1705196&view=rev
Log:
#i125194# Fix WebDAV file locking.
Patch by: Giuseppe Castagno <[email protected]>
Modified:
openoffice/trunk/main/sal/inc/osl/file.h
openoffice/trunk/main/sal/inc/osl/file.hxx
openoffice/trunk/main/sal/osl/w32/file_error.c
openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx
Modified: openoffice/trunk/main/sal/inc/osl/file.h
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.h?rev=1705196&r1=1705195&r2=1705196&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/osl/file.h (original)
+++ openoffice/trunk/main/sal/inc/osl/file.h Thu Sep 24 23:25:09 2015
@@ -132,6 +132,7 @@ typedef enum {
osl_File_E_USERS,
osl_File_E_OVERFLOW,
osl_File_E_NOTREADY,
+ osl_File_E_LOCKED,
osl_File_E_invalidError, /* unmapped error: always last
entry in enum! */
osl_File_E_TIMEDOUT,
osl_File_E_NETWORK,
Modified: openoffice/trunk/main/sal/inc/osl/file.hxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/inc/osl/file.hxx?rev=1705196&r1=1705195&r2=1705196&view=diff
==============================================================================
--- openoffice/trunk/main/sal/inc/osl/file.hxx (original)
+++ openoffice/trunk/main/sal/inc/osl/file.hxx Thu Sep 24 23:25:09 2015
@@ -99,6 +99,7 @@ public:
E_USERS = osl_File_E_USERS,
E_OVERFLOW = osl_File_E_OVERFLOW,
E_NOTREADY = osl_File_E_NOTREADY,
+ E_LOCKED = osl_File_E_LOCKED,
E_invalidError = osl_File_E_invalidError, /* unmapped
error: always last entry in enum! */
E_TIMEDOUT = osl_File_E_TIMEDOUT,
E_NETWORK = osl_File_E_NETWORK
Modified: openoffice/trunk/main/sal/osl/w32/file_error.c
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/sal/osl/w32/file_error.c?rev=1705196&r1=1705195&r2=1705196&view=diff
==============================================================================
--- openoffice/trunk/main/sal/osl/w32/file_error.c (original)
+++ openoffice/trunk/main/sal/osl/w32/file_error.c Thu Sep 24 23:25:09 2015
@@ -87,7 +87,9 @@ static const struct osl_file_error_entry
{ ERROR_NESTING_NOT_ALLOWED, osl_File_E_AGAIN }, /* 215 */
{ ERROR_DIRECTORY, osl_File_E_NOENT }, /* 267 */
{ ERROR_NOT_ENOUGH_QUOTA, osl_File_E_NOMEM }, /* 1816 */
- { ERROR_UNEXP_NET_ERR, osl_File_E_NETWORK } /* 59 */
+ { ERROR_UNEXP_NET_ERR, osl_File_E_NETWORK }, /* 59 */
+ { ERROR_FILE_CHECKED_OUT, osl_File_E_LOCKED }, /* 220 The file is
locked or checked out by another user. */
+ { ERROR_INVALID_NAME, osl_File_E_NOENT } /* 123 One or more
of the names composing the file path has a wrong syntax. */
};
/* The following two constants must be the minimum and maximum
Modified: openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx?rev=1705196&r1=1705195&r2=1705196&view=diff
==============================================================================
--- openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx (original)
+++ openoffice/trunk/main/ucb/source/ucp/file/filglob.cxx Thu Sep 24 23:25:09
2015
@@ -368,6 +368,10 @@ namespace fileaccess {
ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
break;
+ case FileBase::E_LOCKED: // file is locked by another user
+ ioErrorCode = IOErrorCode_LOCKING_VIOLATION;
+ break;
+
case FileBase::E_FAULT: // Bad address
case FileBase::E_LOOP: // Too many symbolic links encountered
case FileBase::E_NOSPC: // No space left on device
