#94968# IDL reviews merged

26 files changed, 106 insertions, 720 deletions

diff --git a/udkapi/com/sun/star/container/ContainerEvent.idl b/udkapi/com/sun/star/container/ContainerEvent.idl
index efca644bfbc1..54edb5bfc8b3 100644
--- a/udkapi/com/sun/star/container/ContainerEvent.idl
+++ b/udkapi/com/sun/star/container/ContainerEvent.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ContainerEvent.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-11 16:09:45 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,11 +68,10 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: struct com::sun::star::container::ContainerEvent
 /** This event is fired when an element is inserted in a container.
 
     @see XContainerListener
@@ -81,7 +80,6 @@ struct ContainerEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: field com::sun::star::container::ContainerEvent::Accessor
     /** It contains the accessor to the element which is inserted or removed.
 
         <p>The type and the value of the accessor depends on the service.</p>
@@ -90,14 +88,12 @@ struct ContainerEvent: com::sun::star::lang::EventObject
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: field com::sun::star::container::ContainerEvent::Element
     /** This contains the element that was inserted or removed.
      */
     any Element;
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: field com::sun::star::container::ContainerEvent::ReplacedElement
     /** This contains the replaced element.
      */
     any ReplacedElement;
@@ -108,21 +104,4 @@ struct ContainerEvent: com::sun::star::lang::EventObject
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/ElementExistException.idl b/udkapi/com/sun/star/container/ElementExistException.idl
index 559b8a9e7ca2..befacbc64a82 100644
--- a/udkapi/com/sun/star/container/ElementExistException.idl
+++ b/udkapi/com/sun/star/container/ElementExistException.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ElementExistException.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,7 +68,7 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
@@ -89,24 +89,4 @@ exception ElementExistException: com::sun::star::uno::Exception
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/NoSuchElementException.idl b/udkapi/com/sun/star/container/NoSuchElementException.idl
index c3363c346beb..104762d53bbf 100644
--- a/udkapi/com/sun/star/container/NoSuchElementException.idl
+++ b/udkapi/com/sun/star/container/NoSuchElementException.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NoSuchElementException.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-11 16:09:45 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,14 +65,12 @@
 #include <com/sun/star/uno/Exception.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: exception com::sun::star::container::NoSuchElementException
 /** is thrown by child access methods of collections, if the addressed child
     does not exist.
 
@@ -87,21 +85,4 @@ exception NoSuchElementException: com::sun::star::uno::Exception
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XChild.idl b/udkapi/com/sun/star/container/XChild.idl
index 61c89fd4229e..7ef494b26cc3 100644
--- a/udkapi/com/sun/star/container/XChild.idl
+++ b/udkapi/com/sun/star/container/XChild.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XChild.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:34 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,11 +72,10 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XChild
 /** provides access to the parent of the object.
 
     <p>This interface normally is only supported if the objects all have
@@ -86,14 +85,12 @@ interface XChild: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XChild::getParent
     /** grants access to the object containing this content.
      */
     com::sun::star::uno::XInterface getParent();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XChild::setParent
     /** sets the parent to this object.
 
         @throws com::sun::star::lang::NoSupportException
@@ -108,30 +105,4 @@ interface XChild: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/10 09:51:31  mi
-    UIK exchanged with awt::XTextArea - was less incompatible
-
-    Revision 1.2  2000/02/07 11:24:23  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XComponentEnumeration.idl b/udkapi/com/sun/star/container/XComponentEnumeration.idl
index 19c48b7e6a28..68b276a9ff00 100644
--- a/udkapi/com/sun/star/container/XComponentEnumeration.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumeration.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XComponentEnumeration.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:34 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,18 +76,16 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XComponentEnumeration
 /** provides a typified enumeration through components.
  */
 interface XComponentEnumeration: com::sun::star::container::XEnumeration
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XComponentEnumeration::nextComponent
     /** @returns
             the next component of this enumeration.
 
@@ -103,33 +101,4 @@ interface XComponentEnumeration: com::sun::star::container::XEnumeration
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.6  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.4  2000/01/31 11:02:36  mi
-    #72484# UIKs were not unique
-
-    Revision 1.3  2000/01/28 12:24:20  jsc
-    #72382# same Uik as XIdlClass
-
-    Revision 1.2  1999/11/18 11:49:55  mi
-    XComponent now in module lang
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
index b95d81dc4dfc..d34e86a3ea94 100644
--- a/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XComponentEnumerationAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XComponentEnumerationAccess.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:34 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,11 +72,10 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XComponentEnumerationAccess
 /** provides a factory for a typified enumeration through
     a collection of components.
  */
