diff options
author | Stephan Bergmann <sbergman@redhat.com> | 2020-05-15 20:09:43 +0200 |
---|---|---|
committer | Stephan Bergmann <sbergman@redhat.com> | 2020-05-15 23:29:36 +0200 |
commit | 3bc8b14bea3c11159bdbd6fc4f9658fce3ba252e (patch) | |
tree | 848417f74e6d7036101b039fd8d13ccdaf291666 /include/jvmfwk/framework.hxx | |
parent | dd372b444f1f1821048e197768d5095e6204a102 (diff) |
Drop the JVM "feature" concept support
...now that 6ba74150866d71469827de9f4f19268dfa7db137
"jfw::isAccessibilitySupportDesired is obsolete" demonstrated that there is no
more need for JFW_FEATURE_ACCESSBRIDGE, the sole feature that had been provided.
* The javasettings_*.xml format still supports the <feature> tag, but it is
ignored when reading and always written as "0".
* There is no trace that "the bootstrap parameter
JFW_PLUGIN_NO_NOT_CHECK_ACCESSIBILITY" whose mention gets removed from
jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java had ever been supported.
(The only mention was 6873b3be47d71f94c38262003101576081acd241 "INTEGRATION:
CWS jre5issues (1.3.18); FILE MERGED: 2005/01/18 12:48:48 jl 1.3.18.1:
#i40879# in build environment the JRE is not tested for accessibility, because
of potential X server problems" introducing that comment.)
* The "Features" column is removed from the JRE table on the "LibreOffice -
Advance" options page.
Change-Id: I332d34b60548e7f2f852241ea8edfbee0ffcf510
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94329
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'include/jvmfwk/framework.hxx')
-rw-r--r-- | include/jvmfwk/framework.hxx | 37 |
1 files changed, 2 insertions, 35 deletions
diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx index 0b02a9e04447..08baf8f23d67 100644 --- a/include/jvmfwk/framework.hxx +++ b/include/jvmfwk/framework.hxx @@ -159,11 +159,6 @@ mentioned differently.</p> */ -/** indicates that a JRE has an accessibility bridge installed. - <p> - The flag is used with JavaInfo::nFeatures.</p> - */ -#define JFW_FEATURE_ACCESSBRIDGE 0x1l /** indicates that there must be an environment set up before the Java process runs. <p>Therefore, when a Java is selected in OO then the office must be @@ -218,12 +213,6 @@ struct JavaInfo </p> */ OUString sVersion; - /** indicates supported special features. - - <p>For example, <code>JFW_FEATURE_ACCESSBRIDGE</code> indicates that - assistive technology tools are supported.</p> - */ - sal_uInt64 nFeatures; /** indicates requirements for running the java runtime. <p>For example, it may be necessary to prepare the environment before @@ -288,9 +277,7 @@ JVMFWK_DLLPUBLIC bool jfw_isVMRunning(); which contains version requirements.</p> <p> JREs can be provided by different vendors. - The function obtains information about JRE installations and checks if - there is one among them that supports - a set of features (currently only accessibility is possible). If none was + The function obtains information about JRE installations. If none was found then it also uses a list of paths, which have been registered by <code>jfw_addJRELocation</code> to find JREs. Found JREs are examined in the same way.</p> @@ -310,27 +297,7 @@ JVMFWK_DLLPUBLIC bool jfw_isVMRunning(); the PATH environment variable is inspected and the respective JREs are checked for their suitability next.</p> <p> - When support for assistive technology is required, then the - <code>JavaInfo</code> objects, - which are provided by the <code>getJavaInfo</code> functions, are - examined for a suitable JRE. - That is, the <code>JavaInfo</code> object that refers to the JRE referred to - by JAVA_HOME is examined. If it does not have the flag - <code>JFW_FEATURE_ACCESSBRIDGE</code> in the member <code>nFeatures</code> - then the <JavaInfo></code> objects that are related to the PATH variable - are examined. - If no suitable <code>JavaInfo</code> object is found, all <code>JavaInfo</code> - objects - representing Java installations on the system -, are examined. - As long as no <code>JavaInfo</code> object has the flag - <code>JFW_FEATURE_ACCESSBRIDGE</code> in the member <code>nFeatures</code>, more - <code>JavaInfo</code> objects are examined. - This goes on until a <code>JavaInfo</code> object was found which - represents a suitable JRE. Or no such <code>JavaInfo</code> object was found. - In that case the first <code>JavaInfo</code> object that was detected - by the algorithm described above is used to determine the JRE which is to be used.</p> - <p> - If there is no need for the support of assistive technology tools then - the first <code>JavaInfo</code> object that is detected by the algorithm + The first <code>JavaInfo</code> object that is detected by the algorithm as described above is used.</p> @param pInfo |