Author: pescetti
Date: Thu Sep 24 23:28:31 2015
New Revision: 1705198
URL: http://svn.apache.org/viewvc?rev=1705198&view=rev
Log:
#i125194# Fix WebDAV file locking.
Patch by: Giuseppe Castagno <[email protected]>
Modified:
openoffice/branches/AOO410/main/ (props changed)
openoffice/branches/AOO410/main/sal/inc/osl/file.h
openoffice/branches/AOO410/main/sal/inc/osl/file.hxx
openoffice/branches/AOO410/main/sal/osl/w32/file_error.c
openoffice/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx
Propchange: openoffice/branches/AOO410/main/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Sep 24 23:28:31 2015
@@ -2,4 +2,4 @@
/openoffice/branches/ia2/main:1417739-1541842
/openoffice/branches/ooxml-osba/main:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
/openoffice/branches/rejuvenate01/main:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700078,1700135,1702894,1702898,1702986,1702988,1705193
+/openoffice/trunk/main:1571617,1571677,1572569,1572577,1573547,1574058,1574101,1575922,1576216,1576748,1578786,1579934,1580657,1580779,1581746,1581840,1582359,1582365,1582709,1583336,1583418,1583589,1583988,1585261,1586242,1586249,1586583,1587468,1589050,1591501,1592692,1592716,1594206,1595847,1595851,1595858,1596218,1596491,1596494,1597076,1597102,1597109,1599169,1599173-1599174,1600581,1600587,1600590,1600630,1600861,1600863,1600883,1602434,1602791,1602823,1602850,1603416,1603897,1603941,1604028,1604709,1604786,1605044,1605355,1605689,1606055,1606061,1606706,1607111,1607793,1607836,1608348,1608376,1608730,1608733,1609204,1609208,1609302,1609426,1610347,1610411,1610422,1610671,1611470,1611549,1612070-1612071,1612539,1612801,1616457,1616944,1621121,1623847,1623849-1623850,1642300-1642302,1654282,1669457,1669459,1669462-1669463,1669465,1677190,1687177,1689883,1689959,1692551,1694132,1694701,1700078,1700135,1702894,1702898,1702986,1702988,1705193,1705196
Modified: openoffice/branches/AOO410/main/sal/inc/osl/file.h
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/inc/osl/file.h?rev=1705198&r1=1705197&r2=1705198&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sal/inc/osl/file.h (original)
+++ openoffice/branches/AOO410/main/sal/inc/osl/file.h Thu Sep 24 23:28:31 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/branches/AOO410/main/sal/inc/osl/file.hxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/inc/osl/file.hxx?rev=1705198&r1=1705197&r2=1705198&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sal/inc/osl/file.hxx (original)
+++ openoffice/branches/AOO410/main/sal/inc/osl/file.hxx Thu Sep 24 23:28:31
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/branches/AOO410/main/sal/osl/w32/file_error.c
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/sal/osl/w32/file_error.c?rev=1705198&r1=1705197&r2=1705198&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/sal/osl/w32/file_error.c (original)
+++ openoffice/branches/AOO410/main/sal/osl/w32/file_error.c Thu Sep 24
23:28:31 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/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx
URL:
http://svn.apache.org/viewvc/openoffice/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx?rev=1705198&r1=1705197&r2=1705198&view=diff
==============================================================================
--- openoffice/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx (original)
+++ openoffice/branches/AOO410/main/ucb/source/ucp/file/filglob.cxx Thu Sep 24
23:28:31 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
