Rolled back last changes until we figure out how to properly initialize the AutoReleasePool at the proper time.

1 files changed, 2 insertions, 65 deletions

diff --git a/vcl/aqua/source/app/salinst.cxx b/vcl/aqua/source/app/salinst.cxx
index d0b74b2843c7..238dc779b195 100644
--- a/vcl/aqua/source/app/salinst.cxx
+++ b/vcl/aqua/source/app/salinst.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: salinst.cxx,v $
  *
- *  $Revision: 1.26 $
+ *  $Revision: 1.27 $
  *
- *  last change: $Author: mm $ $Date: 2001-02-22 15:44:00 $
+ *  last change: $Author: pluby $ $Date: 2001-02-23 19:49:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -63,9 +63,6 @@
 
 #include <stdio.h>
 
-#ifndef _FSYS_HXX
-#include <tools/fsys.hxx>
-#endif
 #ifndef _SV_SALDATA_HXX
 #include <saldata.hxx>
 #endif
@@ -87,9 +84,6 @@
 #ifndef _SV_DIALOG_HXX
 #include <dialog.hxx>
 #endif
-#ifndef _SV_VCLAUTORELEASEPOOL_H
-#include <VCLAutoreleasePool.h>
-#endif
 #ifndef _SV_VCLAPPLICATION_H
 #include <VCLApplication.h>
 #endif
@@ -125,63 +119,6 @@ void DeInitSalData()
 }
 
 // -----------------------------------------------------------------------
-static VCLAUTORELEASEPOOL hMainAutoreleasePool = 0;
-void InitSalMain()
-{
-    // Need to include the absolute path for this executable in the PATH
-    // and STAR_RESOURCEPATH environment variables so that the resource manager
-    // can find resource files and in the DYLD_LIBRARY_PATH environment
-    // variable so that the dynamic library loader can find shared libraries
-    ByteString aPath( getenv( "PATH" ) );
-    ByteString aCmdPath( argv[0] );
-    // Get absolute path of command's directory
-    if ( aCmdPath.Len() ) {
-        DirEntry aCmdDirEntry( aCmdPath );
-        aCmdDirEntry.ToAbs();
-        aCmdPath = ByteString( aCmdDirEntry.GetPath().GetFull(), RTL_TEXTENCODING_ASCII_US );
-    }
-    if ( aPath.Len() ) {
-        if ( aCmdPath.Len() )
-            aCmdPath += ByteString( DirEntry::GetSearchDelimiter(), RTL_TEXTENCODING_ASCII_US );
-        aCmdPath += aPath;
-    }
-    // Assign to PATH environment variable
-    if ( aCmdPath.Len() ) {
-        aPath = ByteString( "PATH=" );
-        aPath += aCmdPath;
-        putenv( aPath.GetBuffer() );
-    }
-    // Assign to STAR_RESOURCEPATH environment variable
-    if ( aCmdPath.Len() ) {
-        aPath = ByteString( "STAR_RESOURCEPATH=" );
-        aPath += aCmdPath;
-        putenv( aPath.GetBuffer() );
-    }
-    // Assign to DYLD_LIBRARY_PATH environment variable
-    if ( aCmdPath.Len() ) {
-        aPath = ByteString( "DYLD_LIBRARY_PATH=" );
-        aPath += aCmdPath;
-        putenv( aPath.GetBuffer() );
-    }
-
-    // Setup up autorelease pool for Objective-C objects
-    hMainAutoreleasePool = VCLAutoreleasePool_Init();
-
-    // Initialize application's connection to the window server
-    VCLApplication_SharedApplication();
-
-}
-
-// -----------------------------------------------------------------------
-
-void DeInitSalMain()
-{
-    // Release autorelease pool
-    VCLAutoreleasePool_Release( hMainAutoreleasePool );
-    hMainAutoreleasePool = 0;
-}
-
-// -----------------------------------------------------------------------
 
 void SetFilterCallback( void* pCallback, void* pInst )
 {