strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS mav37_DEV300 (1.20.48); FILE MERGED

Browse source 
2008/08/14 11:35:21 mav 1.20.48.2: #i92735# the lock flags are used on MAC only
2008/08/14 07:15:17 mav 1.20.48.1: #i92735# do not try any locking when a file is opened without locking
This commit is contained in:
Rüdiger Timm 2008-08-27 06:53:37 +00:00
parent 1add27b901
commit 4dcdbd99bd
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sal/osl/unx/file.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: file.cxx,v $
* $Revision: 1.20 $
* $Revision: 1.21 $
*
* This file is part of OpenOffice.org.
*
@ -657,11 +657,19 @@ oslFileError osl_openFile( rtl_uString* ustrFileURL, oslFileHandle* pHandle, sal
#endif
}
sal_Bool bNeedsLock = ( ( uFlags & osl_File_OpenFlag_NoLock ) == 0 );
if ( !bNeedsLock )
{
#ifdef MACOSX
flags &= ~O_EXLOCK;
flags &= ~O_SHLOCK;
#endif
}
/* open the file */
fd = open( buffer, flags, mode );
if ( fd >= 0 )
{
sal_Bool bNeedsLock = ( ( uFlags & osl_File_OpenFlag_NoLock ) == 0 );
sal_Bool bLocked = sal_False;
if( bNeedsLock )
{