@@ -84,8 +83,7 @@ interface XComponentEnumerationAccess: com::sun::star::container::XEnumerationAc
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XComponentEnumerationAccess::createComponentEnumeration
-    /** creates an instance of enumeration through components.
+    /** creates a new instance of enumeration through components.
      */
     com::sun::star::container::XComponentEnumeration createComponentEnumeration();
 
@@ -95,27 +93,4 @@ interface XComponentEnumerationAccess: com::sun::star::container::XEnumerationAc
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/02/23 11:41:15  mi
-    results from proofreading in layouted version
-
-    Revision 1.2  2000/01/31 15:39:36  mi
-    #72482# some UIks were not unique
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XContainer.idl b/udkapi/com/sun/star/container/XContainer.idl
index fc1593997e29..267d59743eab 100644
--- a/udkapi/com/sun/star/container/XContainer.idl
+++ b/udkapi/com/sun/star/container/XContainer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XContainer.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,11 +72,10 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XContainer
 /** supports quick access to the information if a container currently
     contains elements.
 
@@ -97,20 +96,24 @@ interface XContainer: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XContainer::addContainerListener
     /** adds the specified listener to receive events when
         elements are inserted or removed.
 
+       <p>It is suggested to allow multiple registration of the same listener,
+        thus for each time a listener is added, it has to be removed.
+
         @see XContainerListener
      */
     [oneway] void addContainerListener( [in] com::sun::star::container::XContainerListener xListener );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XContainer::removeContainerListener
     /** removes the specified listener so it does not receive
         any events from this container.
 
+       <p>It is suggested to allow multiple registration of the same listener,
+        thus for each time a listener is added, it has to be removed.
+
         @see XContainerListener
      */
     [oneway] void removeContainerListener( [in] com::sun::star::container::XContainerListener xListener );
@@ -121,27 +124,4 @@ interface XContainer: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.6  2001/03/16 15:10:34  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XContainerListener.idl b/udkapi/com/sun/star/container/XContainerListener.idl
index 8bed69c74842..4050c3ccad0b 100644
--- a/udkapi/com/sun/star/container/XContainerListener.idl
+++ b/udkapi/com/sun/star/container/XContainerListener.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XContainerListener.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:34 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,32 +72,28 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XContainerListener
 /** receives events when the content of the related container changes.
  */
 interface XContainerListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XContainerListener::elementInserted
     /** is invoked when a container has inserted an element.
      */
     [oneway] void elementInserted( [in] com::sun::star::container::ContainerEvent Event );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XContainerListener::elementRemoved
     /** is invoked when a container has removed an element.
      */
     [oneway] void elementRemoved( [in] com::sun::star::container::ContainerEvent Event );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XContainerListener::elementReplaced
     /** is invoked when a container has replaced an element.
      */
     [oneway] void elementReplaced( [in] com::sun::star::container::ContainerEvent Event );
