[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/plugins jvmfwk/source

2019-12-14 Thread Stephan Bergmann (via logerrit) 
 include/jvmfwk/framework.hxx   |   15 ---
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |   58 +
 jvmfwk/plugins/sunmajor/pluginlib/util.hxx |3 -
 jvmfwk/source/fwkutil.cxx  |8 
 4 files changed, 3 insertions(+), 81 deletions(-)

New commits:
commit c0ac7ae73480cd2b01f24e88c01bee507e8638f9
Author: Stephan Bergmann 
AuthorDate: Sat Dec 14 11:48:27 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Sat Dec 14 12:45:15 2019 +0100

Remove JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY, JFW_PLUGIN_FORCE_ACCESSIBILITY

JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is no longer set anywhere since
6dcb3d4ef46312729bb6f16c473b433474863f68 "Related fdo#51252: No more 
prereg, no
more unopkg sync" in 2012.  JFW_PLUGIN_FORCE_ACCESSIBILITY had been 
introduced
with 72b954df59d64fa47f6380e4322243401afb683f "Avoid using gconftool. Atk
provides a11y not Java on Unix" in 2013, as a means for users on Unix-like
systems to still force a JVM with a11y support, even though that should no
longer be necessary for LO a11y.

Both environment variables were documented as "unofficial", with the warning
that the "may be removed in the future."  Theoretically, they could still 
be set
by some users, but the likelihood of their relevance today is considered 
low.

Change-Id: Ib718fb275b67a6de7fd7bc88ae428fd60168f4f4
Reviewed-on: https://gerrit.libreoffice.org/85140
Reviewed-by: Michael Meeks 
Tested-by: Jenkins

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index abcc059b3966..42f9fbc37181 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -157,21 +157,6 @@
 
 All settings made by this API are done for the current user if not
 mentioned differently.
-
-Other bootstrap variables
-
-JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
-This is an unofficial variable which was introduced to workaround 
external issues.
-It may be removed in the future. By setting it to 1, the framework will 
not try to
-find out if the system is configured to use accessibility tools or if a 
JRE has an
-accessible bridge installed
-JFW_PLUGIN_FORCE_ACCESSIBILITY
-This is an unofficial variable which was introduced to workaround 
external issues.
-It may be removed in the future. By setting it to 1, the framework will 
override a
-platform's desire not to probe each java backend to determine if it has an 
accessibility
-bridge installed. If the JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is set this 
variable has
-no effect, and is Unix specific.
-
 */
 
 /** indicates that a JRE has an accessibility bridge installed.
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 3afa7fcbbd07..d630a84dd904 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -26,9 +26,7 @@
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -150,47 +148,6 @@ bool getAndAddJREInfoByPath(
 }
 }
 
-OUString getLibraryLocation()
-{
-OUString libraryFileUrl;
-OSL_VERIFY(osl::Module::getUrlFromAddress(reinterpret_cast(getLibraryLocation), libraryFileUrl));
-return getDirFromFile(libraryFileUrl);
-}
-
-struct InitBootstrap
-{
-rtl::Bootstrap * operator()(const OUString& sIni)
-{
-static rtl::Bootstrap aInstance(sIni);
-return & aInstance;
-
-}
-   };
-
-   struct InitBootstrapData
-   {
-   OUString const & operator()()
-   {
-static OUString sIni;
-OUStringBuffer buf( 255);
-buf.append( getLibraryLocation());
-#ifdef MACOSX
-buf.append( "/../" LIBO_ETC_FOLDER );
-#endif
-buf.append( SAL_CONFIGFILE("/sunjavaplugin") );
-sIni = buf.makeStringAndClear();
-JFW_TRACE2("Using configuration file " << sIni);
-return sIni;
-}
-   };
-}
-
-rtl::Bootstrap * getBootstrap()
-{
-return rtl_Instance< rtl::Bootstrap, InitBootstrap,
-::osl::MutexGuard, ::osl::GetGlobalMutex,
-OUString, InitBootstrapData >::create(
-InitBootstrap(), ::osl::GetGlobalMutex(), InitBootstrapData());
 }
 
 namespace {
@@ -389,13 +346,6 @@ void AsynchReader::execute()
 }
 }
 
-static bool isEnvVarSetToOne(const OUString )
-{
-OUString aValue;
-getBootstrap()->getFrom(aVar, aValue);
-return aValue == "1";
-}
-
 bool getJavaProps(const OUString & exePath,
 #ifdef JVM_ONE_PATH_CHECK
   const OUString & homePath,
@@ -436,13 +386,9 @@ bool getJavaProps(const OUString & exePath,
 
 #ifdef UNX
 // Java is no longer required for a11y - we use atk directly.
-bool bNoAccessibility = 
!isEnvVarSetToOne("JFW_PLUGIN_FORCE_ACCESSIBILITY");
+bool bNoAccessibility = true;

[Libreoffice-commits] core.git: include/jvmfwk

2019-12-05 Thread Andrea Gelmini (via logerrit) 
 include/jvmfwk/framework.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6b1afab2dd556657f3a28fd2e7002650b88c8a26
Author: Andrea Gelmini 
AuthorDate: Wed Dec 4 20:22:21 2019 +0100
Commit: Julien Nabet 
CommitDate: Thu Dec 5 10:12:34 2019 +0100

Fix typo

Change-Id: I54ab8a54f676c125649aa1f9915b1d80bc821e7b
Reviewed-on: https://gerrit.libreoffice.org/84481
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 3c7fe2981436..abcc059b3966 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -465,7 +465,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 were not met.
 JFW_E_JAVA_DISABLED the use of Java is currently disabled. 
 JFW_E_NO_SELECT there is no JRE selected yet. 
-JFW_E_RUNNIN_JVM there is already a VM running.
+JFW_E_RUNNING_JVM there is already a VM running.
 JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
 JRE has been selected afterwards. 
 JFW_E_NEED_RESTART in the current process a different JRE has been selected
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk

2019-07-10 Thread Andrea Gelmini (via logerrit) 
 include/jvmfwk/framework.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 0c480c2d8d8d9e487215f49faf398d31d4898416
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:33 2019 +
Commit: Julien Nabet 
CommitDate: Wed Jul 10 11:00:45 2019 +0200

Fix typo

Change-Id: If77bba3aabe872a9616cd8cad94199e87cab9875
Reviewed-on: https://gerrit.libreoffice.org/75325
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index a9b59267eccc..a376920bd96a 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -161,12 +161,12 @@
 Other bootstrap variables
 
 JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY
-This is a unofficial variable which was introduced to workaround 
external issues.
+This is an unofficial variable which was introduced to workaround 
external issues.
 It may be removed in the future. By setting it to 1, the framework will 
not try to
 find out if the system is configured to use accessibility tools or if a 
JRE has an
 accessible bridge installed
 JFW_PLUGIN_FORCE_ACCESSIBILITY
-This is a unofficial variable which was introduced to workaround 
external issues.
+This is an unofficial variable which was introduced to workaround 
external issues.
 It may be removed in the future. By setting it to 1, the framework will 
override a
 platform's desire not to probe each java backend to determine if it has an 
accessibility
 bridge installed. If the JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is set this 
variable has
@@ -698,7 +698,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const 
JavaInfo *pInfo, bool *ex
 jfw_unlock(). The function should be called if one
 needs an exact snapshot of the current settings. Then the settings
 are retrieved one by one without risk that the settings may be changed
-by a different thread. Similiary if one needs to make settings which
+by a different thread. Similarity if one needs to make settings which
 should become effective at the same time then jfw_lock
 should be called. That is, jfw_startVM which uses the
 settings cannot be called before all settings have be made.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/source stoc/source

2017-04-12 Thread Stephan Bergmann 
 include/jvmfwk/framework.hxx  |6 ++
 jvmfwk/source/framework.cxx   |   14 --
 stoc/source/javavm/javavm.cxx |   30 --
 3 files changed, 14 insertions(+), 36 deletions(-)

New commits:
commit 1a2afa01c98b6edefaaf18590d6e55c3a9731920
Author: Stephan Bergmann 
Date:   Wed Apr 12 23:10:11 2017 +0200

Simplify passing options to jfw_startVM

Change-Id: Idac31e282fe4df69449298a03d491473e460c742
Reviewed-on: https://gerrit.libreoffice.org/36495
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index d6059bb640af..afab60eef427 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -454,9 +454,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 @param pInfo
 [in] optional pointer to a specific JRE; must be caller-freed if not NULL
 @param arOptions
-[in] the array containing additional start arguments or NULL.
-@param nSize
-[in] the size of the array arOptions.
+[in] the vector containing additional start arguments.
 @param ppVM
 [out] the JavaVM pointer.
 @param ppEnv
@@ -484,7 +482,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 JAVA_HOMEdoes not meet the version requirements.
  */
 JVMFWK_DLLPUBLIC javaFrameworkError jfw_startVM(
-JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 nSize,
+JavaInfo const * pInfo, std::vector const & arOptions,
 JavaVM ** ppVM, JNIEnv ** ppEnv);
 
 /** determines the JRE that is to be used.
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 0165fcf9efd9..42d99557fc0b 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -187,10 +187,9 @@ javaFrameworkError 
jfw_findAllJREs(std::vector *pparI
 }
 
 javaFrameworkError jfw_startVM(
-JavaInfo const * pInfo, JavaVMOption * arOptions, sal_Int32 cOptions,
+JavaInfo const * pInfo, std::vector const & arOptions,
 JavaVM ** ppVM, JNIEnv ** ppEnv)
 {
-assert(cOptions == 0 || arOptions != nullptr);
 assert(ppVM != nullptr);
 javaFrameworkError errcode = JFW_E_NONE;
 
@@ -289,7 +288,7 @@ javaFrameworkError jfw_startVM(
 // it contains the classpath and all options set in the
 //options dialog
 std::unique_ptr sarJOptions(
-new JavaVMOption[cOptions + 2 + vmParams.size()]);
+new JavaVMOption[arOptions.size() + 2 + vmParams.size()]);
 JavaVMOption * arOpt = sarJOptions.get();
 if (! arOpt)
 return JFW_E_ERROR;
@@ -313,10 +312,13 @@ javaFrameworkError jfw_startVM(
 index ++;
 }
 //add all options of the arOptions argument
-for (int ii = 0; ii < cOptions; ii++)
+std::vector convertedOptions;
+for (auto const & ii: arOptions)
 {
-arOpt[index].optionString = arOptions[ii].optionString;
-arOpt[index].extraInfo = arOptions[ii].extraInfo;
+OString conv = OUStringToOString(ii, osl_getThreadTextEncoding());
+convertedOptions.push_back(conv);
+arOpt[index].optionString = const_cast(conv.getStr());
+arOpt[index].extraInfo = nullptr;
 index++;
 }
 
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 18ab9084c78e..a4e9efe66e59 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -706,33 +706,11 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< 
sal_Int8 > const & rProcessId)
 stoc_javavm::JVM aJvm;
 initVMConfiguration(, m_xContext->getServiceManager(),
 m_xContext);
-//Create the JavaVMOption array
 const std::vector & props = aJvm.getProperties();
-std::unique_ptr sarOptions(
-new JavaVMOption[props.size()]);
-JavaVMOption * arOptions = sarOptions.get();
-//Create an array that contains the strings which are passed
-//into the options
-std::unique_ptr sarPropStrings(
- new OString[props.size()]);
-OString * arPropStrings = sarPropStrings.get();
-
-OString sJavaOption("-");
-typedef std::vector::const_iterator cit;
-int index = 0;
-for (cit i = props.begin(); i != props.end(); ++i)
+std::vector options;
+for (auto const & i: props)
 {
-OString sOption = OUStringToOString(
-*i, osl_getThreadTextEncoding());
-
-if (!sOption.matchIgnoreAsciiCase(sJavaOption))
-arPropStrings[index]= OString("-D") + sOption;
-else
-arPropStrings[index] = sOption;
-
-arOptions[index].optionString = 
const_cast(arPropStrings[index].getStr());
-

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/plugins jvmfwk/source

2017-04-11 Thread Stephan Bergmann 
 include/jvmfwk/framework.hxx|   12 --
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |5 +-
 jvmfwk/source/elements.cxx  |   10 -
 jvmfwk/source/framework.cxx |   35 ++--
 4 files changed, 22 insertions(+), 40 deletions(-)

New commits:
commit 59fddf430f4d80c7e9ae0b7064697f5471bffedf
Author: Stephan Bergmann 
Date:   Tue Apr 11 19:10:23 2017 +0200

Calls to jvmfwk/framework.hxx must not pass in null, drop JFW_E_INVALID_ARG

Change-Id: Iff4b8ccc79e194f645791ac73818e3b677ae32a6

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index a3612a99e25a..fe806af5bc83 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -194,7 +194,6 @@ enum javaFrameworkError
 {
 JFW_E_NONE,
 JFW_E_ERROR,
-JFW_E_INVALID_ARG,
 JFW_E_NO_SELECT,
 JFW_E_INVALID_SETTINGS,
 JFW_E_NEED_RESTART,
@@ -384,7 +383,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_findAndSelectJRE(std::unique_ptr
-JFW_E_INVALID_ARG parInfo was NULL
 JFW_E_ERROR an error occurred. 
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -413,7 +411,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_findAllJREs(
 
@return
JFW_E_NONE function ran successfully.
-   JFW_E_INVALID_ARG at least on of the parameters was NULL
JFW_E_ERROR an error occurred. 
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
were not met.
@@ -468,8 +465,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getJavaInfoByPath(
 
 @return
 JFW_E_NONE function ran successfully.
-JFW_E_INVALID_ARG ppVM, ppEnv are NULL or
-arOptions was NULL but nSize was greater 0.
 JFW_E_ERROR an error occurred. 
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -542,7 +537,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_setSelectedJRE(JavaInfo const *pInfo);
 
 @return
 JFW_E_NONE function ran successfully.
-JFW_E_INVALIDARG ppInfo is a NULL.
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
 JFW_E_INVALID_SETTINGS the javavendors.xml has been changed and no
@@ -576,7 +570,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setEnabled(bool 
bEnabled);
 
@return
JFW_E_NONE function ran successfully.
-   JFW_E_INVALIDARG pbEnabled is NULL
JFW_E_ERROR An error occurred.
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -600,7 +593,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getEnabled(bool 
*pbEnabled);
 
 @return
 JFW_E_NONE function ran successfully.
-JFW_E_INVALIDARG arArgs is NULL and nSize is not 0
 JFW_E_ERROR An error occurred.
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -625,7 +617,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_setVMParameters(
 
 @return
 JFW_E_NONE function ran successfully.
-JFW_E_INVALIDARG parParameters or pSize are  NULL
 JFW_E_ERROR An error occurred.
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -647,7 +638,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError jfw_getVMParameters(
 
@return
JFW_E_NONE function ran successfully.
-   JFW_E_INVALIDARG pCP is NULL.
JFW_E_ERROR An error occurred.
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -666,7 +656,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_setUserClassPath(rtl_uString * pCP);
 
@return
JFW_E_NONE function ran successfully.
-   JFW_E_INVALIDARG ppCP is NULL.
JFW_E_ERROR An error occurred.
JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
@@ -694,7 +683,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_getUserClassPath(rtl_uString ** ppCP);
 
 @return
 JFW_E_NONE function ran successfully.
-JFW_E_INVALIDARG sLocation is NULL.
 JFW_E_ERROR An error occurred.
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index a5f11e6a3c21..84e60a9cf254 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -645,14 +645,15 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 JavaVM ** ppVm,
 JNIEnv ** ppEnv)
 {
+assert(pInfo != nullptr);
+assert(ppVm != nullptr);
+assert(ppEnv != nullptr);
 // unless guard is volatile the following warning occurs on gcc:
 // warning: variable 't' might be clobbered by `longjmp' or `vfork'
 volatile osl::MutexGuard guard(PluginMutex::get());
 // unless errorcode is volatile the following warning occurs on gcc:
 // warning: variable 'errorcode' might

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/plugins jvmfwk/source

2017-04-11 Thread Stephan Bergmann 
 include/jvmfwk/framework.hxx|1 -
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |6 --
 jvmfwk/source/framework.cxx |3 ---
 3 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 15c98f1740708ad7c05753ea28d5ad8ed4430e02
Author: Stephan Bergmann 
Date:   Tue Apr 11 18:25:04 2017 +0200

jfw_existJRE requires non-null args, never returns JFW_E_INVALID_ARG

Change-Id: I2067b77393427a5a6a4273c2f609ff8d335f436a

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 2373a3e713bc..139cda024766 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -722,7 +722,6 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_addJRELocation(rtl_uString * sLocation);
@return
 JFW_E_NONE the function ran successfully.
 JFW_E_ERROR an error occurred during execution.
-JFW_E_INVALID_ARG pInfo contains invalid data
  */
 JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool 
*exist);
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index 860cbc4f2522..a5f11e6a3c21 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -30,6 +30,7 @@
 
 #include 
 
