diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2013-10-23 19:59:23 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2013-10-30 11:09:55 +0000 |
| commit | 72b954df59d64fa47f6380e4322243401afb683f (patch) | |
| tree | 38fb4c8f97499daeeb825941086a34b9387af665 /jvmfwk/source | |
| parent | 1dac69edef6f2b7632dc3be002ba7d3075c70b96 (diff) | |
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
Diffstat (limited to 'jvmfwk/source')
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index 299869526d09..993ddb3cf729 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 ); - } + // Java is no longer required for a11y - we use atk directly. + retVal = ::rtl::Bootstrap::get( "JFW_PLUGIN_FORCE_ACCESSIBILITY", sValue) && sValue == "1"; #endif + return retVal; } - rtl::ByteSequence encodeBase16(const rtl::ByteSequence& rawData) { static const char EncodingTable[] = |