From 8daebc0c343f79e6ded1f35a19ed83358ec3fcb3 Mon Sep 17 00:00:00 2001 From: rbuj Date: Thu, 21 Aug 2014 13:04:37 +0200 Subject: jvmfwk: Removes the checking for W98 in JREProperties.java Change-Id: Ia5be6b5893abef084b5e4203f9f02919289ce055 Reviewed-on: https://gerrit.libreoffice.org/11054 Reviewed-by: David Tardon Tested-by: David Tardon --- jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) (limited to 'jvmfwk') diff --git a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java index 525fb2263148..3f7bc48efd6d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java +++ b/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java @@ -43,27 +43,13 @@ 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 && ! bW98) + if (!bNoAccess) { try{ //This line is needed to get the accessibility properties -- cgit