diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 13:49:34 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2009-01-21 13:49:34 +0000 |
| commit | dde7a5a605a6f615bb05249e1be3d9d4c8c22e88 (patch) | |
| tree | 066d35d674b4c0a80e8e8a0bf9618eceedf457fc /jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | |
| parent | CWS-TOOLING: integrate CWS mingwport16 (diff) | |
| download | core-dde7a5a605a6f615bb05249e1be3d9d4c8c22e88.tar.gz core-dde7a5a605a6f615bb05249e1be3d9d4c8c22e88.zip | |
CWS-TOOLING: integrate CWS jl111
2009-01-13 13:36:03 +0100 jl r266218 : #i91642# do not localize the error message, just print out the changed text in plain English
2009-01-09 12:54:03 +0100 jl r266075 : Committing changes which have been originally made on cws jl105 but which were not integrated on the master, due to a failed integration procedured. Then only three files were integrated. The files committed fix i80449, i83134, i86079, i91204, i92869
2009-01-07 15:10:52 +0100 jl r265970 : CWS-TOOLING: rebase CWS jl111 to trunk@265758 (milestone: DEV300:m38)
2009-01-06 10:38:21 +0100 jl r265900 : #i93235# #i93946# migrating to svn
Diffstat (limited to 'jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index 4d0d2d93bc5d..762497b8d8bc 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -7,7 +7,6 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: javaldx.cxx,v $ - * $Revision: 1.15.26.1 $ * * This file is part of OpenOffice.org. * @@ -117,13 +116,15 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) 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.")); + rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation")); 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 - || sVendor7.equals(pInfo->sVendor) == sal_True)) + || sVendor7.equals(pInfo->sVendor) == sal_True + || sVendor8.equals(pInfo->sVendor) == sal_True)) return 0; rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); |