util.cxx (fd474603) util.cxx (7ffb764a)
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

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

1013 OUString sNameMap(gVendorMap[c].sVendorName, strlen(gVendorMap[c].sVendorName),
1014 RTL_TEXTENCODING_ASCII_US);
1015 if (sNameMap.equals(sVendorName))
1016 {
1017 ret = createInstance(gVendorMap[c].createFunc, props);
1018 break;
1019 }
1020 }
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

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

1013 OUString sNameMap(gVendorMap[c].sVendorName, strlen(gVendorMap[c].sVendorName),
1014 RTL_TEXTENCODING_ASCII_US);
1015 if (sNameMap.equals(sVendorName))
1016 {
1017 ret = createInstance(gVendorMap[c].createFunc, props);
1018 break;
1019 }
1020 }
1021 }
1021 if ( !ret.is() )
1022 {
1023 // As of Java 8u222 the vendor name can be anything, so try the most generic one
1024 OUString genericVendorName(RTL_CONSTASCII_USTRINGPARAM("OpenJDK"));
1025 for ( sal_Int32 c = 0;
1026 gVendorMap[c].sVendorName != NULL; ++c )
1027 {
1028 OUString sNameMap(gVendorMap[c].sVendorName, strlen(gVendorMap[c].sVendorName),
1029 RTL_TEXTENCODING_ASCII_US);
1030 if (sNameMap.equals(genericVendorName))
1031 {
1032 for (vector<pair<OUString, OUString> >::iterator i = props.begin(); i != props.end(); i++)
1033 {
1034 if (sVendor.equals(i->first))
1035 i->second = genericVendorName;
1036 }
1037 ret = createInstance(gVendorMap[c].createFunc, props);
1038 break;
1039 }
1040 }
1041 }
1042 }
1022 if (ret.is() == false)
1023 vecBadPaths.push_back(sFilePath);
1024 else
1025 {
1026 JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ")
1027 + OUSTR("Found JRE: ") + sResolvedDir
1028 + OUSTR(" \n at: ") + path + OUSTR(".\n"));
1029

--- 238 unchanged lines hidden --- 		1043 if (ret.is() == false)
1044 vecBadPaths.push_back(sFilePath);
1045 else
1046 {
1047 JFW_TRACE2(OUSTR("[Java framework] sunjavaplugin" SAL_DLLEXTENSION ": ")
1048 + OUSTR("Found JRE: ") + sResolvedDir
1049 + OUSTR(" \n at: ") + path + OUSTR(".\n"));
1050

--- 238 unchanged lines hidden ---