diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 14:31:19 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2007-11-12 14:31:19 +0000 |
| commit | f4194dc5fbb54d0714b7a52079aeb6f3e19e11d9 (patch) | |
| tree | a286ccab236f316453d08e0f05df82e0f1c49f8b /jvmfwk/plugins/sunmajor | |
| parent | 6b03b6be489f53833b52ef8f77e19984739bf676 (diff) | |
INTEGRATION: CWS macleopardbuild (1.13.40); FILE MERGED
2007/10/16 18:26:13 fheckl 1.13.40.1: Adding Apple Inc as new vendor
Diffstat (limited to 'jvmfwk/plugins/sunmajor')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 77c9316755ab..50ccb10c2a4b 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.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:45:14 $ + * last change: $Author: rt $ $Date: 2007-11-12 15:31:19 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -129,15 +129,17 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc.")); 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.")); - rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); + rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc.")); + rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); + rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); + rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, 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 || sVendor5.equals(pInfo->sVendor) == sal_True - || sVendor6.equals(pInfo->sVendor) == sal_True)) + || sVendor6.equals(pInfo->sVendor) == sal_True + || sVendor7.equals(pInfo->sVendor) == sal_True)) return 0; rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); |