summaryrefslogtreecommitdiff
path: root/javaunohelper/com
diff options
context:
space:
mode:
authorOliver Bolte <obo@openoffice.org>2005-07-07 09:56:53 +0000
committerOliver Bolte <obo@openoffice.org>2005-07-07 09:56:53 +0000
commit212da86aed305157e9a1581bc18ee95ad471ccb2 (patch)
tree937f2434c296ef7b2a1fb664983f32668cbff67e /javaunohelper/com
parent6460ca95347dad625478f25daeec048c35832100 (diff)
INTEGRATION: CWS sb33 (1.11.8); FILE MERGED
2005/06/30 16:50:11 sb 1.11.8.1: #120220# Adapted to changed uno_getEnvironment(..., java, pContext).
Diffstat (limited to 'javaunohelper/com')
-rw-r--r--javaunohelper/com/sun/star/comp/helper/Bootstrap.java12
1 files changed, 7 insertions, 5 deletions
diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
index d2d50af42aae..5d09d4786a62 100644
--- a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
+++ b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java
@@ -2,9 +2,9 @@
*
* $RCSfile: Bootstrap.java,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: obo $ $Date: 2004-11-15 13:30:49 $
+ * last change: $Author: obo $ $Date: 2005-07-07 10:56:53 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -240,12 +240,14 @@ public class Bootstrap {
m_loaded_juh = true;
}
return (XComponentContext)UnoRuntime.queryInterface(
- XComponentContext.class, cppuhelper_bootstrap( ini_file, pairs ) );
+ XComponentContext.class,
+ cppuhelper_bootstrap(
+ ini_file, pairs, Bootstrap.class.getClassLoader() ) );
}
static private boolean m_loaded_juh = false;
- static private native final Object cppuhelper_bootstrap(
- String ini_file, String bootstrap_parameters [] )
+ static private native Object cppuhelper_bootstrap(
+ String ini_file, String bootstrap_parameters [], ClassLoader loader )
throws Exception;
/**