diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 07:52:45 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-03-23 07:52:45 +0000 |
| commit | fbc97208ddd1b1d30bcb70476fba5afc47d1f78c (patch) | |
| tree | 07b69cfaa2eba615a0d32936a27a51a98e5e67da /jvmfwk | |
| parent | 45565786cd5c58f8b64e6d34b8dd55b1911e537b (diff) | |
INTEGRATION: CWS jl18 (1.4.12); FILE MERGED
2005/03/17 17:01:31 jl 1.4.12.2: #44608#
2005/03/17 15:29:00 jl 1.4.12.1: #44608# do not call getDefaultToolkit on Windows 98
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java index 66785849f97e..26aa01553cfd 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java +++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java @@ -26,13 +26,27 @@ public class JREProperties bNoAccess = true; } + //Find out on what operation system we are running. On Windows 98 + //we must not call getDefaultToolkit, because the office may freeze + //#i44608. + boolean bW98 = false; + String os = System.getProperty("os.name"); + + if (os != null) + { + os = os.trim(); + if (os.equalsIgnoreCase("Windows 98") || + os.indexOf("Windows 98") != -1) + bW98 = true; + } + //We need to be able to switch this part off because //it causes an exception if the DISPLAY variable has //a false value. Setting the noaccessibility argument //can be done by providing a sunjavaplugin.ini with //the bootstrap parameter JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY //set to "1" - if (bNoAccess == false) + if (bNoAccess == false && ! bW98) { try{ //This line is needed to get the accessibility properties |