summaryrefslogtreecommitdiff
path: root/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2005-10-25 10:35:01 +0000
committerJens-Heiner Rechtien <hr@openoffice.org>2005-10-25 10:35:01 +0000
commit03fa3d0bba5d4c04b47fc734335f63c0db7e2aca (patch)
tree1b37d9b8638d39eb0da13e581fd169ab3084f327 /jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
parentb098e98b84a34dc0e8635a192a4617186ff10bf7 (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/javaldx.cxx')
-rwxr-xr-xjvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx8
1 files changed, 5 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
index 07a9e9ea2..c27821c45 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);