[Libreoffice-commits] .: basic/source

[Radek Doulík]

 basic/source/runtime/methods.cxx |   53 +--------------------------------------
 1 file changed, 2 insertions(+), 51 deletions(-)

New commits:
commit ec6d3770eb8e078fdb5cb7bdb7958de5184696ff
Author: Christina Rossmanith <ChrRossmanith at web.de>
Date:   Tue Mar 22 19:26:46 2011 +0100

    Removed never defined _ENABLE_CUR_DIR

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index d69fb2c..2a319c4 100755
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -85,8 +85,6 @@ using namespace com::sun::star::script;
 
 #endif /* _USE_UNO */
 
-//#define _ENABLE_CUR_DIR
-
 #include "stdobj.hxx"
 #include <basic/sbstdobj.hxx>
 #include "rtlproto.hxx"
@@ -489,27 +487,7 @@ RTLFUNC(ChDir)
     (void)bWrite;
 
     rPar.Get(0)->PutEmpty();
-    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
+    if (rPar.Count() != 2)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
 }
 
@@ -519,34 +497,7 @@ RTLFUNC(ChDrive)
     (void)bWrite;
 
     rPar.Get(0)->PutEmpty();
-    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
+    if (rPar.Count() != 2)
         StarBASIC::Error( SbERR_BAD_ARGUMENT );
 }