INTEGRATION: CWS mav07 (1.2.4); FILE MERGED

2003/11/17 16:35:39 mav 1.2.4.3: #112923# XCloseable support
2003/11/07 11:39:27 mav 1.2.4.2: #112923# Verbs list should contain additional information
2003/11/07 11:15:02 mav 1.2.4.1: #112923# NeedsRunningStateException

1 files changed, 24 insertions, 7 deletions

diff --git a/offapi/com/sun/star/embed/XEmbeddedObject.idl b/offapi/com/sun/star/embed/XEmbeddedObject.idl
index bd56932a4561..d8953dafce2d 100644
--- a/offapi/com/sun/star/embed/XEmbeddedObject.idl
+++ b/offapi/com/sun/star/embed/XEmbeddedObject.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XEmbeddedObject.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2003-09-11 10:25:28 $
+ *  last change: $Author: rt $ $Date: 2004-01-06 08:54:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,6 +73,10 @@
 #include <com/sun/star/datatransfer/XTransferable.idl>
 #endif
 
+#ifndef __com_sun_star_embed_VerbDescr_idl__
+#include <com/sun/star/embed/VerbDescr.idl>
+#endif
+
 #ifndef __com_sun_star_embed_UnreachableStateException_idl__
 #include <com/sun/star/embed/UnreachableStateException.idl>
 #endif
@@ -81,13 +85,16 @@
 #include <com/sun/star/embed/WrongStateException.idl>
 #endif
 
+#ifndef __com_sun_star_embed_NeedsRunningStateException_idl__
+#include <com/sun/star/embed/NeedsRunningStateException.idl>
+#endif
+
 #ifndef __com_sun_star_lang_IllegalArgumentException_idl__
 #include <com/sun/star/lang/IllegalArgumentException.idl>
 #endif
 
 
 
-
 //=============================================================================
 
  module com {  module sun {  module star {  module embed {
@@ -95,7 +102,7 @@
 //=============================================================================
 /** represents common functionality for embedded objects
  */
-interface XEmbeddedObject: com::sun::star::lang::XComponent
+interface XEmbeddedObject: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
     /** Changes the state of the object to the requested one.
@@ -124,11 +131,16 @@ interface XEmbeddedObject: com::sun::star::lang::XComponent
         @returns
             the sequence of states the object can be set to
 
+        @throws com::sun::star::embed::NeedsRunnignStateException
+            means that the object is in loaded state now and can be switched to running state
+            other possible states can be detected only when the object is not in loaded state any more
+
         @throws com::sun::star::embed::WrongStateException
             in case object is in invalid state
      */
     sequence< long > getReachableStates()
-        raises( ::com::sun::star::embed::WrongStateException );
+        raises( ::com::sun::star::embed::NeedsRunningStateException,
+                ::com::sun::star::embed::WrongStateException );
 
     //-------------------------------------------------------------------------
     /** Return the current state of the object
@@ -172,11 +184,16 @@ interface XEmbeddedObject: com::sun::star::lang::XComponent
         @returns
             the sequence of verbs the object supports
 
+        @throws com::sun::star::embed::NeedsRunnignStateException
+            means that the object is in loaded state now and can be switched to running state
+            acceptable verbs can be detected only when the object is not in loaded state any more
+
         @throws com::sun::star::embed::WrongStateException
             the object is in wrong state to call the function
      */
-    sequence< long > getSupportedVerbs()
-        raises( ::com::sun::star::embed::WrongStateException );
+    sequence< VerbDescr > getSupportedVerbs()
+        raises( ::com::sun::star::embed::NeedsRunningStateException,
+                ::com::sun::star::embed::WrongStateException );
 
     //-------------------------------------------------------------------------
     /** Sets a connection to the container client