mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove jvmfwk plugin feature

Browse Source 
...which was effectively unused; there only ever was a single sunjavaplugin that
is now folded directly into jvmfwk.  Leaves room for further clean up.

Change-Id: I14dd2a3a09bd1ce9a8c3f5c156628ec11d954a0b
This commit is contained in:
Stephan Bergmann
2014-10-09 17:24:52 +02:00
parent 3de89997f4
commit 2ceeee914e
24 changed files with 78 additions and 554 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx
View File

@@ -95,22 +95,6 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
}
}
OUString aVendor( pInfo->sVendor );
// Only do something if the sunjavaplugin created this JavaInfo
if ( aVendor != "Sun Microsystems Inc." &&
aVendor != "Oracle Corporation" &&
aVendor != "IBM Corporation" &&
aVendor != "Blackdown Java-Linux Team" &&
aVendor != "Apple Inc." &&
aVendor != "Apple Computer, Inc." &&
aVendor != "BEA Systems, Inc." &&
aVendor != "Free Software Foundation, Inc." &&
aVendor != "The FreeBSD Foundation" )
{
jfw_freeJavaInfo(pInfo);
return 0;
}
OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData);
fprintf(stdout, "%s\n", sPaths.getStr());
jfw_freeJavaInfo(pInfo);