Index: source/javavm/javavm.cxx
===================================================================
RCS file: /cvs/oo/udk/stoc/source/javavm/javavm.cxx,v
retrieving revision 1.27.6.1.2.1
diff -u -r1.27.6.1.2.1 javavm.cxx
--- source/javavm/javavm.cxx	21 Nov 2002 22:46:44 -0000	1.27.6.1.2.1
+++ source/javavm/javavm.cxx	11 Mar 2003 00:52:37 -0000
@@ -1361,11 +1361,17 @@
 	// Try VM 1.1 
 	JDK1_1InitArgs vm_args;
 	vm_args.version= 0x00010001;
+#ifndef MACOSX
 	jint ret= initArgs(&vm_args); 
+#endif
 	jvm.setArgs(&vm_args);
 	
 	jint err;
+#ifdef MACOSX
+	err= JNI_ERR;
+#else
 	err= pCreateJavaVM(&pJavaVM, &pJNIEnv, &vm_args);
+#endif
 	
 	if( err != 0)
 	{
@@ -1388,10 +1394,19 @@
 		sal_uInt16 cprops= jvm.getProperties().size(); 			
 		
 		JavaVMInitArgs vm_args2;
-		JavaVMOption * options= new JavaVMOption[cprops + 1];
+#ifdef MACOSX
+		sal_uInt16 stdprops= 2;
+#else
+		sal_uInt16 stdprops= 1;
+#endif
+		JavaVMOption * options= new JavaVMOption[cprops + stdprops];
 		OString sClassPath= OString("-Djava.class.path=") + vm_args.classpath;
 		options[0].optionString= (char*)sClassPath.getStr();
 		options[0].extraInfo= NULL;
+#ifdef MACOSX
+		options[1].optionString= (char*)OString("-Dcom.apple.hwaccel=false").getStr(); 
+		options[1].extraInfo= NULL;
+#endif
 		
 		OString * arProps= new OString[cprops];
 		
@@ -1404,15 +1419,16 @@
 				arProps[x]= OString("-D") + vm_args.properties[x];
 			else
 				arProps[x]= vm_args.properties[x];
-			options[x+1].optionString= (char*)arProps[x].getStr();
-			options[x+1].extraInfo= NULL;
+			options[x+stdprops].optionString= (char*)arProps[x].getStr();
+			options[x+stdprops].extraInfo= NULL;
 		}
 		vm_args2.version= 0x00010002;
 		vm_args2.options= options;
-		vm_args2.nOptions= cprops + 1;
+		vm_args2.nOptions= cprops + stdprops;
 		vm_args2.ignoreUnrecognized= JNI_TRUE;
-		
+	
 		err= pCreateJavaVM(&pJavaVM, &pJNIEnv, &vm_args2);
+
 		// Necessary to make debugging work. This thread will be suspended when this function
 		// returns.
 		if( err == 0)