diff options
-rw-r--r-- | cppuhelper/source/component_context.cxx | 8 | ||||
-rw-r--r-- | javaunohelper/com/sun/star/comp/helper/Bootstrap.java | 6 | ||||
-rw-r--r-- | javaunohelper/com/sun/star/comp/helper/ComponentContext.java | 10 |
3 files changed, 12 insertions, 12 deletions
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx index f38d946274be..8b3d61ace1da 100644 --- a/cppuhelper/source/component_context.cxx +++ b/cppuhelper/source/component_context.cxx @@ -2,9 +2,9 @@ * * $RCSfile: component_context.cxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: dbo $ $Date: 2001-06-13 08:39:27 $ + * last change: $Author: dbo $ $Date: 2001-06-25 14:25:21 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -86,8 +86,8 @@ #include <hash_map> -#define SMGR_NAME "com.sun.star.lang.ServiceManager" -#define TDMGR_NAME "com.sun.star.reflection.TypeDescriptionManager" +#define SMGR_NAME "com.sun.star.lang.theServiceManager" +#define TDMGR_NAME "com.sun.star.reflection.theTypeDescriptionManager" using namespace ::osl; diff --git a/javaunohelper/com/sun/star/comp/helper/Bootstrap.java b/javaunohelper/com/sun/star/comp/helper/Bootstrap.java index c3248952f530..1713c24cd056 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.2 $ + * $Revision: 1.3 $ * - * last change: $Author: dbo $ $Date: 2001-06-14 11:58:23 $ + * last change: $Author: dbo $ $Date: 2001-06-25 14:27:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -136,7 +136,7 @@ public class Bootstrap { context_entries = new Hashtable( 1 ); // add smgr context_entries.put( - "com.sun.star.lang.ServiceManager", + "com.sun.star.lang.theServiceManager", new ComponentContextEntry( null, xSMgr ) ); // ... xxx todo: add standard entries XComponentContext xContext = new ComponentContext( context_entries, null ); diff --git a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java index 4bef96bbb855..fce162826f42 100644 --- a/javaunohelper/com/sun/star/comp/helper/ComponentContext.java +++ b/javaunohelper/com/sun/star/comp/helper/ComponentContext.java @@ -2,9 +2,9 @@ * * $RCSfile: ComponentContext.java,v $ * - * $Revision: 1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: dbo $ $Date: 2001-06-14 11:58:23 $ + * last change: $Author: dbo $ $Date: 2001-06-25 14:27:51 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -112,7 +112,7 @@ public class ComponentContext implements XComponentContext, XComponent m_xSMgr = null; m_bDisposeSMgr = false; - Object o = table.get( "com.sun.star.lang.ServiceManager" ); + Object o = table.get( "com.sun.star.lang.theServiceManager" ); if (o != null) { if (o instanceof ComponentContextEntry) @@ -266,7 +266,7 @@ public class ComponentContext implements XComponentContext, XComponent while (keys.hasMoreElements()) { String name = (String)keys.nextElement(); - if (! name.equals( "com.sun.star.lang.ServiceManager" )) + if (! name.equals( "com.sun.star.lang.theServiceManager" )) { XComponent xComp; @@ -284,7 +284,7 @@ public class ComponentContext implements XComponentContext, XComponent if (xComp != null) { - if (name.equals( "com.sun.star.reflection.TypeDescriptionManager" )) + if (name.equals( "com.sun.star.reflection.theTypeDescriptionManager" )) { tdmgr = xComp; } |