javaldx.cxx (36f55ffc) javaldx.cxx (696f238b)
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 97 unchanged lines hidden (view full) ---

106 else
107 {
108 fprintf(stderr, "javaldx: Could not determine if JRE still exist\n");
109 return -1;
110 }
111 }
112
113 //Only do something if the sunjavaplugin created this JavaInfo
1/**************************************************************
2 *
3 * Licensed to the Apache Software Foundation (ASF) under one
4 * or more contributor license agreements. See the NOTICE file
5 * distributed with this work for additional information
6 * regarding copyright ownership. The ASF licenses this file
7 * to you under the Apache License, Version 2.0 (the
8 * "License"); you may not use this file except in compliance

--- 97 unchanged lines hidden (view full) ---

106 else
107 {
108 fprintf(stderr, "javaldx: Could not determine if JRE still exist\n");
109 return -1;
110 }
111 }
112
113 //Only do something if the sunjavaplugin created this JavaInfo
114 rtl::OUString sVendor0(RTL_CONSTASCII_USTRINGPARAM("Oracle Corporation"));
114 rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
115 rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
116 rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
117 rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
118 rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
119 rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
120 rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
121 rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
115 rtl::OUString sVendor1(RTL_CONSTASCII_USTRINGPARAM("Sun Microsystems Inc."));
116 rtl::OUString sVendor2(RTL_CONSTASCII_USTRINGPARAM("IBM Corporation"));
117 rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team"));
118 rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Inc."));
119 rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc."));
120 rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc."));
121 rtl::OUString sVendor7(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc."));
122 rtl::OUString sVendor8(RTL_CONSTASCII_USTRINGPARAM("The FreeBSD Foundation"));
122 if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True
123 if ( ! (sVendor0.equals(pInfo->sVendor) == sal_True
124 || sVendor1.equals(pInfo->sVendor) == sal_True
123 || sVendor2.equals(pInfo->sVendor) == sal_True
124 || sVendor3.equals(pInfo->sVendor) == sal_True
125 || sVendor4.equals(pInfo->sVendor) == sal_True
126 || sVendor5.equals(pInfo->sVendor) == sal_True
127 || sVendor6.equals(pInfo->sVendor) == sal_True
128 || sVendor7.equals(pInfo->sVendor) == sal_True
129 || sVendor8.equals(pInfo->sVendor) == sal_True))
130 return 0;

--- 54 unchanged lines hidden --- 		125 || sVendor2.equals(pInfo->sVendor) == sal_True
126 || sVendor3.equals(pInfo->sVendor) == sal_True
127 || sVendor4.equals(pInfo->sVendor) == sal_True
128 || sVendor5.equals(pInfo->sVendor) == sal_True
129 || sVendor6.equals(pInfo->sVendor) == sal_True
130 || sVendor7.equals(pInfo->sVendor) == sal_True
131 || sVendor8.equals(pInfo->sVendor) == sal_True))
132 return 0;

--- 54 unchanged lines hidden ---