diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 10:03:11 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2006-11-02 10:03:11 +0000 |
| commit | d3024c373098157890c4ca19065f815f97980f66 (patch) | |
| tree | 76f8b14faeed222c2285e05a43d03ae40bd69d12 /basic | |
| parent | 2c49ec39e1e5f80e5264fb59c5c67543a43b7fae (diff) | |
INTEGRATION: CWS ab30 (1.70.8); FILE MERGED
2006/10/19 08:54:39 ab 1.70.8.5: #i69836# Remove patch due to problems in Windows
2006/10/18 13:56:53 ab 1.70.8.4: #69836# Fixed Solaris related build problem
2006/10/17 14:54:58 ab 1.70.8.3: RESYNC: (1.70-1.71); FILE MERGED
2006/10/13 12:36:37 ab 1.70.8.2: #68855# Kill command must not delete folders
2006/09/28 14:31:33 ab 1.70.8.1: #i69836# CurDir() use Sytem Text Encoding
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/runtime/methods.cxx | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index c443135171ad..204519c48a37 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -4,9 +4,9 @@ * * $RCSfile: methods.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: obo $ $Date: 2006-10-12 14:29:43 $ + * last change: $Author: vg $ $Date: 2006-11-02 11:03:11 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -451,23 +451,11 @@ RTLFUNC(CurDir) } } char* pBuffer = new char[ _MAX_PATH ]; -#ifdef MTW - int old = _getdrive(); - _chdrive(nCurDir); - - if ( getcwd( pBuffer, _MAX_PATH ) != 0 ) - rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) ); - else - StarBASIC::Error( SbERR_NO_DEVICE ); - delete [] pBuffer; - _chdrive(old); -#else if ( _getdcwd( nCurDir, pBuffer, _MAX_PATH ) != 0 ) rPar.Get(0)->PutString( String::CreateFromAscii( pBuffer ) ); else StarBASIC::Error( SbERR_NO_DEVICE ); delete [] pBuffer; -#endif #elif defined( UNX ) @@ -674,9 +662,9 @@ RTLFUNC(Kill) // JSM if( xSFI.is() ) { String aFullPath = getFullPath( aFileSpec ); - if( !xSFI->exists( aFullPath ) ) + if( !xSFI->exists( aFullPath ) || xSFI->isFolder( aFullPath ) ) { - StarBASIC::Error( SbERR_PATH_NOT_FOUND ); + StarBASIC::Error( SbERR_FILE_NOT_FOUND ); return; } try |