mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS aquavcl08 (1.25.8); FILE MERGED

Browse Source 
2008/05/15 12:54:14 cloph 1.25.8.1: Issue number: #i88987#
increase java VM version for Mac OSX
This commit is contained in:
Vladimir Glazounov
2008-07-01 22:14:03 +00:00
parent 5257d67585
commit e2b8c1c61d
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: sunjavaplugin.cxx,v $
* $Revision: 1.25 $
* $Revision: 1.26 $
*
* This file is part of OpenOffice.org.
*
@@ -572,7 +572,11 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
#endif
}
#ifdef MACOSX
vm_args.version= JNI_VERSION_1_4; // issue 88987
#else
vm_args.version= JNI_VERSION_1_2;
#endif
vm_args.options= options;
vm_args.nOptions= cOptions + 1;
vm_args.ignoreUnrecognized= JNI_TRUE;