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

Removed never defined _ENABLE_CUR_DIR

Browse source
This commit is contained in:
Christina Rossmanith 2011-03-22 19:26:46 +01:00 committed by Radek Doulik
parent b6f069aaee
commit 49b62e4d12
1 changed files with 2 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
basic/source/runtime/methods.cxx
View file

@ -85,8 +85,6 @@ using namespace com::sun::star::script;
#endif /* _USE_UNO */ #endif /* _USE_UNO */
//#define _ENABLE_CUR_DIR
#include "stdobj.hxx" #include "stdobj.hxx"
#include <basic/sbstdobj.hxx> #include <basic/sbstdobj.hxx>
#include "rtlproto.hxx" #include "rtlproto.hxx"
@ -489,27 +487,7 @@ RTLFUNC(ChDir)
(void)bWrite; (void)bWrite;
rPar.Get(0)->PutEmpty(); rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2) if (rPar.Count() != 2)
{
#ifdef _ENABLE_CUR_DIR
String aPath = rPar.Get(1)->GetString();
sal_Bool bError = sal_False;
#ifdef WNT
// #55997 Laut MI hilft es bei File-URLs einen DirEntry zwischenzuschalten
// #40996 Harmoniert bei Verwendung der WIN32-Funktion nicht mit getdir
DirEntry aEntry( aPath );
ByteString aFullPath( aEntry.GetFull(), gsl_getSystemTextEncoding() );
if( chdir( aFullPath.GetBuffer()) )
bError = sal_True;
#else
if (!DirEntry(aPath).SetCWD())
bError = sal_True;
#endif
if( bError )
StarBASIC::Error( SbERR_PATH_NOT_FOUND );
#endif
}
else
StarBASIC::Error( SbERR_BAD_ARGUMENT ); StarBASIC::Error( SbERR_BAD_ARGUMENT );
} }
@ -519,34 +497,7 @@ RTLFUNC(ChDrive)
(void)bWrite; (void)bWrite;
rPar.Get(0)->PutEmpty(); rPar.Get(0)->PutEmpty();
if (rPar.Count() == 2) if (rPar.Count() != 2)
{
#ifdef _ENABLE_CUR_DIR
// Keine Laufwerke in Unix
#ifndef UNX
String aPar1 = rPar.Get(1)->GetString();
#if defined (WNT) || defined (OS2)
if (aPar1.Len() > 0)
{
int nCurDrive = (int)aPar1.GetBuffer()[0]; ;
if ( !isalpha( nCurDrive ) )
{
StarBASIC::Error( SbERR_BAD_ARGUMENT );
return;
}
else
nCurDrive -= ( 'A' - 1 );
if (_chdrive(nCurDrive))
StarBASIC::Error( SbERR_NO_DEVICE );
}
#endif
#endif
// #ifndef UNX
#endif
}
else
StarBASIC::Error( SbERR_BAD_ARGUMENT ); StarBASIC::Error( SbERR_BAD_ARGUMENT );
} }