[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sal/osl

[Giuseppe Castagno]

 sal/osl/w32/file_error.c |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit cbb45cdac9934aed4d4f98452ecd5a2b0bb05781
Author: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
Date:   Tue Jul 14 17:15:15 2015 +0200

    tdf#60381: Accessing Sharepoint share using UNC path does not work.
    
    Added two Windows API missing errors.
    
    The errors added:
    ERROR_FILE_CHECKED_OUT
    returned when trying to access a file that is locked
    by another user.
    
    ERROR_INVALID_NAME
    returned when trying to access a local file with the wrong
    chars in the path or file name.
    
    Mapped to existent osl_File_E_.... for compatibility.
    
    Change-Id: I0bea1ff2727729c569b0a2cb6befd0d38289b8a2
    Reviewed-on: https://gerrit.libreoffice.org/17412
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Samuel Mehrbrodt <s.mehrbrodt at gmail.com>
    (cherry picked from commit b7ae14655f8969069b882ae0bd43d79a4c92f357)
    Reviewed-on: https://gerrit.libreoffice.org/17650
    Reviewed-by: Giuseppe Castagno <giuseppe.castagno at acca-esse.eu>
    Reviewed-by: Thorsten Behrens <Thorsten.Behrens at CIB.de>

diff --git a/sal/osl/w32/file_error.c b/sal/osl/w32/file_error.c
index 3697c9d..2d7243d 100644
--- a/sal/osl/w32/file_error.c
+++ b/sal/osl/w32/file_error.c
@@ -68,6 +68,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_BROKEN_PIPE,            osl_File_E_PIPE     },  /* 109 */
   {  ERROR_DISK_FULL,              osl_File_E_NOSPC    },  /* 112 */
   {  ERROR_INVALID_TARGET_HANDLE,  osl_File_E_BADF     },  /* 114 */
+  {  ERROR_INVALID_NAME,           osl_File_E_NOENT    },  /* 123 */
   {  ERROR_INVALID_HANDLE,         osl_File_E_INVAL    },  /* 124 */
   {  ERROR_WAIT_NO_CHILDREN,       osl_File_E_CHILD    },  /* 128 */
   {  ERROR_CHILD_NOT_COMPLETE,     osl_File_E_CHILD    },  /* 129 */
@@ -82,6 +83,7 @@ static const struct osl_file_error_entry errtable[] = {
   {  ERROR_ALREADY_EXISTS,         osl_File_E_EXIST    },  /* 183 */
   {  ERROR_FILENAME_EXCED_RANGE,   osl_File_E_NOENT    },  /* 206 */
   {  ERROR_NESTING_NOT_ALLOWED,    osl_File_E_AGAIN    },  /* 215 */
+  {  ERROR_FILE_CHECKED_OUT,       osl_File_E_ACCES    },  /* 220 */
   {  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 */