diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:14:03 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-07-01 22:14:03 +0000 |
| commit | 46296ecd02e9be941a53f4693c36660893224920 (patch) | |
| tree | 97282354adb1bf8470ea5c59793665c0a744e11f /jvmfwk | |
| parent | 1b60b7748b4be87598e8d4de36e334df35f7ae7b (diff) | |
INTEGRATION: CWS aquavcl08 (1.25.8); FILE MERGED
2008/05/15 12:54:14 cloph 1.25.8.1: Issue number: #i88987#
increase java VM version for Mac OSX
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index 794b9fe93..a4c7f4f90 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -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. * @@ -571,8 +571,12 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( OString("\n")); #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; |