diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:35:01 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-25 10:35:01 +0000 |
| commit | dfb6c6834f9a2a37c56af3d0a604b76f6bb9546a (patch) | |
| tree | e4f9da0960a105841f54b6156e6cba5a69d88c04 /jvmfwk/plugins/sunmajor/javaenvsetup | |
| parent | ad70fded380e3c20066001cac92684ff9ce173e9 (diff) | |
INTEGRATION: CWS morejava (1.8.24); FILE MERGED
2005/08/26 13:55:40 fridrich_strba 1.8.24.1: Issue number:
Submitted by: fridrich_strba
Reviewed by: fridrich_strba
Add JRE of BEA Systems, Inc. among supported java virtual machines
Diffstat (limited to 'jvmfwk/plugins/sunmajor/javaenvsetup')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 1a08cb3e27f7..a213a5bd777a 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -4,9 +4,9 @@ * * $RCSfile: javaldx.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-07 19:28:49 $ + * last change: $Author: hr $ $Date: 2005-10-25 11:35:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -127,10 +127,12 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation")); rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team")); rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); + rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True || sVendor3.equals(pInfo->sVendor) == sal_True - || sVendor4.equals(pInfo->sVendor) == sal_True)) + || sVendor4.equals(pInfo->sVendor) == sal_True + || sVendor5.equals(pInfo->sVendor) == sal_True)) return 0; rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); |