diff options
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/Package_javadoc.mk | 2 | ||||
| -rw-r--r-- | odk/source/com/sun/star/lib/loader/Loader.java | 50 |
2 files changed, 1 insertions, 51 deletions
diff --git a/odk/Package_javadoc.mk b/odk/Package_javadoc.mk index 7b1007ca8556..15b0691501a8 100644 --- a/odk/Package_javadoc.mk +++ b/odk/Package_javadoc.mk @@ -19,13 +19,11 @@ $(eval $(call gb_Package_add_files_with_dir,odk_javadoc,$(gb_Package_SDKDIRNAME) com/sun/star/comp/helper/ComponentContext.html \ com/sun/star/comp/helper/ComponentContextEntry.html \ com/sun/star/comp/helper/SharedLibraryLoader.html \ - com/sun/star/comp/helper/UnoInfo.html \ com/sun/star/comp/helper/class-use/Bootstrap.html \ com/sun/star/comp/helper/class-use/BootstrapException.html \ com/sun/star/comp/helper/class-use/ComponentContext.html \ com/sun/star/comp/helper/class-use/ComponentContextEntry.html \ com/sun/star/comp/helper/class-use/SharedLibraryLoader.html \ - com/sun/star/comp/helper/class-use/UnoInfo.html \ com/sun/star/comp/helper/package-frame.html \ com/sun/star/comp/helper/package-summary.html \ com/sun/star/comp/helper/package-tree.html \ diff --git a/odk/source/com/sun/star/lib/loader/Loader.java b/odk/source/com/sun/star/lib/loader/Loader.java index a11937d72993..d6b67b7ee6db 100644 --- a/odk/source/com/sun/star/lib/loader/Loader.java +++ b/odk/source/com/sun/star/lib/loader/Loader.java @@ -22,7 +22,6 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.UnsupportedEncodingException; -import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.net.JarURLConnection; import java.net.MalformedURLException; @@ -137,10 +136,6 @@ public final class Loader { * @return the customized class loader */ public static synchronized ClassLoader getCustomLoader() { - - final String CLASSESDIR = "classes"; - final String JUHJAR = "juh.jar"; - if ( m_Loader == null ) { // get the urls from which to load classes and resources @@ -164,50 +159,7 @@ public final class Loader { // from the UNO installation String path = InstallationFinder.getPath(); if ( path != null ) { - File fClassesDir = new File( path, CLASSESDIR ); - File fJuh = new File( fClassesDir, JUHJAR ); - if ( fJuh.exists() ) { - URL[] clurls = new URL[1]; - try { - clurls[0] = fJuh.toURI().toURL(); - ClassLoader cl = new CustomURLClassLoader( clurls ); - Class c = cl.loadClass( - "com.sun.star.comp.helper.UnoInfo" ); - Method m = c.getMethod( "getJars", (Class[]) null ); - URL[] jarurls = (URL[]) m.invoke( - null, (Object[]) null ); - for ( int i = 0; i < jarurls.length; i++ ) { - vec.add( jarurls[i] ); - } - } catch ( MalformedURLException e ) { - // don't add the UNO jar files to the list of class - // loader URLs - System.err.println( "com.sun.star.lib.loader.Loader::" + - "getCustomLoader: cannot add UNO jar files: " + e ); - } catch ( ClassNotFoundException e ) { - // don't add the UNO jar files to the list of class - // loader URLs - System.err.println( "com.sun.star.lib.loader.Loader::" + - "getCustomLoader: cannot add UNO jar files: " + e ); - } catch ( NoSuchMethodException e ) { - // don't add the UNO jar files to the list of class - // loader URLs - System.err.println( "com.sun.star.lib.loader.Loader::" + - "getCustomLoader: cannot add UNO jar files: " + e ); - } catch ( IllegalAccessException e ) { - // don't add the UNO jar files to the list of class - // loader URLs - System.err.println( "com.sun.star.lib.loader.Loader::" + - "getCustomLoader: cannot add UNO jar files: " + e ); - } catch ( InvocationTargetException e ) { - // don't add the UNO jar files to the list of class - // loader URLs - System.err.println( "com.sun.star.lib.loader.Loader::" + - "getCustomLoader: cannot add UNO jar files: " + e ); - } - } else { - callUnoinfo(path, vec); - } + callUnoinfo(path, vec); } else { System.err.println( "com.sun.star.lib.loader.Loader::" + "getCustomLoader: no UNO installation found!" ); |