@@ -108,24 +104,4 @@ interface XContainerListener: com::sun::star::lang::XEventListener
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.2  2000/04/20 14:06:11  mi
-    documentation
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
index 0159140c0502..0e70ead5555b 100644
--- a/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XContentEnumerationAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XContentEnumerationAccess.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,21 +72,19 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XContentEnumerationAccess
 /** allows access to the collections of all content types within the object.
 
     @example
         <p>This example prints the names of all tables: </p>
 
     <listing>
-        xTextTableEnum = xTextDoc.createContentEnumeration(
-        "com::sun::star::text::TextTable" )
+        xTextTableEnum = xTextDoc.createContentEnumeration( "com::sun::star::text::TextTable" )
         while xTextTableEnum.hasMoreElements() do
-        print xTextTableEnum.getNextElement().Name
+            print xTextTableEnum.nextElement().Name
         wend
     </listing>
  */
@@ -94,7 +92,6 @@ interface XContentEnumerationAccess: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XContentEnumerationAccess::createContentEnumeration
     /** @returns
             a new enumeration object for the contents of the specified service type.
      */
@@ -118,36 +115,4 @@ interface XContentEnumerationAccess: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.7  2001/03/16 15:10:34  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.6  2000/12/19 15:32:24  mi
-    documentation syntax fixed
-
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/02/23 14:49:54  mi
-    missing documentations
-
-    Revision 1.2  2000/02/07 11:24:23  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XElementAccess.idl b/udkapi/com/sun/star/container/XElementAccess.idl
index 39e95af243f8..ce93ba7a0976 100644
--- a/udkapi/com/sun/star/container/XElementAccess.idl
+++ b/udkapi/com/sun/star/container/XElementAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XElementAccess.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,14 +76,12 @@ module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XElementAccess
 /** This is the base interface of all collection interfaces.
  */
 interface XElementAccess: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XElementAccess::getElementType
     /** @returns
             the type of the elements. <type>void</type> means that it is a
             multi-type container and you cannot determine the exact types
@@ -93,7 +91,6 @@ interface XElementAccess: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XElementAccess::hasElements
     /** @returns
             <TRUE/> if the object contain elements,
             otherwise <FALSE/>.
@@ -106,36 +103,4 @@ interface XElementAccess: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.7  2001/01/31 09:45:40  mi
-    TYPE_XIDLCLASS is now 'type'
-
-    Revision 1.6  2000/12/19 13:49:34  mi
-    syntax errors in documentation fixed
-
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/01/14 11:06:24  jsc
-    #71616# Typumstellung
-
-    Revision 1.2  2000/01/03 12:03:19  mi
-    reference manual
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XEnumeration.idl b/udkapi/com/sun/star/container/XEnumeration.idl
index 6f25e5b8638b..1d0a1a050898 100644
--- a/udkapi/com/sun/star/container/XEnumeration.idl
+++ b/udkapi/com/sun/star/container/XEnumeration.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XEnumeration.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,6 @@ module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XEnumeration
 /** provides functionality to enumerate the contents of a container.
 
     <p>An object that implements the <type>XEnumeration</type> interface
@@ -107,14 +106,12 @@ interface XEnumeration: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XEnumeration::hasMoreElements
     /** tests whether this enumeration contains more elements.
      */
     boolean hasMoreElements();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XEnumeration::nextElement
     /** @returns
             the next element of this enumeration.
 
@@ -136,33 +133,4 @@ interface XEnumeration: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:54  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/02/23 11:41:15  mi
-    results from proofreading in layouted version
-
-    Revision 1.2  2000/01/03 12:03:19  mi
-    reference manual
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XEnumerationAccess.idl b/udkapi/com/sun/star/container/XEnumerationAccess.idl
index e699e866b3de..37f114b8b354 100644
--- a/udkapi/com/sun/star/container/XEnumerationAccess.idl
+++ b/udkapi/com/sun/star/container/XEnumerationAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XEnumerationAccess.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,17 +76,15 @@ module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XEnumerationAccess
 /** used to enumerate objects in a container which contains objects.
  */
 interface XEnumerationAccess: com::sun::star::container::XElementAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XEnumerationAccess::createEnumeration
     /** @returns
-            the enumeration object to the objects.
-            It returns NULL if there are no objects.
+            a new enumeration object for this container.
+            It returns NULL if there are no objects in this container.
      */
     com::sun::star::container::XEnumeration createEnumeration();
 