+#include 
 #include 
 #include "config_options.h"
 #include "osl/diagnose.h"
@@ -884,9 +885,10 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 
 javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist)
 {
+assert(pInfo != nullptr);
+assert(exist != nullptr);
+
 javaPluginError ret = javaPluginError::NONE;
-if (!pInfo || !exist)
-return javaPluginError::InvalidArg;
 OUString sLocation(pInfo->sLocation);
 
 if (sLocation.isEmpty())
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index c094ea6a8da1..a0208180dc30 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -987,9 +987,6 @@ javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool 
*exist)
 case javaPluginError::NONE:
 ret = JFW_E_NONE;
 break;
-case javaPluginError::InvalidArg:
-ret = JFW_E_INVALID_ARG;
-break;
 case javaPluginError::Error:
 ret = JFW_E_ERROR;
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/inc jvmfwk/plugins jvmfwk/source stoc/source

2017-04-11 Thread Stephan Bergmann 
 include/jvmfwk/framework.hxx|4 ++--
 jvmfwk/inc/vendorplugin.hxx |2 +-
 jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx|2 +-
 jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx |2 +-
 jvmfwk/source/framework.cxx |2 +-
 stoc/source/javavm/javavm.cxx   |2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit 583508ced26a422145111242c027b3fbd5687dc5
