summaryrefslogtreecommitdiff
path: root/ridljar
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2007-03-16 07:42:11 +0000
committerOliver Bolte <obo@openoffice.org>2007-03-16 07:42:11 +0000
commit35c821d9062caaf271df45f7c1efb1e1d6f8f516 (patch)
treeebf511626a7ef7ac76749afbad8336eff9335fe9 /ridljar
parent5760be353977987d969fe466c8484f929462fbf7 (diff)
#i10000# merge problem
Diffstat (limited to 'ridljar')
-rw-r--r--ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
index cb7dffe2d..9f6b28e89 100644
--- a/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
+++ b/ridljar/source/unoloader/com/sun/star/lib/unoloader/UnoLoader.java
@@ -4,9 +4,9 @@
*
* $RCSfile: UnoLoader.java,v $
*
- * $Revision: 1.6 $
+ * $Revision: 1.7 $
*
- * last change: $Author: obo $ $Date: 2007-03-14 08:35:06 $
+ * last change: $Author: obo $ $Date: 2007-03-16 08:42:11 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -89,7 +89,7 @@ public final class UnoLoader {
new PrivilegedExceptionAction() {
public Object run() throws MalformedURLException {
return new UnoClassLoader(
- base, UnoLoader.class.getClassLoader());
+ base, null, UnoLoader.class.getClassLoader());
}
});
} catch (PrivilegedActionException e) {