@@ -96,24 +94,4 @@ interface XEnumerationAccess: com::sun::star::container::XElementAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XHierarchicalName.idl b/udkapi/com/sun/star/container/XHierarchicalName.idl
index 626334959a54..0292cb6143cf 100644
--- a/udkapi/com/sun/star/container/XHierarchicalName.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalName.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XHierarchicalName.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,14 +73,12 @@
 #include <com/sun/star/lang/NoSupportException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XHierarchicalName
 /** specifies the fully qualified name of the object within a hierarchy.
 
     <p>The name is generally globally unique in the hierarchy.  </p>
@@ -92,7 +90,6 @@ interface XHierarchicalName: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XHierarchicalName::getHierarchicalName
     /** @returns
                 the fully qualified hierarchical name of the object.
      */
@@ -100,7 +97,6 @@ interface XHierarchicalName: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XHierarchicalName::composeHierarchicalName
     /** builds the hierarchical name of an object, given a relative name
 
         <p>Can be used to find the name of a descendant object in the hierarchy
@@ -117,24 +113,4 @@ interface XHierarchicalName: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1  2000/06/15 15:55:51  jb
-    Add XHierarchicalName interface
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
index edd9cbbd14e7..1b816c948327 100644
--- a/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
+++ b/udkapi/com/sun/star/container/XHierarchicalNameAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XHierarchicalNameAccess.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,14 +69,12 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XHierarchicalNameAccess
 /** is used to have hierarchical access to elements within a container.
 
     <p>You address an object of a specific level in the hierarchy by giving its
@@ -91,7 +89,6 @@ interface XHierarchicalNameAccess: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XHierarchicalNameAccess::getByHierarchicalName
     /** @returns
                 the object with the specified name.
 
@@ -106,7 +103,6 @@ interface XHierarchicalNameAccess: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XHierarchicalNameAccess::hasByHierarchicalName
     /** @returns
             <TRUE/> if an element with this name is in
             the container, <FALSE/> otherwise.
@@ -125,42 +121,4 @@ interface XHierarchicalNameAccess: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.7  2001/03/16 15:10:35  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.6  2000/12/19 15:32:24  mi
-    documentation syntax fixed
-
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:54  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.6  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.4  2000/02/07 11:24:23  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.3  2000/01/03 12:03:20  mi
-    reference manual
-
-    Revision 1.2  1999/11/15 16:05:39  dbo
-    doc added
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XIdentifierAccess.idl b/udkapi/com/sun/star/container/XIdentifierAccess.idl
index 69a8fc8a764a..03485d3a8a0f 100644
--- a/udkapi/com/sun/star/container/XIdentifierAccess.idl
+++ b/udkapi/com/sun/star/container/XIdentifierAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIdentifierAccess.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-05-31 13:37:47 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,10 +73,9 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
@@ -102,6 +101,7 @@ interface XIdentifierAccess: com::sun::star::container::XElementAccess
             raises( com::sun::star::container::NoSuchElementException,
                     com::sun::star::lang::WrappedTargetException );
 
+    // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
     /** @returns
             a sequence of all identifiers in this container.
 
diff --git a/udkapi/com/sun/star/container/XIdentifierContainer.idl b/udkapi/com/sun/star/container/XIdentifierContainer.idl
index 415fdc5af404..9372dbbea81f 100644
--- a/udkapi/com/sun/star/container/XIdentifierContainer.idl
+++ b/udkapi/com/sun/star/container/XIdentifierContainer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIdentifierContainer.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,10 +81,9 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XIdentifierReplace.idl b/udkapi/com/sun/star/container/XIdentifierReplace.idl
index f7141d566973..588e81025eeb 100644
--- a/udkapi/com/sun/star/container/XIdentifierReplace.idl
+++ b/udkapi/com/sun/star/container/XIdentifierReplace.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIdentifierReplace.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-11-16 14:35:17 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,7 @@
 
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
diff --git a/udkapi/com/sun/star/container/XIndexAccess.idl b/udkapi/com/sun/star/container/XIndexAccess.idl
index f89553a18b6d..ec743e82f824 100644
--- a/udkapi/com/sun/star/container/XIndexAccess.idl
+++ b/udkapi/com/sun/star/container/XIndexAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIndexAccess.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,7 +80,6 @@ module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XIndexAccess
 /** provides access to the elements of a collection through an
     index.
 
@@ -91,9 +90,8 @@ interface XIndexAccess: com::sun::star::container::XElementAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XIndexAccess::getCount
     /** @returns
-                the number of elements.
+                the number of elements in this container.
      */
     long getCount();
 
