diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-09 20:43:09 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-03-13 08:16:32 +0000 |
| commit | 9143dd4ebe37b608e43d04434cf831624bf55b65 (patch) | |
| tree | 6b5129958363f1f36b3a8a394d6741ec8bb2b40c /jvmfwk/inc | |
| parent | 898f3541371a3fc59afb0907d3397a4876791789 (diff) | |
Related tdf#54443 List only matching JREs
I.e. show only 64bit JRE for 64bit LO and 32bit JRE for 32bit LO
Change-Id: Id5e890637c7e1014bcb4e6fdd9ed9a33765112d5
Reviewed-on: https://gerrit.libreoffice.org/35026
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'jvmfwk/inc')
| -rw-r--r-- | jvmfwk/inc/vendorbase.hxx | 2 | ||||
| -rw-r--r-- | jvmfwk/inc/vendorplugin.hxx | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/jvmfwk/inc/vendorbase.hxx b/jvmfwk/inc/vendorbase.hxx index 2a24c9590858..c9ebcb256913 100644 --- a/jvmfwk/inc/vendorbase.hxx +++ b/jvmfwk/inc/vendorbase.hxx @@ -133,6 +133,7 @@ public: const OUString & getRuntimeLibrary() const; const OUString & getLibraryPath() const; bool supportsAccessibility() const; + bool isValidArch() const; /* determines if prior to running java something has to be done, like setting the LD_LIBRARY_PATH. This implementation checks if an LD_LIBRARY_PATH (getLD_LIBRARY_PATH) needs to be set and @@ -178,6 +179,7 @@ protected: OUString m_sHome; OUString m_sRuntimeLibrary; OUString m_sLD_LIBRARY_PATH; + OUString m_sArch; bool m_bAccessibility; diff --git a/jvmfwk/inc/vendorplugin.hxx b/jvmfwk/inc/vendorplugin.hxx index c9a2ccbbf01e..8d019f1c4474 100644 --- a/jvmfwk/inc/vendorplugin.hxx +++ b/jvmfwk/inc/vendorplugin.hxx @@ -55,6 +55,7 @@ enum class javaPluginError FailedVersion, NoJre, WrongVendor, + WrongArch, VmCreationFailed }; |