new: XComponentContext, XCurrentContext

3 files changed, 115 insertions, 47 deletions

diff --git a/udkapi/com/sun/star/uno/XComponentContext.idl b/udkapi/com/sun/star/uno/XComponentContext.idl
new file mode 100644
index 000000000000..4d342cdaecfa
--- /dev/null
+++ b/udkapi/com/sun/star/uno/XComponentContext.idl
@@ -0,0 +1,96 @@
+/*************************************************************************
+ *
+ *  $RCSfile: XComponentContext.idl,v $
+ *
+ *  $Revision: 1.1 $
+ *
+ *  last change: $Author: dbo $ $Date: 2001-05-04 14:22:18 $
+ *
+ *  The Contents of this file are made available subject to the terms of
+ *  either of the following licenses
+ *
+ *         - GNU Lesser General Public License Version 2.1
+ *         - Sun Industry Standards Source License Version 1.1
+ *
+ *  Sun Microsystems Inc., October, 2000
+ *
+ *  GNU Lesser General Public License Version 2.1
+ *  =============================================
+ *  Copyright 2000 by Sun Microsystems, Inc.
+ *  901 San Antonio Road, Palo Alto, CA 94303, USA
+ *
+ *  This library is free software; you can redistribute it and/or
+ *  modify it under the terms of the GNU Lesser General Public
+ *  License version 2.1, as published by the Free Software Foundation.
+ *
+ *  This library is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General Public
+ *  License along with this library; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ *  MA  02111-1307  USA
+ *
+ *
+ *  Sun Industry Standards Source License Version 1.1
+ *  =================================================
+ *  The contents of this file are subject to the Sun Industry Standards
+ *  Source License Version 1.1 (the "License"); You may not use this file
+ *  except in compliance with the License. You may obtain a copy of the
+ *  License at http://www.openoffice.org/license.html.
+ *
+ *  Software provided under this License is provided on an "AS IS" basis,
+ *  WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
+ *  WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS,
+ *  MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING.
+ *  See the License for the specific provisions governing your rights and
+ *  obligations concerning the Software.
+ *
+ *  The Initial Developer of the Original Code is: Sun Microsystems, Inc.
+ *
+ *  Copyright: 2000 by Sun Microsystems, Inc.
+ *
+ *  All Rights Reserved.
+ *
+ *  Contributor(s): _______________________________________
+ *
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_uno_XCurrentContext_idl__
+#define __com_sun_star_uno_XCurrentContext_idl__
+
+#ifndef __com_sun_star_lang_XMultiComponentFactory_idl__
+#include <com/sun/star/lang/XMultiComponentFactory.idl>
+#endif
+#ifndef __com_sun_star_uno_Exception_idl__
+#include <com/sun/star/uno/Exception.idl>
+#endif
+
+
+module com {  module sun {  module star {  module uno {
+
+/** Component context to be granted to a component for running.
+    Arbitrary values can be retrieved from the context.
+*/
+interface XComponentContext : XInterface
+{
+    /** Gets a value from the context.
+
+        @param Name
+               name of value
+        @return
+                value
+    */
+    any getValueByName( [in] string Name );
+    /** Gets the service manager instance to be used (or null).
+        This method has been added for convenience, because the
+        service manager is a often used object.
+    */
+    com::sun::star::lang::XMultiComponentFactory getServiceManager();
+};
+
+}; }; }; };
+
+#endif
diff --git a/udkapi/com/sun/star/uno/XCurrentContext.idl b/udkapi/com/sun/star/uno/XCurrentContext.idl
index 59c0b86b27c7..ea231195fae1 100644
--- a/udkapi/com/sun/star/uno/XCurrentContext.idl
+++ b/udkapi/com/sun/star/uno/XCurrentContext.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XCurrentContext.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:43 $
+ *  last change: $Author: dbo $ $Date: 2001-05-04 14:22:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,59 +65,29 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-#ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
-#include <com/sun/star/lang/XMultiServiceFactory.idl>
-#endif
-
-#ifndef __com_sun_star_security_XAccessController_idl__
-#include <com/sun/star/security/XAccessController.idl>
-#endif
-
-#ifndef __com_sun_star_security_auth_login_XLoginContext_idl__
-#include <com/sun/star/security/auth/login/XLoginContext.idl>
-#endif
-
-#ifndef __com_sun_star_beans_XPropertySet_idl__
-#include <com/sun/star/beans/XPropertySet.idl>
-#endif
 
 module com {  module sun {  module star {  module uno {
 
-//=============================================================================
+/** Task local execution context for UNO.
+    Arbitrary values can be retrieved from the context.
 
-/** <p><b>WARNING: this is just a draft and may be changed!</b></p>
-    Thread local execution context for UNO.
-    <p>
-    Arbitrary values can be set and retrieved at the context.
-    </p>
+    Use UNO runtime functions to obtain the current context in your language.
 */
-interface XCurrentContext : com::sun::star::beans::XPropertySet
+interface XCurrentContext : XInterface
 {
-    /** value of name:
-        <type scope="com::sun::star::lang">ServiceManager</type>
+    /** Gets a value from the context.
+        You should carefully use the obtained value, because the current context
+        (value container) lives only for the running task (i.e. often the
+        executing thread) only!
 
+        @param Name
+               name of value
         @return
-                service manager to be used
+                value
     */
-    com::sun::star::lang::XMultiServiceFactory getServiceManager();
-    /** value of name:
-        <type scope="com::sun::star::security">AccessController</type>
-
-        @return
-                access controller to be used
-    */
-    com::sun::star::security::XAccessController getAccessController();
-    /** value of name:
-        <type scope="com::sun::star::security::auth::login">LoginContext</type>
-
-        @return
-                login context to be used
-    */
-    com::sun::star::security::auth::login::XLoginContext getLoginContext();
+    any getValueByName( [in] string Name );
 };
 
-//=============================================================================
-
 }; }; }; };
 
 #endif
diff --git a/udkapi/com/sun/star/uno/makefile.mk b/udkapi/com/sun/star/uno/makefile.mk
index 0530de6286dd..9859d1327c9d 100644
--- a/udkapi/com/sun/star/uno/makefile.mk
+++ b/udkapi/com/sun/star/uno/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.4 $
+#   $Revision: 1.5 $
 #
-#   last change: $Author: mi $ $Date: 2000-11-08 12:29:00 $
+#   last change: $Author: dbo $ $Date: 2001-05-04 14:22:18 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -84,7 +84,9 @@ IDLFILES=\
     XInterface.idl\
     XNamingService.idl\
     XReference.idl\
-    XWeak.idl
+    XWeak.idl\
+    XComponentContext.idl\
+    XCurrentContext.idl
 
 # ------------------------------------------------------------------