@@ -101,7 +99,7 @@ interface XIndexAccess: com::sun::star::container::XElementAccess
 
     // DocMerge from idl: method com::sun::star::container::XIndexAccess::getByIndex
     /** @returns
-            the element at the specified index
+            the element at the specified index.
 
         @param Index
             specifies the position in the array. The first index is 0.
@@ -124,27 +122,4 @@ interface XIndexAccess: com::sun::star::container::XElementAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:54  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XIndexContainer.idl b/udkapi/com/sun/star/container/XIndexContainer.idl
index 572839853d50..0d2412791bfc 100644
--- a/udkapi/com/sun/star/container/XIndexContainer.idl
+++ b/udkapi/com/sun/star/container/XIndexContainer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIndexContainer.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,12 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XIndexContainer
 /** This is the generic interface for supporting the insertion and removal of
     indexed elements.@see XContainer
  */
@@ -92,8 +90,7 @@ interface XIndexContainer: com::sun::star::container::XIndexReplace
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XIndexContainer::insertByIndex
-    /** inserts the element at the specified index.
+    /** inserts the given element at the specified index.
 
         <p>To append an element, use the index "last index +1".  </p>
      */
@@ -105,7 +102,6 @@ interface XIndexContainer: com::sun::star::container::XIndexReplace
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XIndexContainer::removeByIndex
     /** removes the element at the specified index.
      */
     void removeByIndex( [in] long Index )
@@ -118,24 +114,4 @@ interface XIndexContainer: com::sun::star::container::XIndexReplace
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XIndexReplace.idl b/udkapi/com/sun/star/container/XIndexReplace.idl
index 7c6d7c906012..af68139f0e93 100644
--- a/udkapi/com/sun/star/container/XIndexReplace.idl
+++ b/udkapi/com/sun/star/container/XIndexReplace.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XIndexReplace.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,12 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XIndexReplace
 /** This is the generic interface for supporting the replacement of indexed
     elements.
 
@@ -94,8 +92,7 @@ interface XIndexReplace: com::sun::star::container::XIndexAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XIndexReplace::replaceByIndex
-    /** replaces the element at the specified index.
+    /** replaces the element at the specified index with the given element.
      */
     void replaceByIndex( [in] long Index,
              [in] any Element )