Author: Stephan Bergmann 
Date:   Tue Apr 11 18:18:42 2017 +0200

sal_Bool -> bool

Change-Id: I8df49f349308cc17d684d5c0e8215aa628dfaeda

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index 99d25da9c03e..2373a3e713bc 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -716,7 +716,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_addJRELocation(rtl_uString * sLocation);
 @param pInfo
 [in]  the JavaInfo object with information about the JRE.
 @param pp_exist
-[out] the parameter is set to either sal_True or sal_False. The value 
is
+[out] the parameter is set to either true or false. The value is
 only valid if the function returns JFW_E_NONE.
 
@return
@@ -724,7 +724,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_addJRELocation(rtl_uString * sLocation);
 JFW_E_ERROR an error occurred during execution.
 JFW_E_INVALID_ARG pInfo contains invalid data
  */
-JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, 
sal_Bool *exist);
+JVMFWK_DLLPUBLIC javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool 
*exist);
 
 
 /** locks this API so that it cannot be used by other threads.
diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx
index 8d019f1c4474..6bae6370c710 100644
--- a/jvmfwk/inc/vendorplugin.hxx
+++ b/jvmfwk/inc/vendorplugin.hxx
@@ -314,7 +314,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
 javaPluginError::Error an error occurred during execution.
 javaPluginError::InvalidArg pInfo contains invalid data
  */
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist);
+javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist);
 
 #endif
 
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx 
b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 3c1b1901eb75..4f422fd15f54 100644
--- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
+++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
@@ -84,7 +84,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
 else
 {
 //check if the JRE was not uninstalled
-sal_Bool bExist = false;
+bool bExist = false;
 errcode = jfw_existJRE(aInfo.get(), );
 if (errcode == JFW_E_NONE)
 {
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
index d69b439f2f0a..860cbc4f2522 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx
@@ -882,7 +882,7 @@ javaPluginError jfw_plugin_startJavaVirtualMachine(
return errorcode;
 }
 
-javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, bool *exist)
 {
 javaPluginError ret = javaPluginError::NONE;
 if (!pInfo || !exist)
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 218e2ecad297..c094ea6a8da1 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -973,7 +973,7 @@ javaFrameworkError jfw_addJRELocation(rtl_uString * 
sLocation)
 
 }
 
-javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, sal_Bool *exist)
+javaFrameworkError jfw_existJRE(const JavaInfo *pInfo, bool *exist)
 {
 //get the function jfw_plugin_existJRE
 jfw::VendorSettings aVendorSettings;
diff --git a/stoc/source/javavm/javavm.cxx b/stoc/source/javavm/javavm.cxx
index 41d786f91a82..3d023ce2373c 100644
--- a/stoc/source/javavm/javavm.cxx
+++ b/stoc/source/javavm/javavm.cxx
@@ -815,7 +815,7 @@ JavaVirtualMachine::getJavaVM(css::uno::Sequence< sal_Int8 
> const & rProcessId)
 std::unique_ptr aJavaInfo;
 if (JFW_E_NONE == jfw_getSelectedJRE())
 {
-sal_Bool bExist = false;
+bool bExist = false;
 if (JFW_E_NONE == jfw_existJRE(aJavaInfo.get(), ))
 {
 if (!bExist
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk include/o3tl include/oox include/osl include/registry include/rtl include/sal include/sfx2

2017-03-25 Thread Andrea Gelmini 
 include/jvmfwk/framework.hxx|4 ++--
 include/o3tl/any.hxx|2 +-
 include/o3tl/strong_int.hxx |4 ++--
 include/oox/dump/dumperbase.hxx |2 +-
 include/osl/file.h  |6 +++---
 include/osl/security_decl.hxx   |2 +-
 include/osl/socket.h|2 +-
 include/osl/socket_decl.hxx |4 ++--
 include/registry/registry.hxx   |2 +-
 include/registry/types.hxx  |2 +-
 include/rtl/bootstrap.h |2 +-
 include/rtl/byteseq.h   |4 ++--
 include/rtl/locale.h|2 +-
 include/sal/types.h |4 ++--
 include/sfx2/childwin.hxx   |2 +-
 include/sfx2/docmacromode.hxx   |2 +-
 include/sfx2/shell.hxx  |2 +-
 include/sfx2/thumbnailview.hxx  |2 +-
 18 files changed, 25 insertions(+), 25 deletions(-)

New commits:
commit 86781bcfc8f12df980af5c86c2f9e75067f02abc
Author: Andrea Gelmini 
Date:   Fri Mar 24 11:42:19 2017 +0100

Fix typos

Change-Id: I998e9b2ad8ebdcc983239192cb61f6689e378ad9
Reviewed-on: https://gerrit.libreoffice.org/35633
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index b2d550e28c3a..8f3a3a0022b9 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -293,7 +293,7 @@ struct JavaInfoGuard {
the second argument which is compared with the first.
@return
true - both object represent the same JRE.
-   false - the objects represend different JREs
+   false - the objects represent different JREs
  */
 JVMFWK_DLLPUBLIC bool jfw_areEqualJavaInfo(
 JavaInfo const * pInfoA,JavaInfo const * pInfoB);
@@ -328,7 +328,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError 
jfw_isVMRunning(sal_Bool *bRunning);
 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 accessibilty is possible). If none was
+a set of features (currently only accessibility is possible). If none was
 found then it also uses a list of paths, which have been registered
 by jfw_addJRELocation
 to find JREs. Found JREs are examined in the same way.
diff --git a/include/o3tl/any.hxx b/include/o3tl/any.hxx
index 92627bdc7315..85fd28106419 100644
--- a/include/o3tl/any.hxx
+++ b/include/o3tl/any.hxx
@@ -98,7 +98,7 @@ template inline boost::optional 
tryGetConverted(
 /** Try to access the value of a specific type stored in an Any.
 
 In trying to obtain a value, the same set of conversions as supported by
-">>=" are considere.
+">>=" are considered.
 
 The returned object is a proxy.  Proxies can be either positive or 
negative.
 Each proxy can be contextually converted to bool, yielding true iff the
diff --git a/include/o3tl/strong_int.hxx b/include/o3tl/strong_int.hxx
index 690fefa9032a..30322b3efe6a 100644
--- a/include/o3tl/strong_int.hxx
+++ b/include/o3tl/strong_int.hxx
@@ -33,8 +33,8 @@ namespace o3tl
 ///   typedef o3tl::strong_int MyInt;
 ///
 /// \param UNDERLYING_TYPE the underlying scalar type
-/// \param PHANTOM_TYPEa type tag, used to distinguish this instantion of 
the template
-///from other instantiantions with the same 
UNDERLYING_TYPE.
+/// \param PHANTOM_TYPEa type tag, used to distinguish this instantiation 
of the template
+///from other instantiations with the same 
UNDERLYING_TYPE.
 ///
 template 
 struct strong_int
diff --git a/include/oox/dump/dumperbase.hxx b/include/oox/dump/dumperbase.hxx
index 048ea78fb88b..1343b533038d 100644
--- a/include/oox/dump/dumperbase.hxx
+++ b/include/oox/dump/dumperbase.hxx
@@ -498,7 +498,7 @@ typedef std::shared_ptr< NameListBase > NameListRef;
 
 /** Base class of all classes providing names for specific values (name lists).
 
-The idea is to provide a unique interfase for all different methods to
+The idea is to provide a unique interface for all different methods to
 write specific names for any values. This can be enumerations (dedicated
 names for a subset of values), or names for bits in bit fields. Classes
 derived from this base class implement the specific behaviour for the
diff --git a/include/osl/file.h b/include/osl/file.h
index 5773f503fc0a..9404ffa53dbf 100644
--- a/include/osl/file.h
+++ b/include/osl/file.h
@@ -34,7 +34,7 @@ extern "C" {
 
 Main goals and usage hints
 
-The main intentention of this interface is to provide an universal portable and
+The main intention of this interface is to provide an universal portable and
 high performance access to file system issues on any operating system.
 
 There are a few main goals:
@@ -571,7 +571,7 @@ struct _oslVolumeInfo {
 sal_uInt64  uFreeSpace;
 /** Maximum length of file name of a single item */

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/source

2017-03-03 Thread Samuel Mehrbrodt 
 include/jvmfwk/framework.hxx |2 +-
 jvmfwk/source/framework.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 64a50fc271cf20b5e10b54b46ad52810a9722c3a
Author: Samuel Mehrbrodt 
Date:   Fri Mar 3 17:08:55 2017 +0100

Typo: requirments -> requirements

Change-Id: I02c5846eb51071e1a958c3d65e150fb7cbc7d58a
Reviewed-on: https://gerrit.libreoffice.org/34873
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/include/jvmfwk/framework.hxx b/include/jvmfwk/framework.hxx
index c8be2dc..b2d550e 100644
--- a/include/jvmfwk/framework.hxx
+++ b/include/jvmfwk/framework.hxx
@@ -237,7 +237,7 @@ struct JavaInfo
 assistive technology tools are supported.
  */
 sal_uInt64 nFeatures;
-/** indicates requirments for running the java runtime.
+/** indicates requirements for running the java runtime.
 
 For example, it may be necessary to prepare the environment before
 the runtime is created. That could mean, setting the
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 94f7c2c..a56c294 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -271,7 +271,7 @@ javaFrameworkError jfw_startVM(
 return JFW_E_NEED_RESTART;
 
 //Check if the selected Java was set in this process. If so it
-//must not have the requirments flag JFW_REQUIRE_NEEDRESTART
+//must not have the requirements flag JFW_REQUIRE_NEEDRESTART
 if ((aInfo->nRequirements & JFW_REQUIRE_NEEDRESTART)
 && jfw::wasJavaSelectedInSameProcess())
 return JFW_E_NEED_RESTART;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk

2014-12-20 Thread Julien Nabet 
 include/jvmfwk/framework.h |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c1f4afcbf5a4eac22d330c7302ef5447d1e71dbf
Author: Julien Nabet serval2...@yahoo.fr
Date:   Sat Dec 20 16:50:40 2014 +0100

Typo: bootrap=bootstrap

Change-Id: Icf3202c3f3f733bf65c15503063903cb5322d593

diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index 8421134..59ffb20 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -77,7 +77,7 @@ extern C {
 jar file then it can be referenced in the manifest file of the first jar. 
However,
 a user may add jars to the class path by using this API. If it becomes 
necessary
 to add files to the class path which is to be used by all users then one 
can use
-the bootrap parameter UNO_JAVA_JFW_CLASSPATH_URLS. The value contains of 
file URLs
+the bootstrap parameter UNO_JAVA_JFW_CLASSPATH_URLS. The value contains of 
file URLs
 which must be separated by spaces./p
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/source

2014-05-08 Thread Stephan Bergmann 
 include/jvmfwk/framework.h  |   33 ++---
 jvmfwk/source/framework.cxx |   29 ++---
 2 files changed, 4 insertions(+), 58 deletions(-)

New commits:
commit 5a8b1b16de62bf595df7927891d539691ac26a89
Author: Stephan Bergmann sberg...@redhat.com
Date:   Thu May 8 12:58:01 2014 +0200

Remove unused jfw_setJRELocations

Change-Id: If71cc5052f7ddfbc2d69ba01aa0cd3be2a4def8e

diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index 50480da..570f852 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -337,7 +337,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL 
jfw_isVMRunning(sal_Bool *bRunning)
 installation and checks if they there is one among them that supports
 a set of features (currently only accessibilty is possible). If none was
 found then it also uses a list of paths, which have been registered
-by codejfw_addJRELocation/code or codejfw_setJRELocations/code
+by codejfw_addJRELocation/code
 to find JREs. Found JREs are examined in the same way./p
 p
 A JRE installation is only selected if it meets the version requirements.
@@ -394,7 +394,7 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL 
jfw_findAndSelectJRE(JavaInfo **pIn
 the plug-in libraries to provide lists of available codeJavaInfo/code
 objects where each object represents a JRE (see vendorplugin.h,
 getAllJavaInfos). It also uses a list of paths, which have been registered
-by codejfw_addJRELocation/code or codejfw_setJRELocations/code.
+by codejfw_addJRELocation/code.
 It is checked if the path still contains a valid JRE and if so the 
respective
 codeJavaInfo/code object will be appended to the array unless there is
 already an equal object./p
@@ -729,38 +729,9 @@ JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL 
jfw_getUserClassPath(rtl_uString **
 JFW_E_CONFIGURATION mode was not properly set or their prerequisites
 were not met.br/
 JFW_E_DIRECT_MODE the function cannot be used in this mode.
-@see jfw_setJRELocations
  */
 JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_addJRELocation(rtl_uString * 
sLocation);
 
-/** saves the locations of a number of JREs.
-
-p
-The function does not verify if the paths points to JRE. However,
-it makes sure that every path is unique. That is, if the array
-contains strings which are the same then only one is stored./p
-p
-If codearLocations/code is NULL or it has the length null (nSize = 0)
-then all previously stored paths are deleted. Otherwise,
-the old values are overwritten./p
-
-@param arLocations
-[in] array of paths to locations of JREs.
-
-@param nSize
-[in] the size of the array codearLocations/code
-
-@return
-JFW_E_NONE function ran successfully.br/
-JFW_E_INVALIDARG arLocation is NULL and nSize is not null.br/
-JFW_E_ERROR An error occurred.br/
-JFW_E_CONFIGURATION mode was not properly set or their prerequisites
-were not met.br/
-JFW_E_DIRECT_MODE the function cannot be used in this mode.
-@see jfw_addJRELocations
- */
-JVMFWK_DLLPUBLIC javaFrameworkError SAL_CALL jfw_setJRELocations(
-rtl_uString ** arLocations, sal_Int32 nSize);
 /** obtains an array containing paths to JRE installations.
 
 p
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index dcaac1b..56e24c6 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -171,7 +171,7 @@ javaFrameworkError SAL_CALL jfw_findAllJREs(JavaInfo 
***pparInfo, sal_Int32 *pSi
 rtl_freeMemory(arInfos);
 
 //Check if the current plugin can detect JREs at the location
-// of the paths added by jfw_setJRELocations or jfw_addJRELocation
+// of the paths added by jfw_addJRELocation
 //get the function from the plugin
 #ifndef DISABLE_DYNLOADING
 jfw_plugin_getJavaInfoByPath_ptr jfw_plugin_getJavaInfoByPathFunc =
@@ -591,7 +591,7 @@ javaFrameworkError SAL_CALL jfw_findAndSelectJRE(JavaInfo 
**pInfo)
 if (!pluginLib.is())
 return JFW_E_NO_PLUGIN;
 //Check if the current plugin can detect JREs at the location
-// of the paths added by jfw_setJRELocations or 
jfw_addJRELocation
+// of the paths added by jfw_addJRELocation
 //get the function from the plugin
 jfw_plugin_getJavaInfoByPath_ptr 
jfw_plugin_getJavaInfoByPathFunc =
 (jfw_plugin_getJavaInfoByPath_ptr) 
pluginLib.getFunctionSymbol(
@@ -1109,31 +1109,6 @@ javaFrameworkError SAL_CALL 
jfw_addJRELocation(rtl_uString * sLocation)
 
 }
 
-javaFrameworkError SAL_CALL jfw_setJRELocations(
-rtl_uString ** arLocations, sal_Int32 nLen)
-{
-javaFrameworkError errcode = JFW_E_NONE;
-try
-{
-osl::MutexGuard guard(jfw::FwkMutex::get());
-if (jfw::getMode() ==

[Libreoffice-commits] core.git: include/jvmfwk jvmfwk/plugins jvmfwk/source

2013-10-30 Thread Michael Meeks 
 include/jvmfwk/framework.h |8 +++-
 jvmfwk/plugins/sunmajor/pluginlib/util.cxx |   16 +---
 jvmfwk/source/fwkutil.cxx  |   22 +-
 3 files changed, 25 insertions(+), 21 deletions(-)

New commits:
commit 72b954df59d64fa47f6380e4322243401afb683f
Author: Michael Meeks michael.me...@collabora.com
Date:   Wed Oct 23 19:59:23 2013 +0100

Avoid using gconftool. Atk provides a11y not Java on Unix.

cf. comment in framework header. Should have no impact on real
run-time Java a11y, which would be enabled later as-needed; only
on JRE selection. For extreme corner-cases, where your auto-selected
JRE has no a11y support either select another JRE in the UI or:

$ export JFW_PLUGIN_FORCE_ACCESSIBILITY=1

to override.

Change-Id: I59a6428e5a11664b75c29580cad76eb9500db45a

diff --git a/include/jvmfwk/framework.h b/include/jvmfwk/framework.h
index c404a95..7099f50 100644
--- a/include/jvmfwk/framework.h
+++ b/include/jvmfwk/framework.h
@@ -73,7 +73,7 @@ extern C {
 /p
 
 pSetting the class path used by a Java VM should not be necesarry. The 
locations
-of Jar files should be knows by a class loader. If a jar file depends on 
another
+of Jar files should be known by a class loader. If a jar file depends on 
another
 jar file then it can be referenced in the manifest file of the first jar. 
However,
 a user may add jars to the class path by using this API. If it becomes 
necessary
 to add files to the class path which is to be used by all users then one 
can use
@@ -168,6 +168,12 @@ extern C {
 It may be removed in the future. By setting it to 1, the framework will 
not try to
 find out if the system is configured to use accessibility tools or if a 
JRE has an
 accessibiliy bridge installed/dd
+dtJFW_PLUGIN_FORCE_ACCESSIBILITY/dt
+ddThis is a unofficial variable which was introduced to workaround 
external issues.
+It may be removed in the future. By setting it to 1, the framework will 
override a
+platform's desire not to probe each java backend to determine if it has an 
accessibility
+bridge installed. If the JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY is set this 
variable has
+no effect, and is Unix specific./dd
 /dl
 */
 
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index 75c3412..832616f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -364,6 +364,12 @@ void AsynchReader::execute()
 }
 }
 
+static bool isEnvVarSetToOne(const OUString aVar)
+{
+OUString aValue;
+getBootstrap()-getFrom(aVar, aValue);
+return aValue == 1;
+}
 
 bool getJavaProps(const OUString  exePath,
 #ifdef JVM_ONE_PATH_CHECK
@@ -393,8 +399,7 @@ bool getJavaProps(const OUString  exePath,
 //If the bootstrap variable is 1 then we pass the argument
 //noaccessibility to JREProperties.class. This will prevent
 //that it calls   java.awt.Toolkit.getDefaultToolkit();
-OUString sValue;
-getBootstrap()-getFrom(JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY, sValue);
+bool bNoAccessibility = 
isEnvVarSetToOne(JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY);
 
 //prepare the arguments
 sal_Int32 cArgs = 3;
@@ -404,8 +409,13 @@ bool getJavaProps(const OUString  exePath,
 OUString arg4 = noaccessibility;
 rtl_uString *args[4] = {arg1.pData, arg2.pData, arg3.pData};
 
+#ifdef UNX
+// Java is no longer required for a11y - we use atk directly.
+bNoAccessibility = !isEnvVarSetToOne(JFW_PLUGIN_FORCE_ACCESSIBILITY);
+#endif
+
 // Only add the fourth param if the bootstrap parameter is set.
-if (sValue.equals(OUString::number( 1)))
+if (bNoAccessibility)
 {
 args[3] = arg4.pData;
 cArgs = 4;
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx
index 2998695..993ddb3 100644
--- a/jvmfwk/source/fwkutil.cxx
+++ b/jvmfwk/source/fwkutil.cxx
@@ -56,9 +56,8 @@ namespace jfw
 bool isAccessibilitySupportDesired()
 {
 OUString sValue;
-if ((sal_True == ::rtl::Bootstrap::get(
-OUString(JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY), sValue))  sValue 
== 1
-)
+if (::rtl::Bootstrap::get( JFW_PLUGIN_DO_NOT_CHECK_ACCESSIBILITY, 
sValue) 
+sValue == 1 )
 return false;
 
 bool retVal = false;
@@ -103,24 +102,13 @@ bool isAccessibilitySupportDesired()
 RegCloseKey(hKey);
 
 #elif defined UNX
-char buf[16];
-// use 2 shells to suppress the eventual gcontool-2 not found message
-// of the shell trying to execute the command
-FILE* fp = popen( /bin/sh 2/dev/null -c \gconftool-2 -g 
/desktop/gnome/interface/accessibility\, r );
-if( fp )
-{
-if( fgets( buf, sizeof(buf), fp ) )
-{
-int nCompare = strncasecmp( buf, true, 4 );
-retVal = (nCompare == 0 ? true : false);
-}
-pclose( fp );
-