@@ -109,24 +106,4 @@ interface XIndexReplace: com::sun::star::container::XIndexAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XNameAccess.idl b/udkapi/com/sun/star/container/XNameAccess.idl
index 8f6af5b85f13..3b65080744b6 100644
--- a/udkapi/com/sun/star/container/XNameAccess.idl
+++ b/udkapi/com/sun/star/container/XNameAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XNameAccess.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,14 +73,12 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XNameAccess
 /** is used to access named objects within a container.
 
     <p>To implement inaccurate name access, support the
@@ -93,9 +91,8 @@ interface XNameAccess: com::sun::star::container::XElementAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XNameAccess::getByName
     /** @returns
-                the object with the specified name.
+        the object with the specified name.
 
         @param aName
             the name of the object.
@@ -104,9 +101,9 @@ interface XNameAccess: com::sun::star::container::XElementAccess
             if an element under Name does not exist.
 
         @throws  com::sun::star::lang::WrappedTargetException
-                If the implementation has internal reasons for exceptions,
-                then wrap these in a <type>WrappedTargetException</type>
-                exception.
+            If the implementation has internal reasons for exceptions,
+            then wrap these in a <type>WrappedTargetException</type>
+            exception.
      */
     any getByName( [in] string aName )
             raises( com::sun::star::container::NoSuchElementException,
@@ -114,7 +111,6 @@ interface XNameAccess: com::sun::star::container::XElementAccess
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XNameAccess::getElementNames
     /** @returns
             a sequence of all element names in this container.
 
@@ -124,7 +120,6 @@ interface XNameAccess: com::sun::star::container::XElementAccess
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XNameAccess::hasByName
     /** @returns
             <TRUE/> if an element with this name is in
             the container, <FALSE/> otherwise.
@@ -132,7 +127,7 @@ interface XNameAccess: com::sun::star::container::XElementAccess
         <p>In many cases the next call is <member>XNameAccess::getByName</member>.
         You should optimize this case.  </p>
 
-        @param iaName
+        @param aName
             the name of the object.
      */
     boolean hasByName( [in] string aName );
@@ -143,39 +138,4 @@ interface XNameAccess: com::sun::star::container::XElementAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.6  2000/12/19 15:32:24  mi
-    documentation syntax fixed
-
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:54  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.6  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.4  2000/02/23 14:49:55  mi
-    missing documentations
-
-    Revision 1.3  2000/02/07 11:24:23  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.2  2000/01/03 12:03:20  mi
-    reference manual
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XNameContainer.idl b/udkapi/com/sun/star/container/XNameContainer.idl
index fe779d8271ca..421080c2aae0 100644
--- a/udkapi/com/sun/star/container/XNameContainer.idl
+++ b/udkapi/com/sun/star/container/XNameContainer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XNameContainer.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,14 +81,12 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XNameContainer
 /** This is the generic interface for supporting the insertion and removal of
     named elements.
 
@@ -98,8 +96,7 @@ interface XNameContainer: com::sun::star::container::XNameReplace
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XNameContainer::insertByName
-    /** inserts the element at the specified name.
+    /** inserts the given element at the specified name.
      */
     void insertByName( [in] string aName,
              [in] any aElement )
@@ -109,7 +106,6 @@ interface XNameContainer: com::sun::star::container::XNameReplace
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XNameContainer::removeByName
     /** removes the element with the specified name.
      */
     void removeByName( [in] string Name )
@@ -122,24 +118,4 @@ interface XNameContainer: com::sun::star::container::XNameReplace
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XNameReplace.idl b/udkapi/com/sun/star/container/XNameReplace.idl
index 2036d5cfdde8..3d8080f991b2 100644
--- a/udkapi/com/sun/star/container/XNameReplace.idl
+++ b/udkapi/com/sun/star/container/XNameReplace.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XNameReplace.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,12 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XNameReplace
 /** This is the generic interface for supporting the replacement of named
     elements.
 
@@ -94,8 +92,7 @@ interface XNameReplace: com::sun::star::container::XNameAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XNameReplace::replaceByName
-    /** replaces the element with the specified name.
+    /** replaces the element with the specified name with the given element.
      */
     void replaceByName( [in] string aName,
              [in] any aElement )
@@ -109,24 +106,4 @@ interface XNameReplace: com::sun::star::container::XNameAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XNamed.idl b/udkapi/com/sun/star/container/XNamed.idl
index c3c0af59d5e7..b6a8e2a17f58 100644
--- a/udkapi/com/sun/star/container/XNamed.idl
+++ b/udkapi/com/sun/star/container/XNamed.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XNamed.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,14 +65,12 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XNamed
 /** specifies the name of the object.
 
     <p>The name is generally unique in the container of the object.</p>
@@ -81,15 +79,13 @@ interface XNamed: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XNamed::getName
     /** @returns
-                the programmatic name of the object.
+        the programmatic name of the object.
      */
     string getName();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XNamed::setName
     /** sets the programmatic name of the object.
      */
     [oneway] void setName( [in] string aName );
@@ -100,30 +96,4 @@ interface XNamed: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/02/23 14:49:55  mi
-    missing documentations
-
-    Revision 1.2  2000/02/07 11:24:23  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XSet.idl b/udkapi/com/sun/star/container/XSet.idl
index 8d2d2fb792f8..9aeb5dda26a6 100644
--- a/udkapi/com/sun/star/container/XSet.idl
+++ b/udkapi/com/sun/star/container/XSet.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XSet.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,14 +77,12 @@
 #include <com/sun/star/container/NoSuchElementException.idl>
 #endif
 
-
 //=============================================================================
 
- module com {  module sun {  module star {  module container {
+module com {  module sun {  module star {  module container {
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::container::XSet
 /** This is the generic interface for supporting the insertion and removal of
     elements.@see XContainer
  */
@@ -92,16 +90,15 @@ interface XSet: com::sun::star::container::XEnumerationAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::container::XSet::has
     /** @returns
-                <TRUE/> if the element exists, otherwise <FALSE/>.
+        <TRUE/> if the given element is a member of this container,
+        otherwise <FALSE/>.
      */
-    boolean has( [in] any Element );
+    boolean has( [in] any aElement );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XSet::insert
-    /** inserts the element in the container.
+    /** inserts the given element into this container.
      */
     void insert( [in] any aElement )
             raises( com::sun::star::lang::IllegalArgumentException,
@@ -109,9 +106,7 @@ interface XSet: com::sun::star::container::XEnumerationAccess
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::container::XSet::remove
-    /** removes the element at the position of the enumeration
-        object.
+    /** removes the given element from this container.
      */
     void remove( [in] any aElement )
             raises( com::sun::star::lang::IllegalArgumentException,
@@ -123,24 +118,4 @@ interface XSet: com::sun::star::container::XEnumerationAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.2  2000/01/03 12:03:20  mi
-    reference manual
-
-    Revision 1.1.1.1  1999/11/11 09:48:41  jsc
-    new
-
-
-=============================================================================*/
 #endif
diff --git a/udkapi/com/sun/star/container/XUniqueIDAccess.idl b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
index 633d31f7a853..a444cebaa187 100644
--- a/udkapi/com/sun/star/container/XUniqueIDAccess.idl
+++ b/udkapi/com/sun/star/container/XUniqueIDAccess.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XUniqueIDAccess.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 15:10:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-03 12:43:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,21 +73,21 @@
 #include <com/sun/star/lang/WrappedTargetException.idl>
 #endif
 
-
 //=============================================================================
 
 module com {  module sun {  module star {  module container {
 
-// DocMerge from xml: interface com::sun::star::container::XUniqueIDAccess
 /** makes it possible to access contents via a unique ID.
  */
 interface XUniqueIDAccess: com::sun::star::uno::XInterface
 {
-    /** @missing
+    /** @returns
+        the element with the specified unique ID.
      */
     any getByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException );
 
-    /** @missing
+    /** removes the element with the specified unique ID from this
+        container.
      */
     void removeByUniqueID( [in] string ID ) raises( com::sun::star::container::NoSuchElementException );
 };
@@ -96,24 +96,4 @@ interface XUniqueIDAccess: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2000/12/11 16:09:45  mi
-    documentation syntax fixed and some minor semantic documentation fixes
-
-    Revision 1.4  2000/11/08 12:28:31  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:04  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:17  mi
-    documentation merged from XML
-
-    Revision 1.1  1999/11/22 17:53:26  tlx
-    UniqueIDs
-
-
-=============================================================================*/
 #endif