*** empty log message ***

author: Michael Hönnig <mi@openoffice.org> 2002-10-02 14:12:36 +0000
committer: Michael Hönnig <mi@openoffice.org> 2002-10-02 14:12:36 +0000
commit: d081c80877dc1ae413b9d65c206485b6821d0ef8 (patch)
tree: 574a746be7d1fb7283d5c879529f8c0612f6f6f2 /offapi
parent: 0b051a06b6fdda4e6536ef0802c14164288914e6 (diff)
144 files changed, 1053 insertions, 2151 deletions
diff --git a/offapi/com/sun/star/drawing/Alignment.idl b/offapi/com/sun/star/drawing/Alignment.idl
index 313d6782032b..6277118af94e 100644
--- a/offapi/com/sun/star/drawing/Alignment.idl
+++ b/offapi/com/sun/star/drawing/Alignment.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Alignment.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -134,24 +134,5 @@ enum Alignment
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:11  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:27  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/AppletShape.idl b/offapi/com/sun/star/drawing/AppletShape.idl
index 044919d9567e..56ea35a65548 100644
--- a/offapi/com/sun/star/drawing/AppletShape.idl
+++ b/offapi/com/sun/star/drawing/AppletShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: AppletShape.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:05:53 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,7 +115,7 @@ service AppletShape
     /** This sequence contains paramaters that are passed to the applet
         when it is initialized.
     */
-    [property] sequence< com.sun.star.beans.PropertyValue > AppletCommands;
+    [property] sequence< com::sun::star::beans::PropertyValue > AppletCommands;
 
     //-------------------------------------------------------------------------
 
@@ -129,3 +129,4 @@ service AppletShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Arrangement.idl b/offapi/com/sun/star/drawing/Arrangement.idl
index b0d954b31b88..a39fb0713233 100644
--- a/offapi/com/sun/star/drawing/Arrangement.idl
+++ b/offapi/com/sun/star/drawing/Arrangement.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Arrangement.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:52 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,8 @@
 // DocMerge from xml: enum com::sun::star::drawing::Arrangement
 /** With this enumeration you can arrange the relative position of an object
     within the other objects.
+
+    @deprecated
  */
 enum Arrangement
 {
@@ -108,18 +110,5 @@ enum Arrangement
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:11  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/BezierPoint.idl b/offapi/com/sun/star/drawing/BezierPoint.idl
index 549fc1131637..8f22e4d4ee74 100644
--- a/offapi/com/sun/star/drawing/BezierPoint.idl
+++ b/offapi/com/sun/star/drawing/BezierPoint.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BezierPoint.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:53 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,6 +77,8 @@
 
     <p>The two control points specify how the bezier curve
     goes through the given position.</p>
+
+    @deprecated
  */
 struct BezierPoint
 {
@@ -105,21 +107,5 @@ struct BezierPoint
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:11  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/BitmapMode.idl b/offapi/com/sun/star/drawing/BitmapMode.idl
index ae5a558ba967..5bc91cc46477 100644
--- a/offapi/com/sun/star/drawing/BitmapMode.idl
+++ b/offapi/com/sun/star/drawing/BitmapMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BitmapMode.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2000-12-20 16:31:49 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:55 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,21 +96,5 @@ enum BitmapMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/BitmapTable.idl b/offapi/com/sun/star/drawing/BitmapTable.idl
index 0e81fa9b6bea..c673a35ce7a5 100644
--- a/offapi/com/sun/star/drawing/BitmapTable.idl
+++ b/offapi/com/sun/star/drawing/BitmapTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BitmapTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:06:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,9 +74,10 @@
 /** this is a container for URLs to bitmaps.
 
     <p>It is used for example to access the bitmaps that
-    are used inside a document for filling. @see DrawingDocumentFactory
+    are used inside a document for filling.
 
-    @see Fillstyle.FillBitmapURL
+    @see DrawingDocumentFactory
+    @see Fillstyle::FillBitmapURL
 */
 service BitmapTable
 {
@@ -86,7 +87,7 @@ service BitmapTable
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service BitmapTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/BoundVolume.idl b/offapi/com/sun/star/drawing/BoundVolume.idl
index 264f292923c6..fc54c7522f6b 100644
--- a/offapi/com/sun/star/drawing/BoundVolume.idl
+++ b/offapi/com/sun/star/drawing/BoundVolume.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: BoundVolume.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-23 23:40:15 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:57 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -91,3 +91,4 @@ struct BoundVolume
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CameraGeometry.idl b/offapi/com/sun/star/drawing/CameraGeometry.idl
index 973a3a5ab202..eb3b6d985b8c 100644
--- a/offapi/com/sun/star/drawing/CameraGeometry.idl
+++ b/offapi/com/sun/star/drawing/CameraGeometry.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CameraGeometry.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-23 23:41:13 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:58 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,12 +94,5 @@ struct CameraGeometry
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1  2000/11/24 09:55:17  cl
-    #80594# added CameraGeometry
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl b/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
index 9cd01ec1e4c2..74053f3b434c 100644
--- a/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
+++ b/offapi/com/sun/star/drawing/CaptionEscapeDirection.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CaptionEscapeDirection.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:12:03 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:11:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,3 +98,4 @@ constants CaptionEscapeDirection
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CaptionShape.idl b/offapi/com/sun/star/drawing/CaptionShape.idl
index 3c2d2f8e9fe9..ccbf30c88be5 100644
--- a/offapi/com/sun/star/drawing/CaptionShape.idl
+++ b/offapi/com/sun/star/drawing/CaptionShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CaptionShape.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:12:47 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -124,7 +124,7 @@ service CaptionShape
         the point that is captioned. A set of lines are
         rendered from the caption area.
     */
-    [property] com.sun.star.awt.Point CaptionPoint
+    [property] com::sun::star::awt::Point CaptionPoint;
 
     /** This property specifies the geometry of the line of a caption.
 
@@ -155,7 +155,7 @@ service CaptionShape
     /** This property specifies the escape direction for the
         line of a caption.
 
-        @see CaptionEscapeDirection;
+        @see CaptionEscapeDirection
     */
     [property] long CaptionEscapeDirection;
 
@@ -189,3 +189,4 @@ service CaptionShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CaptionType.idl b/offapi/com/sun/star/drawing/CaptionType.idl
index a74fa3a58391..d01075ccf861 100644
--- a/offapi/com/sun/star/drawing/CaptionType.idl
+++ b/offapi/com/sun/star/drawing/CaptionType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CaptionType.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:13:39 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,3 +97,4 @@ constants CaptionType
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CircleKind.idl b/offapi/com/sun/star/drawing/CircleKind.idl
index b93225cedf65..b52380e375ea 100644
--- a/offapi/com/sun/star/drawing/CircleKind.idl
+++ b/offapi/com/sun/star/drawing/CircleKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CircleKind.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,18 +107,5 @@ enum CircleKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ClosedBezierShape.idl b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
index 9d9df7e476da..c52dfc390c02 100644
--- a/offapi/com/sun/star/drawing/ClosedBezierShape.idl
+++ b/offapi/com/sun/star/drawing/ClosedBezierShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ClosedBezierShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:00 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,3 +120,4 @@ service ClosedBezierShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ColorMode.idl b/offapi/com/sun/star/drawing/ColorMode.idl
index 06236b719fc6..c045cf70aed1 100644
--- a/offapi/com/sun/star/drawing/ColorMode.idl
+++ b/offapi/com/sun/star/drawing/ColorMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ColorMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,19 +109,5 @@ enum ColorMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1  1999/11/23 17:08:05  cl
-    added new graphic properties
-
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ConnectionType.idl b/offapi/com/sun/star/drawing/ConnectionType.idl
index 8f7886c1b9ed..e6bc46bcb07f 100644
--- a/offapi/com/sun/star/drawing/ConnectionType.idl
+++ b/offapi/com/sun/star/drawing/ConnectionType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectionType.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,21 +122,5 @@ enum ConnectionType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ConnectorProperties.idl b/offapi/com/sun/star/drawing/ConnectorProperties.idl
index b7d31c6e3182..caa4e1219f32 100644
--- a/offapi/com/sun/star/drawing/ConnectorProperties.idl
+++ b/offapi/com/sun/star/drawing/ConnectorProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectorProperties.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,3 +113,4 @@ service ConnectorProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ConnectorShape.idl b/offapi/com/sun/star/drawing/ConnectorShape.idl
index ae1378d2ea15..fa87805c2322 100644
--- a/offapi/com/sun/star/drawing/ConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/ConnectorShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectorShape.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -183,3 +183,4 @@ service ConnectorShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ConnectorType.idl b/offapi/com/sun/star/drawing/ConnectorType.idl
index ce3d08b6eeaf..be043f1be5d5 100644
--- a/offapi/com/sun/star/drawing/ConnectorType.idl
+++ b/offapi/com/sun/star/drawing/ConnectorType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ConnectorType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -108,18 +108,5 @@ enum ConnectorType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ControlShape.idl b/offapi/com/sun/star/drawing/ControlShape.idl
index 1ab87ae6facb..4740c5cc2c3c 100644
--- a/offapi/com/sun/star/drawing/ControlShape.idl
+++ b/offapi/com/sun/star/drawing/ControlShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ControlShape.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -92,3 +92,4 @@ service ControlShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CoordinateSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequence.idl
index fceffd87e92e..c303b932a055 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CoordinateSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:02 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,3 +76,4 @@ typedef sequence<long> CoordinateSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
index 300eef17a1ff..c64f04122907 100644
--- a/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/CoordinateSequenceSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: CoordinateSequenceSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,3 +79,4 @@ typedef sequence<CoordinateSequence> CoordinateSequenceSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DashStyle.idl b/offapi/com/sun/star/drawing/DashStyle.idl
index 9da2a4c703a4..60dd4b00b14f 100644
--- a/offapi/com/sun/star/drawing/DashStyle.idl
+++ b/offapi/com/sun/star/drawing/DashStyle.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DashStyle.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,18 +109,5 @@ enum DashStyle
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DashTable.idl b/offapi/com/sun/star/drawing/DashTable.idl
index a4f27c1d0901..bcfc488c9fca 100644
--- a/offapi/com/sun/star/drawing/DashTable.idl
+++ b/offapi/com/sun/star/drawing/DashTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DashTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:16:44 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:03 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,8 +74,9 @@
 /** this is a container for <type>LineDash</type>s
 
     <p>It is used for example to access the <type>LineDash</type>s that
-    are used inside a document. @see DrawingDocumentFactory
+    are used inside a document.
 
+    @see DrawingDocumentFactory
     @see LineDash
 */
 service DashTable
@@ -86,7 +87,7 @@ service DashTable
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service DashTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Defaults.idl b/offapi/com/sun/star/drawing/Defaults.idl
index 3ec81fb68440..8250fdfe44ed 100644
--- a/offapi/com/sun/star/drawing/Defaults.idl
+++ b/offapi/com/sun/star/drawing/Defaults.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Defaults.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -61,16 +61,16 @@
 #ifndef __com_sun_star_drawing_Defaults_idl__
 #define __com_sun_star_drawing_Defaults_idl__
 
-#ifndef __com_sun_star_drawing_LineProperties_idl__
-#include <com/sun/star/drawing/LineProperties.idl>
+#ifndef __com_sun_star_drawing_TextProperties_idl__
+#include <com/sun/star/drawing/TextProperties.idl>
 #endif
 
 #ifndef __com_sun_star_drawing_FillProperties_idl__
 #include <com/sun/star/drawing/FillProperties.idl>
 #endif
 
-#ifndef __com_sun_star_drawing_TextProperties_idl__
-#include <com/sun/star/drawing/TextProperties.idl>
+#ifndef __com_sun_star_drawing_LineProperties_idl__
+#include <com/sun/star/drawing/LineProperties.idl>
 #endif
 
 #ifndef __com_sun_star_drawing_ShadowProperties_idl__
@@ -85,21 +85,25 @@
 #include <com/sun/star/drawing/MeasureProperties.idl>
 #endif
 
+
 //=============================================================================
 
 module com { module sun { module star { module drawing {
 
 //=============================================================================
-/** describes a specialized shape with a 2D extent that can be filled.
-*/
+
+/** This is a set of properties to access the defaults of a drawing document
+
+    @see DrawingDocumentFactory
+ */
 service Defaults
 {
-    service com::sun::star::drawing::LineProperties;
-    service com::sun::star::drawing::FillProperties;
-    service com::sun::star::drawing::TextProperties;
-    service com::sun::star::drawing::ShadowProperties;
-    service com::sun::star::drawing::ConnectorProperties;
-    service com::sun::star::drawing::MeasureProperties;
+    service TextProperties;
+    service LineProperties;
+    service FillProperties;
+    service ShadowProperties;
+    service ConnectorProperties;
+    service MeasureProperties;
 };
 
 //=============================================================================
@@ -107,3 +111,4 @@ service Defaults
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Direction3D.idl b/offapi/com/sun/star/drawing/Direction3D.idl
index 4c444e366776..099bde5efb2b 100644
--- a/offapi/com/sun/star/drawing/Direction3D.idl
+++ b/offapi/com/sun/star/drawing/Direction3D.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Direction3D.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:04 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,24 +94,5 @@ struct Direction3D
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:19  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:27  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
index 68f4863725ed..1c5f2721ca9d 100644
--- a/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/DoubleSequenceSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DoubleSequenceSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,3 +79,4 @@ typedef sequence<DoubleSequence> DoubleSequenceSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DrawPage.idl b/offapi/com/sun/star/drawing/DrawPage.idl
index 3126a3c0f5f4..f87a0eaf78c4 100644
--- a/offapi/com/sun/star/drawing/DrawPage.idl
+++ b/offapi/com/sun/star/drawing/DrawPage.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawPage.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,6 +69,10 @@
 #include <com/sun/star/drawing/XMasterPageTarget.idl>
 #endif
 
+#ifndef __com_sun_star_form_XFormsSupplier_idl__
+#include <com/sun/star/form/XFormsSupplier.idl>
+#endif
+
 
 //=============================================================================
 
@@ -98,33 +102,21 @@ service DrawPage
      */
     interface com::sun::star::drawing::XMasterPageTarget;
 
+    /** provides access to the hierarchy of form components belonging to the draw page.
+
+        <p>Every draw page may contain a form layer - that is, a hierarchy of form elements. The layer can be
+        accessed using this interface.</p>
+
+        @see com.sun.star.form.FormComponent
+        @see com.sun.star.form.FormComponents
+        @see com.sun.star.form.Forms
+    */
+    [optional] interface com::sun::star::form::XFormsSupplier;
 };
 
 //=============================================================================
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:19  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:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DrawPages.idl b/offapi/com/sun/star/drawing/DrawPages.idl
index e0547754f3d5..09aabcb3c044 100644
--- a/offapi/com/sun/star/drawing/DrawPages.idl
+++ b/offapi/com/sun/star/drawing/DrawPages.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawPages.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-01-23 10:08:12 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,27 +81,25 @@
 //=============================================================================
 
 // DocMerge from xml: service com::sun::star::drawing::DrawPages
-/** provides access to a collection of <type>DrawPage</type>s
-    and makes it possible for you to manipulate them.@see DrawingDocument
+/** provides access to a container of <type>DrawPage</type>s
+    and makes it possible for you to manipulate them.
+
+    @see XDrawPagesSupplier
+    @see DrawingDocument
  */
 service DrawPages
 {
-
-
-    // DocMerge from xml: service com::sun::star::drawing::DrawPages: interface com::sun::star::drawing::XDrawPages
-    /** makes the the pages of this collection accessible.
+    /** lets you access and create <type>DrawPage</type>s
      */
     interface com::sun::star::drawing::XDrawPages;
 
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawPages: interface com::sun::star::drawing::XDrawPageSummarizer
     /** This optional interface makes it possible to summarize the
                 pages in this collection.
      */
     [optional] interface com::sun::star::drawing::XDrawPageSummarizer;
 
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawPages: interface com::sun::star::drawing::XDrawPageExpander
     /** This optional interface can be used for expanding a summarized page.
      */
     [optional] interface com::sun::star::drawing::XDrawPageExpander;
@@ -112,24 +110,5 @@ service DrawPages
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DrawViewMode.idl b/offapi/com/sun/star/drawing/DrawViewMode.idl
index 026e880495fc..dfab7b977133 100644
--- a/offapi/com/sun/star/drawing/DrawViewMode.idl
+++ b/offapi/com/sun/star/drawing/DrawViewMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawViewMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,8 @@
 // DocMerge from xml: enum com::sun::star::drawing::DrawViewMode
 /** This enumeration specifies the viewmode of a view in a presentation
     document.
+
+    @deprecated
  */
 enum DrawViewMode
 {
@@ -104,6 +106,12 @@ enum DrawViewMode
 /*=============================================================================
 
     $Log: not supported by cvs2svn $
+    Revision 1.3.24.1  2002/02/07 07:47:26  cl
+    idl review
+
+    Revision 1.3  2000/11/08 12:42:41  mi
+    moved from api
+
     Revision 1.1.1.1  2000/09/18 23:35:12  hjs
     initial import
 
diff --git a/offapi/com/sun/star/drawing/DrawingDocument.idl b/offapi/com/sun/star/drawing/DrawingDocument.idl
index b87a0ee0a6f7..1d948bdf920c 100644
--- a/offapi/com/sun/star/drawing/DrawingDocument.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocument.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawingDocument.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-21 08:35:06 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,33 +93,74 @@
 #include <com/sun/star/lang/Locale.idl>
 #endif
 
+#ifndef __com_sun_star_awt_Rectangle_idl__
+#include <com/sun/star/awt/Rectangle.idl>
+#endif
+
+#ifndef __com_sun_star_i18n_XForbiddenCharacters_idl__
+#include <com/sun/star/i18n/XForbiddenCharacters.idl>
+#endif
+
+#ifndef __com_sun_star_document_OfficeDocument_idl__
+#include <com/sun/star/document/OfficeDocument.idl>
+#endif
+
+#ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
+#include <com/sun/star/drawing/DrawingDocumentFactory.idl>
+#endif
+
 //=============================================================================
 
  module com {  module sun {  module star {  module drawing {
 
 //=============================================================================
 
-// DocMerge from xml: service com::sun::star::drawing::DrawingDocument
 /** specifies a document which consists of multiple pages
     with drawings.
  */
 service DrawingDocument
 {
+    /** this base service describes storing and printing */
+    service com::sun::star::document::OfficeDocument;
+
+    /** This service describes the available services that can be
+        created with the <type scope="com:sun:star:lang">XMultiServiceFactory</type>
+        of a document that supports drawing objects.
+
+        The following services are only for documents in a drawing application.
+
+        <p>The following service can be used to create a new
+            graphic style for this document.
+
+        <ul>
+            <li><type scope="com::sun::star::style">Style</type></li>
+        </ul>
+
+        <p>The following service gives access to the xml namespaces used
+        inside the document.
+
+        <ul>
+            <li><type>com.sun.star.xml.NamespaceMap</type></li>
+        </ul>
+
+        <p>The following service can be used to add a background to a
+        <type>DrawPage</type> or <type>MasterPage</type>
+
+        <ul>
+            <li><type scope="com::sun::star::drawing">Background</type></li>
+        </ul>
+     */
+    service DrawingDocumentFactory;
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::beans::XPropertySet
     /** lets you access the properties of this service.
      */
     interface com::sun::star::beans::XPropertySet;
 
-
-
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::drawing::XDrawPageDuplicator
     /** lets you duplicate pages inside this document.
      */
     interface com::sun::star::drawing::XDrawPageDuplicator;
 
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::drawing::XDrawPagesSupplier
     /** provides an object that is implementing the service
                 <type>DrawPage</type>s. With this service you have access to the
                 <type>DrawPage</type>s inside a document.
@@ -127,7 +168,6 @@ service DrawingDocument
     interface com::sun::star::drawing::XDrawPagesSupplier;
 
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::drawing::XMasterPagesSupplier
     /** returns an object that is implementing the service
                 <type>MasterPages</type>. With this service you have access to the
                 <type>MasterPage</type>s inside a document.
@@ -135,34 +175,18 @@ service DrawingDocument
     interface com::sun::star::drawing::XMasterPagesSupplier;
 
 
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::drawing::XLayerSupplier
     /** returns an object that is implementing the service
                 <type>LayerManager</type>. This service lets you manipulate the
                 <type>Layer</type>s of this document.
      */
     interface com::sun::star::drawing::XLayerSupplier;
 
-
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::lang::XMultiServiceFactory
-    /** With this interface you can create <type>Shape</type>s for
-                this document. Only these <type>Shape</type>s can be added to the
-                pages of this document.
-                The <type>Shapes</type> created by this factory may not work correctly
-                until they are added to a page.
-
-                @see GenericDrawPage
-     */
-    interface com::sun::star::lang::XMultiServiceFactory;
-
-
-    // DocMerge from xml: service com::sun::star::drawing::DrawingDocument: interface com::sun::star::style::XStyleFamiliesSupplier
     /** This interface lets you access the styles contained in this document
      */
     interface com::sun::star::style::XStyleFamiliesSupplier;
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: property com::sun::star::drawing::DrawingDocument::TabStop
     /** This property specifies the length between the default tab stops
         inside text in this document in 1/100th mm.
      */
@@ -170,40 +194,28 @@ service DrawingDocument
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: property com::sun::star::drawing::DrawingDocument::CharLocale
     /** contains the identifier of the default locale of the document.
      */
     [property] com::sun::star::lang::Locale CharLocale;
-};
-
-//=============================================================================
-
-}; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
+    //-------------------------------------------------------------------------
 
-    Revision 1.6  2000/09/11 11:52:20  mi
-    documentation merged from XML
+    /** if this document is an ole client, this is the current visible area
+        in 100th mm
+    */
+    [property] com::sun::star::awt::Rectangle VisibleArea;
 
-    Revision 1.4  2000/02/24 17:30:56  cl
-    #73401# added CharLocale property
+    //-------------------------------------------------------------------------
 
-    Revision 1.3  1999/12/14 16:31:53  cl
-    #66868# added XStyleFamiliesSupplier
+    /** This property gives the XForbiddenCharacters.
+     */
+    [readonly, property] com::sun::star::i18n::XForbiddenCharacters ForbiddenCharacters;
 
-    Revision 1.2  1999/12/03 17:32:40  cl
-    #70484# added Property TabStop
+};
 
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
+//=============================================================================
 
+}; }; }; };
 
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
index f58997005839..4564837c0a74 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentDrawView.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawingDocumentDrawView.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2002-01-29 13:44:44 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -168,3 +168,4 @@ service DrawingDocumentDrawView
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
index 59268c9654ea..4cc869af5b1e 100644
--- a/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
+++ b/offapi/com/sun/star/drawing/DrawingDocumentFactory.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: DrawingDocumentFactory.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:18:37 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:06 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -57,9 +57,10 @@
  *  Contributor(s): _______________________________________
  *
  *
- ************************************************************************/
+ **************************************************************
+**********/
 #ifndef __com_sun_star_drawing_DrawingDocumentFactory_idl__
-#define __com_sun_star_drawing_DrawingDocumentFactory_idl__
+#define __com::sun::star::drawing_DrawingDocumentFactory_idl__
 
 #ifndef __com_sun_star_lang_XMultiServiceFactory_idl__
 #include <com/sun/star/lang/XMultiServiceFactory.idl>
@@ -107,57 +108,57 @@ service DrawingDocumentFactory
             <li><type>AppletShape</type></li>
         </ul>
 
-        <p>The following services are all <type>com.sun.star.text.TextField</type>
-        and can be inserted into text as <type>com.sun.star.text.TextContent</type>.
+        <p>The following services are all <type scope="com::sun::star::text">TextField</type>
+        and can be inserted into text as <type scope="com::sun::star::text">TextContent</type>.
 
         <ul>
-            <li><type>com.sun.star.text.TextField.DateTime</type></li>
-            <li><type>com.sun.star.text.TextField.URL</type></li>
-            <li><type>com.sun.star.text.TextField.PageNumber</type></li>
-            <li><type>com.sun.star.text.TextField.PageCount</type></li>
-            <li><type>com.sun.star.text.TextField.SheetName</type></li>
-            <li><type>com.sun.star.text.TextField.FileName</type></li>
-            <li><type>com.sun.star.text.TextField.DocInfo.Title</type></li>
-            <li><type>com.sun.star.text.TextField.Author</type></li>
-            <li><type>com.sun.star.text.TextField.Measure</type></li>
+            <li><type scope="com::sun::star::text">TextField::DateTime</type></li>
+            <li><type scope="com::sun::star::text">TextField::URL</type></li>
+            <li><type scope="com::sun::star::text">TextField::PageNumber</type></li>
+            <li><type scope="com::sun::star::text">TextField::PageCount</type></li>
+            <li><type scope="com::sun::star::text">TextField::SheetName</type></li>
+            <li><type scope="com::sun::star::text">TextField::FileName</type></li>
+            <li><type scope="com::sun::star::text">TextField::DocInfo.Title</type></li>
+            <li><type scope="com::sun::star::text">TextField::Author</type></li>
+            <li><type scope="com::sun::star::text">TextField::Measure</type></li>
         </ul>
 
         <p>The following services gives access to resources used inside the document
         and let you add new resources.
 
         <ul>
-            <li><type>com.sun.star.drawing.DashTable</type></li>
-            <li><type>com.sun.star.drawing.GradientTable</type></li>
-            <li><type>com.sun.star.drawing.HatchTable</type></li>
-            <li><type>com.sun.star.drawing.BitmapTable</type></li>
-            <li><type>com.sun.star.drawing.TransparencyGradientTable</type></li>
-            <li><type>com.sun.star.drawing.MarkerTable</type></li>
+            <li><type scope="com::sun::star::drawing">DashTable</type></li>
+            <li><type scope="com::sun::star::drawing">GradientTable</type></li>
+            <li><type scope="com::sun::star::drawing">HatchTable</type></li>
+            <li><type scope="com::sun::star::drawing">BitmapTable</type></li>
+            <li><type scope="com::sun::star::drawing">TransparencyGradientTable</type></li>
+            <li><type scope="com::sun::star::drawing">MarkerTable</type></li>
         </ul>
 
         <p>The following service can be set at the <code>Numbering</code> property
-        inside a <type>com.sun.star.style.ParagraphProperties</type>
+        inside a <type scope="com:sun:star:style">ParagraphProperties</type>
 
         <ul>
-            <li><type>com.sun.star.text.NumberingRules</type></li>
+            <li><type scope="com::sun::star::text">NumberingRules</type></li>
         </ul>
 
-        <p>The following services can be used for a <type>com.sun.star.image.ImageMap</type>
+        <p>The following services can be used for a <type scope="com::sun::star::image">ImageMap</type>
         inside the document.
 
         <br>A <type>com.sun.star.image.ImageMap</type> can be obtained from a
         <type>GraphicObjectShape</type>
 
         <ul>
-            <li><type>com.sun.star.image.ImageMapRectangleObject</type></li>
-            <li><type>com.sun.star.image.ImageMapCircleObject</type></li>
-            <li><type>com.sun.star.image.ImageMapPolygonObject</type></li>
+            <li><type scope="com::sun::star::image">ImageMapRectangleObject</type></li>
+            <li><type scope="com::sun::star::image">ImageMapCircleObject</type></li>
+            <li><type scope="com::sun::star::image">ImageMapPolygonObject</type></li>
         </ul>
 
         <p>The following services lets you access the drawing property defaults
         of a document.
 
         <ul>
-            <li><type>com.sun.star.document.Defaults</type></li>
+            <li><type scope="com::sun::star::document">Defaults</type></li>
         </ul>
     */
     interface com::sun::star::lang::XMultiServiceFactory;
@@ -169,3 +170,4 @@ service DrawingDocumentFactory
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/EllipseShape.idl b/offapi/com/sun/star/drawing/EllipseShape.idl
index d8ea0b6abe5f..e446f6dc3998 100644
--- a/offapi/com/sun/star/drawing/EllipseShape.idl
+++ b/offapi/com/sun/star/drawing/EllipseShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EllipseShape.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -136,3 +136,4 @@ service EllipseShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/EscapeDirection.idl b/offapi/com/sun/star/drawing/EscapeDirection.idl
index 95e8eca5ef45..64883490d4b3 100644
--- a/offapi/com/sun/star/drawing/EscapeDirection.idl
+++ b/offapi/com/sun/star/drawing/EscapeDirection.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: EscapeDirection.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,12 +106,5 @@ enum EscapeDirection
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1  2000/10/27 09:50:54  cl
-    added api for glue points
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl b/offapi/com/sun/star/drawing/FillProperties.idl
index 7f950863f6a9..6ad134644e8b 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FillProperties.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -250,3 +250,4 @@ service FillProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/FillStyle.idl b/offapi/com/sun/star/drawing/FillStyle.idl
index 1824b7afb235..d28be0c30422 100644
--- a/offapi/com/sun/star/drawing/FillStyle.idl
+++ b/offapi/com/sun/star/drawing/FillStyle.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FillStyle.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,24 +119,5 @@ enum FillStyle
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:27  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/FlagSequence.idl b/offapi/com/sun/star/drawing/FlagSequence.idl
index cef500c2ac92..683a0bb0c1fa 100644
--- a/offapi/com/sun/star/drawing/FlagSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FlagSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,3 +79,4 @@ typedef sequence<PolygonFlags> FlagSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
index 1b941b97e116..87fc617fa867 100644
--- a/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/FlagSequenceSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: FlagSequenceSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,3 +80,4 @@ typedef sequence<FlagSequence> FlagSequenceSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GenericDrawPage.idl b/offapi/com/sun/star/drawing/GenericDrawPage.idl
index 4da8f3c1077e..d1ef72a13bd1 100644
--- a/offapi/com/sun/star/drawing/GenericDrawPage.idl
+++ b/offapi/com/sun/star/drawing/GenericDrawPage.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GenericDrawPage.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cl $ $Date: 2002-04-12 09:01:30 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -150,14 +150,14 @@ service GenericDrawPage
     /** With this interface you can combine/split a collection of
                 <type>Shape</type>s.
      */
-    interface com::sun::star::drawing::XShapeCombiner;
+    [optional] interface com::sun::star::drawing::XShapeCombiner;
 
 
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::drawing::XShapeBinder
     /** With this interface you can bind/unbind a collection of
                 <type>Shape</type>s.
      */
-    interface com::sun::star::drawing::XShapeBinder;
+    [optional] interface com::sun::star::drawing::XShapeBinder;
 
 
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::container::XNamed
@@ -165,7 +165,7 @@ service GenericDrawPage
 
                 <p>Duplicated pagenames inside a document are not allowed.
      */
-    interface com::sun::star::container::XNamed;
+    [optional] interface com::sun::star::container::XNamed;
 
 
     // DocMerge from xml: service com::sun::star::drawing::GenericDrawPage: interface com::sun::star::lang::XServiceInfo
@@ -179,7 +179,7 @@ service GenericDrawPage
     /** gives you access to the properties of this
                 <type>DrawPage</type>.
      */
-    interface com::sun::star::beans::XPropertySet;
+    [optional] interface com::sun::star::beans::XPropertySet;
 
     //-------------------------------------------------------------------------
 
@@ -259,33 +259,5 @@ service GenericDrawPage
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.6  2001/10/26 08:45:35  mi
-    proofreading and corrections from Richard Holt
-
-    Revision 1.5  2001/10/16 09:47:34  cl
-    #91486# added xml alien attributes
-
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:55  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GluePoint.idl b/offapi/com/sun/star/drawing/GluePoint.idl
index 101865f28370..d6833f9a2dcb 100644
--- a/offapi/com/sun/star/drawing/GluePoint.idl
+++ b/offapi/com/sun/star/drawing/GluePoint.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GluePoint.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-14 12:53:36 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,30 +121,5 @@ struct GluePoint
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.2  2000/10/25 14:46:06  cl
-    new api for glue points added
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GluePoint2.idl b/offapi/com/sun/star/drawing/GluePoint2.idl
index 489a11292d91..26345b5e7586 100644
--- a/offapi/com/sun/star/drawing/GluePoint2.idl
+++ b/offapi/com/sun/star/drawing/GluePoint2.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GluePoint2.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-23 23:51:23 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,18 +119,5 @@ struct GluePoint2
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.2  2000/10/27 09:50:54  cl
-    added api for glue points
-
-    Revision 1.1  2000/10/25 14:46:06  cl
-    new api for glue points added
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GradientTable.idl b/offapi/com/sun/star/drawing/GradientTable.idl
index cd7504064bcc..f7035d1a0f9e 100644
--- a/offapi/com/sun/star/drawing/GradientTable.idl
+++ b/offapi/com/sun/star/drawing/GradientTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GradientTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:19:59 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,22 +71,23 @@
 
 //=============================================================================
 
-/** this is a container for <type>com.sun.star.awt.Gradient</type>s
+/** this is a container for <type scope="com::sun::star::awt">Gradient</type>s
 
-    <p>It is used for example to access the <type>com.sun.star.awt.Gradient</type>s that
-    are used inside a document. @see DrawingDocumentFactory
+    <p>It is used for example to access the <type scope="com::sun::star::awt">Gradient</type>s that
+    are used inside a document.
 
-    @see com.sun.star.awt.Gradient
+    @see DrawingDocumentFactory
+    @see com::sun::star::awt::Gradient
 */
 service GradientTable
 {
-    /** this container lets you access the <type>com.sun.star.awt.Gradient</type>s that
+    /** this container lets you access the <type scope="com::sun::star::awt">Gradient</type>s that
         are indexed with a name.
 
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service GradientTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GraphicExportFilter.idl b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
index 9680ba7005eb..c21ba48edf66 100644
--- a/offapi/com/sun/star/drawing/GraphicExportFilter.idl
+++ b/offapi/com/sun/star/drawing/GraphicExportFilter.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphicExportFilter.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -135,3 +135,4 @@ service GraphicExportFilter
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index c3fdc3c03802..7717ac94fc95 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GraphicObjectShape.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -172,7 +172,7 @@ service GraphicObjectShape
 
     //-------------------------------------------------------------------------
     /** This property contains a image map for this graphic.
-        @see com.sun.star.image.ImageMap
+        @see com::sun::star::image::ImageMap
     */
     [optional, property] com::sun::star::container::XIndexContainer ImageMap;
 
@@ -183,3 +183,4 @@ service GraphicObjectShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/GroupShape.idl b/offapi/com/sun/star/drawing/GroupShape.idl
index 27d45fbaa9e9..60cf698d06e5 100644
--- a/offapi/com/sun/star/drawing/GroupShape.idl
+++ b/offapi/com/sun/star/drawing/GroupShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: GroupShape.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,33 +106,5 @@ service GroupShape
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.7  2001/03/06 16:53:32  cl
-    cleanup of shape services
-
-    Revision 1.6  2001/01/16 20:21:55  cl
-    #80654# fixed some false service connections
-
-    Revision 1.5  2001/01/16 20:13:39  cl
-    #80654# fixed some false service connections
-
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:41  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Hatch.idl b/offapi/com/sun/star/drawing/Hatch.idl
index e243d933526e..d686f97ece70 100644
--- a/offapi/com/sun/star/drawing/Hatch.idl
+++ b/offapi/com/sun/star/drawing/Hatch.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Hatch.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -116,21 +116,5 @@ struct Hatch
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HatchStyle.idl b/offapi/com/sun/star/drawing/HatchStyle.idl
index 85d206c93c20..f30a2f08faf5 100644
--- a/offapi/com/sun/star/drawing/HatchStyle.idl
+++ b/offapi/com/sun/star/drawing/HatchStyle.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HatchStyle.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,18 +100,5 @@ enum HatchStyle
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:12  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HatchTable.idl b/offapi/com/sun/star/drawing/HatchTable.idl
index 122e998ac24a..e7966668d9b9 100644
--- a/offapi/com/sun/star/drawing/HatchTable.idl
+++ b/offapi/com/sun/star/drawing/HatchTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HatchTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:22:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,8 +74,9 @@
 /** this is a container for <type>Hatch</type>s
 
     <p>It is used for example to access the <type>Hatch</type>s that
-    are used inside a document. @see DrawingDocumentFactory
+    are used inside a document.
 
+    @see DrawingDocumentFactory
     @see Hatch
 */
 service HatchTable
@@ -86,7 +87,7 @@ service HatchTable
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service HatchTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix.idl b/offapi/com/sun/star/drawing/HomogenMatrix.idl
index 57e719083633..beeb5ee3b558 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrix.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,24 +104,5 @@ struct HomogenMatrix
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix3.idl b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
index 82fb2c1ae150..9b853a8c80dd 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix3.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrix3.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-12 16:33:25 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -95,3 +95,4 @@ struct HomogenMatrix3
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrix4.idl b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
index 6b004865770a..ab28977ec55b 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrix4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrix4.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrix4.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -99,3 +99,4 @@ struct HomogenMatrix4
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
index f89828c54317..1ef921b5cb21 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrixLine.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,24 +100,5 @@ struct HomogenMatrixLine
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
index 0bfd822aa8f2..e3804d143373 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine3.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrixLine3.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-12 16:33:25 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -90,3 +90,4 @@ struct HomogenMatrixLine3
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl b/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
index b33942a3ec59..36ac7fa59ea6 100644
--- a/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
+++ b/offapi/com/sun/star/drawing/HomogenMatrixLine4.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HomogenMatrixLine4.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-12 16:33:25 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,3 +94,4 @@ struct HomogenMatrixLine4
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
index 322de16a7d8b..be6d853733b2 100644
--- a/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/HorizontalDimensioning.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: HorizontalDimensioning.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,18 +109,5 @@ enum HorizontalDimensioning
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Layer.idl b/offapi/com/sun/star/drawing/Layer.idl
index eff48091c66b..447dc87d290a 100644
--- a/offapi/com/sun/star/drawing/Layer.idl
+++ b/offapi/com/sun/star/drawing/Layer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Layer.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,8 +83,10 @@
     <p>The properties of a <type>Layer</type> instance affect all <type>Shape</type>s
     attached to the Layer.
 
-    </p>@see    DrawingDocument
-        @see LayerManager
+    </p>
+
+    @see    DrawingDocument
+    @see LayerManager
  */
 service Layer
 {
@@ -134,30 +136,5 @@ service Layer
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/02/21 16:17:59  mi
-    string documentation from stardiv...*.idl-files
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LayerManager.idl b/offapi/com/sun/star/drawing/LayerManager.idl
index 3e7e4ed3acec..a9f7f9b562e3 100644
--- a/offapi/com/sun/star/drawing/LayerManager.idl
+++ b/offapi/com/sun/star/drawing/LayerManager.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LayerManager.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-21 08:35:06 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,9 @@
 //=============================================================================
 
 // DocMerge from xml: service com::sun::star::drawing::LayerManager
-/** This service is provided by documents to support <type>Layer</type>s.@see DrawingDocument
+/** This service is provided by documents to support <type>Layer</type>s.
+
+    @see DrawingDocument
  */
 service LayerManager
 {
@@ -108,21 +110,5 @@ service LayerManager
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LayerType.idl b/offapi/com/sun/star/drawing/LayerType.idl
index 392e9badb8b8..7b357f0b26bc 100644
--- a/offapi/com/sun/star/drawing/LayerType.idl
+++ b/offapi/com/sun/star/drawing/LayerType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LayerType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,18 +107,5 @@ enum LayerType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineDash.idl b/offapi/com/sun/star/drawing/LineDash.idl
index 31ccd4d03519..b3cf5322c84f 100644
--- a/offapi/com/sun/star/drawing/LineDash.idl
+++ b/offapi/com/sun/star/drawing/LineDash.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineDash.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,18 +123,6 @@ struct LineDash
 
 }; }; }; };
 
-/*=============================================================================
 
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineEndType.idl b/offapi/com/sun/star/drawing/LineEndType.idl
index 1a642757d7be..b68e2e9cff4b 100644
--- a/offapi/com/sun/star/drawing/LineEndType.idl
+++ b/offapi/com/sun/star/drawing/LineEndType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineEndType.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:14 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,8 @@
 // DocMerge from xml: enum com::sun::star::drawing::LineEndType
 /** The <type>LineEndType</type> specifies the appearance of the bullet at the
     end of a line.
+
+    @deprecated
  */
 enum LineEndType
 {
@@ -120,27 +122,5 @@ enum LineEndType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineJoint.idl b/offapi/com/sun/star/drawing/LineJoint.idl
index 4d0d8515ab48..65d480d08c22 100644
--- a/offapi/com/sun/star/drawing/LineJoint.idl
+++ b/offapi/com/sun/star/drawing/LineJoint.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineJoint.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,19 +104,5 @@ enum LineJoint
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:20  mi
-    documentation merged from XML
-
-    Revision 1.1  2000/01/28 11:00:58  cl
-    #72298# added Property LineJoint
-
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineProperties.idl b/offapi/com/sun/star/drawing/LineProperties.idl
index 346e3bd2e2eb..7b83f647a4ca 100644
--- a/offapi/com/sun/star/drawing/LineProperties.idl
+++ b/offapi/com/sun/star/drawing/LineProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineProperties.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -175,3 +175,4 @@ service LineProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineShape.idl b/offapi/com/sun/star/drawing/LineShape.idl
index 8ac3c19c25d6..8eb3012f36c6 100644
--- a/offapi/com/sun/star/drawing/LineShape.idl
+++ b/offapi/com/sun/star/drawing/LineShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,3 +113,4 @@ service LineShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/LineStyle.idl b/offapi/com/sun/star/drawing/LineStyle.idl
index edb7cbf01787..2da2f3d59bad 100644
--- a/offapi/com/sun/star/drawing/LineStyle.idl
+++ b/offapi/com/sun/star/drawing/LineStyle.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: LineStyle.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:15 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,24 +104,5 @@ enum LineStyle
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MarkerTable.idl b/offapi/com/sun/star/drawing/MarkerTable.idl
index da2779cfa47f..5216a89b742b 100644
--- a/offapi/com/sun/star/drawing/MarkerTable.idl
+++ b/offapi/com/sun/star/drawing/MarkerTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MarkerTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:24:41 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,8 +74,9 @@
 /** this is a container for <type>PointSequence</type>s
 
     <p>It is used for example to access the line ends that
-    are used inside a document. @see DrawingDocumentFactory
+    are used inside a document.
 
+    @see DrawingDocumentFactory
     @see PointSequence
 */
 service MarkerTable
@@ -86,7 +87,7 @@ service MarkerTable
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service MarkerTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MasterPage.idl b/offapi/com/sun/star/drawing/MasterPage.idl
index a99eb1e420e2..9ba9391a34fe 100644
--- a/offapi/com/sun/star/drawing/MasterPage.idl
+++ b/offapi/com/sun/star/drawing/MasterPage.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MasterPage.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -107,21 +107,5 @@ service MasterPage
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MasterPages.idl b/offapi/com/sun/star/drawing/MasterPages.idl
index 92eb0593bfc7..0977a4b7cf3f 100644
--- a/offapi/com/sun/star/drawing/MasterPages.idl
+++ b/offapi/com/sun/star/drawing/MasterPages.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MasterPages.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2000-12-21 08:35:06 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,16 +72,15 @@
 
 //=============================================================================
 
-// DocMerge from xml: service com::sun::star::drawing::MasterPages
-/** provides access to a collection of <type>MasterPage</type>s
-    and makes it possible for them to be manipulated.@see DrawingDocument
+/** provides access to a container of <type>MasterPage</type>s
+    and makes it possible for them to be manipulated.
+
+    @see XMasterPagesSupplier
+    @see DrawingDocument
  */
 service MasterPages
 {
-
-
-    // DocMerge from xml: service com::sun::star::drawing::MasterPages: interface com::sun::star::drawing::XDrawPages
-    /** makes the pages of this collection accessible.
+    /** lets you access and create <type>MasterPage</type>s
      */
     interface com::sun::star::drawing::XDrawPages;
 
@@ -91,21 +90,5 @@ service MasterPages
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MeasureKind.idl b/offapi/com/sun/star/drawing/MeasureKind.idl
index 50292a600064..f4b79096bc24 100644
--- a/offapi/com/sun/star/drawing/MeasureKind.idl
+++ b/offapi/com/sun/star/drawing/MeasureKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeasureKind.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,6 +71,8 @@
 // DocMerge from xml: enum com::sun::star::drawing::MeasureKind
 /** determines whether a measured shape is a standard
     measure or a radius measure.
+
+    @deprecated
  */
 enum MeasureKind
 {
@@ -97,24 +99,5 @@ enum MeasureKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MeasureProperties.idl b/offapi/com/sun/star/drawing/MeasureProperties.idl
index 14e455269da7..762fa7e1f7bb 100644
--- a/offapi/com/sun/star/drawing/MeasureProperties.idl
+++ b/offapi/com/sun/star/drawing/MeasureProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeasureProperties.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -177,3 +177,4 @@ service MeasureProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MeasureShape.idl b/offapi/com/sun/star/drawing/MeasureShape.idl
index c821b516cfea..a9228c858501 100644
--- a/offapi/com/sun/star/drawing/MeasureShape.idl
+++ b/offapi/com/sun/star/drawing/MeasureShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeasureShape.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,3 +125,4 @@ service MeasureShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
index ae0e28c94fbc..efe757037608 100644
--- a/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextHorzPos.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeasureTextHorzPos.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -104,24 +104,6 @@ enum MeasureTextHorzPos
 
 }; }; }; };
 
-/*=============================================================================
 
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
index 9ce6806f3a8d..3989c9751b11 100644
--- a/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
+++ b/offapi/com/sun/star/drawing/MeasureTextVertPos.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MeasureTextVertPos.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -110,24 +110,5 @@ enum MeasureTextVertPos
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:28  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/MirrorAxis.idl b/offapi/com/sun/star/drawing/MirrorAxis.idl
index 4d077fa794d5..5edc9b31d791 100644
--- a/offapi/com/sun/star/drawing/MirrorAxis.idl
+++ b/offapi/com/sun/star/drawing/MirrorAxis.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: MirrorAxis.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,18 +93,5 @@ enum MirrorAxis
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/NormalsKind.idl b/offapi/com/sun/star/drawing/NormalsKind.idl
index ac5b3c78f6f9..1f7870df6030 100644
--- a/offapi/com/sun/star/drawing/NormalsKind.idl
+++ b/offapi/com/sun/star/drawing/NormalsKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: NormalsKind.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,18 +103,5 @@ enum NormalsKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/OLE2Shape.idl b/offapi/com/sun/star/drawing/OLE2Shape.idl
index a364f6140390..25951687c8b8 100644
--- a/offapi/com/sun/star/drawing/OLE2Shape.idl
+++ b/offapi/com/sun/star/drawing/OLE2Shape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OLE2Shape.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-23 23:53:55 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -94,14 +94,22 @@ service OLE2Shape
 
     //-------------------------------------------------------------------------
 
-    /** This is the model for the ole2 inside this shape.
+    /** this is the internal storage name that keeps this OLE2 persist.
+    */
+    [property] string PersistName;
+
+    //-------------------------------------------------------------------------
+
+    /** This is the model for the OLE2 inside this shape.
         <p>This property returns an empty reference if the ole2 is not an
         Office component.
 
-    <!-- Dennis: Is it OLE2 or ole2? -->*/
+    */
     [readonly, property] com::sun::star::frame::XModel Model;
 
-    /** This property returns <TRUE/> for all ole2 that are internal
+    //-------------------------------------------------------------------------
+
+    /** This property returns <TRUE/> for all OLE2 that are internal
         Office components.
     */
     [readonly, property] boolean IsInternal;
@@ -112,3 +120,4 @@ service OLE2Shape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/OpenBezierShape.idl b/offapi/com/sun/star/drawing/OpenBezierShape.idl
index 2ebf4bc60cf3..7f10809c0a98 100644
--- a/offapi/com/sun/star/drawing/OpenBezierShape.idl
+++ b/offapi/com/sun/star/drawing/OpenBezierShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: OpenBezierShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,3 +115,4 @@ service OpenBezierShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PageShape.idl b/offapi/com/sun/star/drawing/PageShape.idl
index e5e3e2bd6e71..5fde7a7d0630 100644
--- a/offapi/com/sun/star/drawing/PageShape.idl
+++ b/offapi/com/sun/star/drawing/PageShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PageShape.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -74,30 +74,28 @@
 
 // DocMerge from xml: service com::sun::star::drawing::PageShape
 /** This service is for a page shape.
+    A page shape displays a preview of another page. These shapes
+    are used inside notes pages to preview the corresponding
+    drawing page. Theyre also used in the handout page to preview
+    the printing position and order of pages
  */
 service PageShape
 {
     // DocMerge: empty anyway
     service com::sun::star::drawing::Shape;
 
+    /** this is the page number that is used for the preview.
+        For page shapes on notes pages, this can't be changed.
+        For page shapes on handout pages, this value only
+        describes the relative order of the different page
+        shapes on the page.
+    */
+    [optional, property] long PageNumber;
 };
 
 //=============================================================================
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:13  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PluginShape.idl b/offapi/com/sun/star/drawing/PluginShape.idl
index 4e7764f3773a..2649044c0042 100644
--- a/offapi/com/sun/star/drawing/PluginShape.idl
+++ b/offapi/com/sun/star/drawing/PluginShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PluginShape.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:25:52 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,7 +105,7 @@ service PluginShape
     /** This sequence contains paramaters that are passed to the application
         that renders the plugin when it is initialized.
     */
-    [property] sequence< com.sun.star.beans.PropertyValue > PluginCommands;
+    [property] sequence< com::sun::star::beans::PropertyValue > PluginCommands;
 };
 
 //=============================================================================
@@ -113,3 +113,4 @@ service PluginShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PointSequence.idl b/offapi/com/sun/star/drawing/PointSequence.idl
index b66aca73fd53..3e77f2685a80 100644
--- a/offapi/com/sun/star/drawing/PointSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PointSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,3 +79,4 @@ typedef sequence<com::sun::star::awt::Point> PointSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PointSequenceSequence.idl b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
index dbce9e9e77a4..f1de8aced77f 100644
--- a/offapi/com/sun/star/drawing/PointSequenceSequence.idl
+++ b/offapi/com/sun/star/drawing/PointSequenceSequence.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PointSequenceSequence.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,3 +79,4 @@ typedef sequence<PointSequence> PointSequenceSequence;
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyLineShape.idl b/offapi/com/sun/star/drawing/PolyLineShape.idl
index 298ecd6eb8e4..0423d2ee5269 100644
--- a/offapi/com/sun/star/drawing/PolyLineShape.idl
+++ b/offapi/com/sun/star/drawing/PolyLineShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyLineShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -115,3 +115,4 @@ service PolyLineShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
index 29b81fada7a5..38d82d34a92a 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierCoords.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonBezierCoords.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,24 +96,5 @@ struct PolyPolygonBezierCoords
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:21  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
index b4a44708d6a5..7def47e9a066 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierDescriptor.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonBezierDescriptor.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,3 +106,4 @@ service PolyPolygonBezierDescriptor
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
index a39c691fdbfc..8db10b8a3120 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonBezierShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonBezierShape.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,3 +121,4 @@ service PolyPolygonBezierShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
index bb32a41271df..fb1d6d07e0a6 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonDescriptor.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonDescriptor.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-01-12 16:13:38 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -105,3 +105,4 @@ service PolyPolygonDescriptor
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape.idl b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
index 6418a997af5d..18f103ccc4f3 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,3 +123,4 @@ service PolyPolygonShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
index 62bc9f44e688..25d2eb191844 100644
--- a/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
+++ b/offapi/com/sun/star/drawing/PolyPolygonShape3D.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolyPolygonShape3D.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,24 +98,5 @@ struct PolyPolygonShape3D
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolygonFlags.idl b/offapi/com/sun/star/drawing/PolygonFlags.idl
index b6c3b39facca..a9f69f78f990 100644
--- a/offapi/com/sun/star/drawing/PolygonFlags.idl
+++ b/offapi/com/sun/star/drawing/PolygonFlags.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolygonFlags.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -111,24 +111,5 @@ enum PolygonFlags
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/PolygonKind.idl b/offapi/com/sun/star/drawing/PolygonKind.idl
index cd67122bf8aa..e9d3a4284841 100644
--- a/offapi/com/sun/star/drawing/PolygonKind.idl
+++ b/offapi/com/sun/star/drawing/PolygonKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: PolygonKind.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -142,21 +142,5 @@ enum PolygonKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Position3D.idl b/offapi/com/sun/star/drawing/Position3D.idl
index 2c8622647bc5..0629fa1705a3 100644
--- a/offapi/com/sun/star/drawing/Position3D.idl
+++ b/offapi/com/sun/star/drawing/Position3D.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Position3D.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,24 +100,5 @@ struct Position3D
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ProjectionMode.idl b/offapi/com/sun/star/drawing/ProjectionMode.idl
index b35f97d2b38d..2e5f0019de3c 100644
--- a/offapi/com/sun/star/drawing/ProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/ProjectionMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ProjectionMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:22 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,24 +96,5 @@ enum ProjectionMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/RectanglePoint.idl b/offapi/com/sun/star/drawing/RectanglePoint.idl
index 51a40bad11f1..1582def1ed4c 100644
--- a/offapi/com/sun/star/drawing/RectanglePoint.idl
+++ b/offapi/com/sun/star/drawing/RectanglePoint.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RectanglePoint.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -151,24 +151,5 @@ enum RectanglePoint
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/RectangleShape.idl b/offapi/com/sun/star/drawing/RectangleShape.idl
index 5bb7dc60d05d..fe60779723f1 100644
--- a/offapi/com/sun/star/drawing/RectangleShape.idl
+++ b/offapi/com/sun/star/drawing/RectangleShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RectangleShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -121,3 +121,4 @@ service RectangleShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/RotationDescriptor.idl b/offapi/com/sun/star/drawing/RotationDescriptor.idl
index f3603ec04678..f7c7307d2c69 100644
--- a/offapi/com/sun/star/drawing/RotationDescriptor.idl
+++ b/offapi/com/sun/star/drawing/RotationDescriptor.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: RotationDescriptor.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2002-03-19 12:45:09 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,12 +76,16 @@ service RotationDescriptor
     //-------------------------------------------------------------------------
 
     /** This is the angle for rotation of this <type>Shape</type>.
+        The shape is rotated counter-clockwise around the center
+        of the bounding box.
      */
     [property] long RotateAngle;
 
     //-------------------------------------------------------------------------
 
     /** This is the amount of shearing for this <type>Shape</type>.
+        The shape is sheared counter-clockwise around the center
+        of the bounding box
      */
     [optional, property] long ShearAngle;
 };
@@ -90,24 +94,5 @@ service RotationDescriptor
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/20 12:44:05  cl
-    #80337# removed the rotation points, theyre not working this way
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ShadeMode.idl b/offapi/com/sun/star/drawing/ShadeMode.idl
index 1efdd6742f4b..78681d441422 100644
--- a/offapi/com/sun/star/drawing/ShadeMode.idl
+++ b/offapi/com/sun/star/drawing/ShadeMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ShadeMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,8 +76,8 @@ enum ShadeMode
     //-------------------------------------------------------------------------
 
     // DocMerge from xml: value com::sun::star::drawing::ShadeMode::FLAT
-    /** With <const>PHONG</const> shading, the normal itself is interpolated
-        to get more realistic colors and light reflections.
+    /** With <const>FLAT</const> shading, the faces of the object are
+        rendered in a solid color.
      */
     FLAT,
 
@@ -91,15 +91,17 @@ enum ShadeMode
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: value com::sun::star::drawing::ShadeMode::SMOOTH
-    /** <const>DRAFT</const> is a special mode which uses a BSP tree and
-                triangle subdivision for displaying.
+    /** With <const>SMOOTH</const> shading, the colors of the lit vertiecs is
+        interpolated.
      */
     SMOOTH,
 
     //-------------------------------------------------------------------------
 
     // DocMerge: empty anyway
+    /** <const>DRAFT</const> is a special mode which uses a BSP tree and
+                triangle subdivision for displaying.
+     */
     DRAFT
 
 };
@@ -108,18 +110,5 @@ enum ShadeMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ShadowProperties.idl b/offapi/com/sun/star/drawing/ShadowProperties.idl
index efbf9d930dc3..e4f34be95e1c 100644
--- a/offapi/com/sun/star/drawing/ShadowProperties.idl
+++ b/offapi/com/sun/star/drawing/ShadowProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ShadowProperties.idl,v $
  *
- *  $Revision: 1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,3 +113,4 @@ service ShadowProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Shape.idl b/offapi/com/sun/star/drawing/Shape.idl
index d971a3cd045b..5dacdbe59767 100644
--- a/offapi/com/sun/star/drawing/Shape.idl
+++ b/offapi/com/sun/star/drawing/Shape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Shape.idl,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: cl $ $Date: 2001-10-16 09:47:34 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,10 +96,12 @@
 //=============================================================================
 
 /** This abstract service specifies the general characteristics of all
-    <type>Shape</type>s.@see XShape
-        @see com::sun::star::lang::XComponent
-        @see com::sun::star::text::XText
-        @see ShapeDescriptor
+    <type>Shape</type>s.
+
+    @see XShape
+    @see com::sun::star::lang::XComponent
+    @see com::sun::star::text::XText
+    @see ShapeDescriptor
  */
 service Shape
 {
@@ -194,6 +196,9 @@ service Shape
 
     /** this property lets you get and set the transformation matrix
         for this shape.
+
+        The transformation is a 3x3 homogen matrix and can contain
+        translation, rotation, shearing and scaling.
      */
     [optional, property] com::sun::star::drawing::HomogenMatrix3 Transformation;
 
@@ -212,3 +217,4 @@ service Shape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/ShapeCollection.idl b/offapi/com/sun/star/drawing/ShapeCollection.idl
new file mode 100644
index 000000000000..77945939d8de
--- /dev/null
+++ b/offapi/com/sun/star/drawing/ShapeCollection.idl
@@ -0,0 +1,101 @@
+/*************************************************************************
+ *
+ *  $RCSfile: ShapeCollection.idl,v $
+ *
+ *  $Revision: 1.2 $
+ *
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:24 $
+ *
+ *  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_drawing_ShapeCollection_idl__
+#define __com_sun_star_drawing_ShapeCollection_idl__
+
+#ifndef __com_sun_star_drawing_Shapes_idl__
+#include <com/sun/star/drawing/Shapes.idl>
+#endif
+
+#ifndef __com_sun_star_lang_XComponent_idl__
+#include <com/sun/star/lang/XComponent.idl>
+#endif
+
+//=============================================================================
+
+module com { module sun { module star { module drawing {
+
+//=============================================================================
+/** This service describes a generic container to manage collections of
+    <type>Shape</type>. The <type>Shape</type> that are added to this
+    collection are not owned by the collection.
+
+    This service is used by the view f.e. to return a collection of
+    <type>Shape</type> that are selected at the ui.
+*/
+service ShapeCollection
+{
+    /** gives access to the shapes
+     */
+    interface com::sun::star::drawing::XShapes;
+
+    /** allows controlling or observing the lifetime of this collection
+     */
+    interface com::sun::star::lang::XComponent;
+
+};
+
+//=============================================================================
+
+}; }; }; };
+
+#endif
+
diff --git a/offapi/com/sun/star/drawing/Shapes.idl b/offapi/com/sun/star/drawing/Shapes.idl
index 754a84fb096a..589c71c55279 100644
--- a/offapi/com/sun/star/drawing/Shapes.idl
+++ b/offapi/com/sun/star/drawing/Shapes.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Shapes.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -86,18 +86,5 @@ service Shapes
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/SnapObjectType.idl b/offapi/com/sun/star/drawing/SnapObjectType.idl
index 8eeecaf55c33..7674f4cb518b 100644
--- a/offapi/com/sun/star/drawing/SnapObjectType.idl
+++ b/offapi/com/sun/star/drawing/SnapObjectType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: SnapObjectType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,24 +97,5 @@ enum SnapObjectType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:29  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/Text.idl b/offapi/com/sun/star/drawing/Text.idl
index 0adb3601c733..0decc69d42f5 100644
--- a/offapi/com/sun/star/drawing/Text.idl
+++ b/offapi/com/sun/star/drawing/Text.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: Text.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,3 +96,4 @@ service Text
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextAdjust.idl b/offapi/com/sun/star/drawing/TextAdjust.idl
index 4f5a7714c642..fcf22adeb744 100644
--- a/offapi/com/sun/star/drawing/TextAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextAdjust.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextAdjust.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2000-11-15 16:57:04 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -120,21 +120,5 @@ enum TextAdjust
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:14  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextAnimationDirection.idl b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
index 42a8a69f6d81..da304e4e030c 100644
--- a/offapi/com/sun/star/drawing/TextAnimationDirection.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationDirection.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextAnimationDirection.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,24 +103,5 @@ enum TextAnimationDirection
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:22  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextAnimationKind.idl b/offapi/com/sun/star/drawing/TextAnimationKind.idl
index cdcb5a35d34a..4edd1d88c41d 100644
--- a/offapi/com/sun/star/drawing/TextAnimationKind.idl
+++ b/offapi/com/sun/star/drawing/TextAnimationKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextAnimationKind.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -114,18 +114,5 @@ enum TextAnimationKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextFitToSizeType.idl b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
index 05721a822aa3..c82d0d8602ed 100644
--- a/offapi/com/sun/star/drawing/TextFitToSizeType.idl
+++ b/offapi/com/sun/star/drawing/TextFitToSizeType.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextFitToSizeType.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,27 +75,27 @@
 enum TextFitToSizeType
 {
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextFitToSizeType::    NONE,
-
-    // DocMerge: empty anyway
+    /** the text size is only defined by the font properties
+    */
     NONE,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextFitToSizeType::    PROPORTIONAL,
 
-    // DocMerge: empty anyway
+    /** if the shape is scaled, the text character size is scaled proportional
+    */
     PROPORTIONAL,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextFitToSizeType::    ALLLINES,
 
-    // DocMerge: empty anyway
+    /** like <code>PROPORTIONAL</code>, but the width of each text row is
+        also scaled proportional.
+    */
     ALLLINES,
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR TextFitToSizeType::    RESIZEATTR
 
-    // DocMerge: empty anyway
+    /** if the shape is scaled, the font attributes are scaled and hard set
+        on the text */
     RESIZEATTR
 
 };
@@ -104,24 +104,5 @@ enum TextFitToSizeType
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:43  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl b/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
index 74f29848203f..ec8be96c006c 100644
--- a/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextHorizontalAdjust.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextHorizontalAdjust.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-24 00:00:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,15 +103,5 @@ enum TextHorizontalAdjust
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.2  2000/11/28 14:59:49  cl
-    #79743# replaced TextAdjust with TextHorizontalAdjust and TextVerticalAdjust
-
-    Revision 1.1  2000/11/15 16:57:04  cl
-    #79743# replaced TextAdjust with TextHorizontalAdjust and TextVerticalAdjust
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextProperties.idl b/offapi/com/sun/star/drawing/TextProperties.idl
index 61f524fe3f42..b89148ed6ed4 100644
--- a/offapi/com/sun/star/drawing/TextProperties.idl
+++ b/offapi/com/sun/star/drawing/TextProperties.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextProperties.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -231,19 +231,35 @@ service TextProperties
     [property] long TextLowerDistance;
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameHeight
+
+    /** with this property you can set the maximum height for a shape with text.
+        On edit, the auto grow feature will not grow the object heigher than
+        the value of this property.
+    */
     [property] long TextMaximumFrameHeight;
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Text::TextMaximumFrameWidth
+
+    /** with this property you can set the maximum width for a shape with text.
+        On edit, the auto grow feature will not grow the objects wider than
+        the value of this property.
+    */
     [property] long TextMaximumFrameWidth;
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Text::TextMinimalFrameHeight
+
+    /** with this property you can set the minimum height for a shape with text.
+        On edit, the auto grow feature will not shrink the objects height smaller
+        than the value of this property.
+    */
     [property] long TextMinimumFrameHeight;
 
     //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR Text::TextMinimumFrameWidth
+
+    /** with this property you can set the minimum width for a shape with text.
+        On edit, the auto grow feature will not shrink the object width smaller
+        than the value of this property.
+    */
     [property] long TextMinimumFrameWidth;
 
     //-------------------------------------------------------------------------
@@ -304,3 +320,4 @@ service TextProperties
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextShape.idl b/offapi/com/sun/star/drawing/TextShape.idl
index c34fe5863b09..f31c7889fa9f 100644
--- a/offapi/com/sun/star/drawing/TextShape.idl
+++ b/offapi/com/sun/star/drawing/TextShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2001-03-06 16:53:32 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -118,3 +118,4 @@ service TextShape
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
index 4f98a53820ee..604666919d1b 100644
--- a/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
+++ b/offapi/com/sun/star/drawing/TextVerticalAdjust.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextVerticalAdjust.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-24 00:00:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -100,15 +100,5 @@ enum TextVerticalAdjust
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.2  2000/11/28 14:59:49  cl
-    #79743# replaced TextAdjust with TextHorizontalAdjust and TextVerticalAdjust
-
-    Revision 1.1  2000/11/15 16:57:04  cl
-    #79743# replaced TextAdjust with TextHorizontalAdjust and TextVerticalAdjust
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextureKind.idl b/offapi/com/sun/star/drawing/TextureKind.idl
index e303c5bb7231..bf194ce27819 100644
--- a/offapi/com/sun/star/drawing/TextureKind.idl
+++ b/offapi/com/sun/star/drawing/TextureKind.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextureKind.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: cl $ $Date: 2000-11-22 11:45:02 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,21 +97,5 @@ enum TextureKind
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextureKind2.idl b/offapi/com/sun/star/drawing/TextureKind2.idl
index 67a8134d748d..9b985935c14f 100644
--- a/offapi/com/sun/star/drawing/TextureKind2.idl
+++ b/offapi/com/sun/star/drawing/TextureKind2.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextureKind2.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: arellano $ $Date: 2001-04-24 00:02:24 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:27 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -97,3 +97,4 @@ enum TextureKind2
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextureMode.idl b/offapi/com/sun/star/drawing/TextureMode.idl
index 3472f242303c..fbd75f84fd46 100644
--- a/offapi/com/sun/star/drawing/TextureMode.idl
+++ b/offapi/com/sun/star/drawing/TextureMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextureMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -101,18 +101,5 @@ enum TextureMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TextureProjectionMode.idl b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
index dd33d68c44d8..1a32e7a7ca14 100644
--- a/offapi/com/sun/star/drawing/TextureProjectionMode.idl
+++ b/offapi/com/sun/star/drawing/TextureProjectionMode.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TextureProjectionMode.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -106,18 +106,5 @@ enum TextureProjectionMode
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
index e8089686a3e3..800c90b1fde6 100644
--- a/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
+++ b/offapi/com/sun/star/drawing/TransparencyGradientTable.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: TransparencyGradientTable.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mh $ $Date: 2002-02-28 16:27:07 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,20 +73,21 @@
 
 /** this is a container for <type>com.sun.star.awt.Gradient</type>s
 
-    <p>It is used for example to access the <type>com.sun.star.awt.Gradient</type>s that
-    are used inside a document for fill transparency. @see DrawingDocumentFactory
+    <p>It is used for example to access the <type scope="com::sun::star::awt">Gradient</type>s that
+    are used inside a document for fill transparency.
 
+    @see DrawingDocumentFactory
     @see com.sun.star.awt.Gradient
 */
 service TransparencyGradientTable
 {
-    /** this container lets you access the <type>com.sun.star.awt.Gradient</type>s that
+    /** this container lets you access the <typeu scope="com::sun::star::awt">Gradient</type>s that
         are indexed with a name.
 
         <p>Note: You can add new entries for later use, but you cannot
         remove entries that are used inside the document.
     */
-    interface com.sun.star.container.XNameContainer;
+    interface com::sun::star::container::XNameContainer;
 };
 
 //=============================================================================
@@ -94,3 +95,4 @@ service TransparencyGradientTable
 }; }; }; };
 
 #endif
+
diff --git a/offapi/com/sun/star/drawing/VerticalDimensioning.idl b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
index 69649ebb51d6..06296732ca80 100644
--- a/offapi/com/sun/star/drawing/VerticalDimensioning.idl
+++ b/offapi/com/sun/star/drawing/VerticalDimensioning.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: VerticalDimensioning.idl,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: mi $ $Date: 2000-11-08 12:42:42 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -109,18 +109,5 @@ enum VerticalDimensioning
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XConnectableShape.idl b/offapi/com/sun/star/drawing/XConnectableShape.idl
index d5b2358b4add..fb8f2838e226 100644
--- a/offapi/com/sun/star/drawing/XConnectableShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectableShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XConnectableShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,7 +76,8 @@
 
 //=============================================================================
 
-// DocMerge: empty anyway
+/** @deprecated
+*/
 interface XConnectableShape: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
@@ -101,27 +102,5 @@ interface XConnectableShape: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:44  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XConnectorShape.idl b/offapi/com/sun/star/drawing/XConnectorShape.idl
index dab6c7b8b1a1..60bd9a8a7445 100644
--- a/offapi/com/sun/star/drawing/XConnectorShape.idl
+++ b/offapi/com/sun/star/drawing/XConnectorShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XConnectorShape.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cl $ $Date: 2001-08-24 13:44:56 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -122,24 +122,5 @@ interface XConnectorShape: com::sun::star::drawing::XShape
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2001/03/16 16:41:21  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XControlShape.idl b/offapi/com/sun/star/drawing/XControlShape.idl
index 1d30dc1e5b68..d1c14118e910 100644
--- a/offapi/com/sun/star/drawing/XControlShape.idl
+++ b/offapi/com/sun/star/drawing/XControlShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XControlShape.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,22 +76,34 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XControlShape
-/** is implemented by <type>Shape</type>s that contain a control.
- */
+/** is implemented by a <type>ControlShape</type> to access the controls model.
+
+    @see com::sun::star::drawing::ControlShape
+    @see com::sun::star::awt::ControlModel
+*/
 interface XControlShape: com::sun::star::drawing::XShape
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XControlShape::getControl
-    /** returns the control of this <type>Shape</type>.@see com::sun::star::awt::ControlModel
+    /** returns the control model of this <type>Shape</type>.
+
+        @return
+            if there is already a control model assigned
+            to this <type>ControlShape</type>, than its returned.
+            Otherwise you get an empty reference.
      */
     com::sun::star::awt::XControlModel getControl();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XControlShape::setControl
-    /** sets the control for this <type>Shape</type>.@see com::sun::star::awt::ControlMOodel
+    /** sets the control model for this <type>Shape</type>.
+
+        @param xControl
+            this will be the new control model that is
+            displayed with this shape. You may change
+            the model more than once during the lifetime
+            of a <type>ControlShape</type>
+
      */
     [oneway] void setControl( [in] com::sun::star::awt::XControlModel xControl );
 
@@ -101,27 +113,5 @@ interface XControlShape: com::sun::star::drawing::XShape
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.2  2000/10/09 14:24:55  mi
-    #78715# exchanged stardiv::... by com::sun::star::... (especially in @see tags)
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPage.idl b/offapi/com/sun/star/drawing/XDrawPage.idl
index 086e6ee62c98..14d026882675 100644
--- a/offapi/com/sun/star/drawing/XDrawPage.idl
+++ b/offapi/com/sun/star/drawing/XDrawPage.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPage.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,6 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPage
 /** identifies an <type>XShapes</type> as a <type>DrawPage</type>.
  */
 interface XDrawPage: com::sun::star::drawing::XShapes
@@ -83,21 +82,5 @@ interface XDrawPage: com::sun::star::drawing::XShapes
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
index 2676ebe3518a..bdf9432589e3 100644
--- a/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageDuplicator.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPageDuplicator.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,16 +76,24 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPageDuplicator
-/** makes it possible to duplicate draw pages within the same document.
+/** makes it possible to duplicate pages within the same document.
  */
 interface XDrawPageDuplicator: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawPageDuplicator::duplicate
-    /** a duplicate of the given <type>DrawPage</type> will be inserted into
-        this collection.
+    /** creates a duplicate of a <type>DrawPage</type> or <type>MasterPage</type>,
+        including the <type>Shape</type>s on that page and inserts it into the
+        same model.
+
+        @param xPage
+            that is the source <type>DrawPage</type> or <type>MasterPage</type>
+            that will be duplicated
+
+        @return
+            a newly created <type>DrawPage</type> or <type>MasterPage</type>
+            that as all properties and copies of all <type>Shape</type>s from
+            the source page.
      */
     com::sun::star::drawing::XDrawPage duplicate( [in] com::sun::star::drawing::XDrawPage xPage );
 
@@ -95,21 +103,5 @@ interface XDrawPageDuplicator: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPageExpander.idl b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
index fd325bc12bba..2270f044ce75 100644
--- a/offapi/com/sun/star/drawing/XDrawPageExpander.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageExpander.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPageExpander.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,19 +80,22 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPageExpander
 /** is implemented by documents that can expand the contents
     of a summary on a <type>DrawPage</type> into a collection of
-    <type>DrawPage</type>s.@see XDrawPageSummarizer
+    <type>DrawPage</type>s.
+
+    @see XDrawPageSummarizer
+
+    @deprecated
  */
 interface XDrawPageExpander: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawPageExpander::expand
     /** creates a collection of <type>DrawPage</type>s from the
-        summary inside the given <type>DrawPage</type>.
-     */
+        summary inside the given <type>DrawPage</type> and adds
+        them to the same model as the source <type>DrawPage</type>.
+    */
     com::sun::star::drawing::XDrawPages expand( [in] com::sun::star::drawing::XDrawPage xPage );
 
 };
@@ -101,24 +104,5 @@ interface XDrawPageExpander: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
index 6ef836606881..2ad443251f8c 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSummarizer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPageSummarizer.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,8 @@
 // DocMerge from xml: interface com::sun::star::drawing::XDrawPageSummarizer
 /** is implemented by documents that can create summaries
     of their <type>DrawPage</type>s.
+
+    @deprecated
  */
 interface XDrawPageSummarizer: com::sun::star::uno::XInterface
 {
@@ -100,21 +102,5 @@ interface XDrawPageSummarizer: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
index a6f3a1e93d1d..14fc9588c221 100644
--- a/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPageSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPageSupplier.idl,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,8 @@
     one <type>DrawPage</type>. For containers which support multiple
     <type>DrawPage</type>s interface <type>XDrawPagesSupplier</type> is
     supported.</p>
+
+    @deprecated
  */
 interface XDrawPageSupplier: com::sun::star::uno::XInterface
 {
@@ -99,27 +101,5 @@ interface XDrawPageSupplier: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.4  2001/03/16 16:41:21  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPages.idl b/offapi/com/sun/star/drawing/XDrawPages.idl
index 43018da6f242..d6cf54354d0e 100644
--- a/offapi/com/sun/star/drawing/XDrawPages.idl
+++ b/offapi/com/sun/star/drawing/XDrawPages.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPages.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,24 +76,42 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPages
-/** gives access to a collection of <type>DrawPage</type> instances.
- */
+/** gives access to a container of <type>DrawPage</type>s or <type>MasterPage</type>s.
+
+    <p>The pages are stored in an index container. The order is determined by
+    the index.
+
+    You usualy get this interface if you use the
+    <type>XDrawPagesSupplier<type> or the <type>XMasterPagesSupplier</type>
+    at a model that contains <type>DrawPage</type>s or <type>MasterPage</type>s
+*/
 interface XDrawPages: com::sun::star::container::XIndexAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawPages::insertNewByIndex
-    /** creates and inserts a new <type>DrawPage</type> into
-        this collection.
-     */
+    /** creates and inserts a new <type>DrawPage</type> or <type>MasterPage</type>
+        into this container
+
+        @param nIndex
+            the index at which the newly created <type>DrawPage</type> or
+            <type>MasterPage</type> will be inserted.
+
+        @return
+            the newly created and already inserted <type>DrawPage</type> or
+            <type>MasterPage</type>.
+    */
     com::sun::star::drawing::XDrawPage insertNewByIndex( [in] long nIndex );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawPages::remove
-    /** removes the given <type>DrawPage</type> from this collection.
-     */
+    /** removes a <type>DrawPage</type> or <type>MasterPage</type> from this
+        container.
+
+        @param xPage
+            this <type>DrawPage</type> or <type>MasterPage</type> must be
+            contained and will be removed from this container. It will
+            also be disposed and shouldn't be used any further.
+    */
     void remove( [in] com::sun::star::drawing::XDrawPage xPage );
 
 };
@@ -102,21 +120,5 @@ interface XDrawPages: com::sun::star::container::XIndexAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
index a28a5951c56a..3706f35e5302 100644
--- a/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XDrawPagesSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawPagesSupplier.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,23 +76,13 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawPagesSupplier
 /** must be supported to provide access to a multi-page drawing-layer.
-
-    <p>This interface is provided if the container supports multiple
-    <type>DrawPage</type>s. For containers which support exactly one
-    <type>DrawPage</type> interface <type>XDrawPageSupplier</type> is
-    supported.
-   </p>
-    @see XDrawPageSupplier
- */
+*/
 interface XDrawPagesSupplier: com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::drawing::XDrawPagesSupplier::getDrawPages
     /** @returns
-                a collection of all <type>DrawPage</type>s.
+                an indexed container with the service <type>DrawPages</type>.
      */
     com::sun::star::drawing::XDrawPages getDrawPages();
 
@@ -102,30 +92,5 @@ interface XDrawPagesSupplier: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2001/03/16 16:41:21  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XDrawView.idl b/offapi/com/sun/star/drawing/XDrawView.idl
index 21c43ae6f4da..1a232c7d9005 100644
--- a/offapi/com/sun/star/drawing/XDrawView.idl
+++ b/offapi/com/sun/star/drawing/XDrawView.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XDrawView.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,24 +76,27 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XDrawView
-/** is implemented by views that display <type>DrawPage</type>s.
+/** is implemented by views that display <type>DrawPage</type>s or <type>MasterPage</type>s.
  */
 interface XDrawView: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawView::setCurrentPage
-    /** sets the page that is actually visible in the user
-        interface.
+    /** changes the current page.
+
+        @param xPage
+            this <type>DrawPage</type> or <type>MasterPage</type> will be
+            displayed inside this view.
      */
     void setCurrentPage( [in] com::sun::star::drawing::XDrawPage xPage );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XDrawView::getCurrentPage
-    /** returns the current page of the view that is actually
-        visible in the user interface.
+    /** returns the current page.
+
+        @return
+            the <type>DrawPage</type> or <type>MasterPage</type> that is
+            currently displayed.
      */
     com::sun::star::drawing::XDrawPage getCurrentPage();
 
@@ -103,21 +106,5 @@ interface XDrawView: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
index 55625c84291b..3789c2255346 100644
--- a/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
+++ b/offapi/com/sun/star/drawing/XGluePointsSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XGluePointsSupplier.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,14 +71,15 @@
 
 //=============================================================================
 
-/** must be supported to provide access to a list of <type>GluePoint2</type>.
+/** must be supported to provide access to a container of <type>GluePoint2</type>.
  */
 interface XGluePointsSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    /** @returns
-                a collection of <code>GluePoint</code>s.
+    /**
+        @return
+                a container of <type>GluePoint2</type> structs.
      */
     com::sun::star::container::XIndexContainer getGluePoints();
 
@@ -91,6 +92,12 @@ interface XGluePointsSupplier: com::sun::star::uno::XInterface
 /*=============================================================================
 
     $Log: not supported by cvs2svn $
+    Revision 1.4.16.1  2002/02/07 07:47:26  cl
+    idl review
+
+    Revision 1.4  2001/03/16 16:41:21  jsc
+    remove interfaceheader with uik and remove [const] in method definitions
+
     Revision 1.3  2000/11/08 12:42:42  mi
     moved from api
 
diff --git a/offapi/com/sun/star/drawing/XLayer.idl b/offapi/com/sun/star/drawing/XLayer.idl
index 7cee1d358c2f..b3bf34e23d72 100644
--- a/offapi/com/sun/star/drawing/XLayer.idl
+++ b/offapi/com/sun/star/drawing/XLayer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XLayer.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,6 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XLayer
 /** identifies the object as a <type>Layer</type>.
  */
 interface XLayer: com::sun::star::beans::XPropertySet
@@ -83,21 +82,5 @@ interface XLayer: com::sun::star::beans::XPropertySet
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XLayerManager.idl b/offapi/com/sun/star/drawing/XLayerManager.idl
index 2e38b829b61a..dc4628e46419 100644
--- a/offapi/com/sun/star/drawing/XLayerManager.idl
+++ b/offapi/com/sun/star/drawing/XLayerManager.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XLayerManager.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,45 +84,60 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XLayerManager
 /** This interface makes it possible to access and manage the
     <type>Layer</type>s of a document.
+
+    @see LayerManager
  */
 interface XLayerManager: com::sun::star::container::XIndexAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XLayerManager::insertNewByIndex
-    /** inserts a new <type>Layer</type> with default options
+    /** creates a new <type>Layer</type>
+
+        @param nIndex
+            the index at which the new layer is inserted
+
+        @returns
+            the new created <type>Layer</type>
      */
     com::sun::star::drawing::XLayer insertNewByIndex( [in] long nIndex );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XLayerManager::remove
     /** removes a <type>Layer</type> and all <type>Shape</type>s on
         this <type>Layer</type>.
+
+        @param xLayer
+            this <type>Layer</type> will be removed and disposed
      */
     void remove( [in] com::sun::star::drawing::XLayer xLayer )
             raises( com::sun::star::container::NoSuchElementException );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XLayerManager::attachShapeToLayer
     /** attaches a <type>Shape</type> to the given <type>Layer</type>.
+
+        @param xShape
+            this is the <type>Shape</type> that will be attached to a <type>Layer</type>
+
+        @param xLayer
+            this is the <type>Layer</type> that will be attached to a <type>Shape</type>
      */
     void attachShapeToLayer( [in] com::sun::star::drawing::XShape xShape,
              [in] com::sun::star::drawing::XLayer xLayer );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::drawing::XLayerManager::getLayerForShape
-    /** @returns
-                the <type>Layer</type> to which the <type>Shape</type> is
-                attached.
+    /** queries the <type>Layer</type> that a <type>Shape</type> is attached to
+
+        @param xShape
+            specifies the <type>Shape</type> for which the layer is requested.
+
+        @returns
+            the <type>Layer</type> to which the <type>Shape</type> is
+            attached.
 
-                @param xShape
-                specifies the <type>Shape</type> for which the layer is requested.
      */
     com::sun::star::drawing::XLayer getLayerForShape( [in] com::sun::star::drawing::XShape xShape );
 
@@ -132,21 +147,5 @@ interface XLayerManager: com::sun::star::container::XIndexAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XLayerSupplier.idl b/offapi/com/sun/star/drawing/XLayerSupplier.idl
index b7cc8698a131..89a46ee81d5e 100644
--- a/offapi/com/sun/star/drawing/XLayerSupplier.idl
+++ b/offapi/com/sun/star/drawing/XLayerSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XLayerSupplier.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,14 +76,14 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XLayerSupplier
-/** gives access to a <type>LayerManager</type>.@see        LayerManager
+/** gives access to a <type>LayerManager</type>.
+
+    @see        LayerManager
  */
 interface XLayerSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::drawing::XLayerSupplier::getLayerManager
     /** @returns
                 the <type>LayerManager</type>.
      */
@@ -95,21 +95,6 @@ interface XLayerSupplier: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
 
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XMasterPageTarget.idl b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
index f951c473eba0..50ff6c38208e 100644
--- a/offapi/com/sun/star/drawing/XMasterPageTarget.idl
+++ b/offapi/com/sun/star/drawing/XMasterPageTarget.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMasterPageTarget.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,23 +76,25 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XMasterPageTarget
 /** is implemented by objects that can be linked to a
     <type>MasterPage</type>.
+
+    @see DrawPage
  */
 interface XMasterPageTarget: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XMasterPageTarget::getMasterPage
-    /** returns the <type>MasterPage</type> linked to this object.
+    /** @returns the <type>MasterPage</type> linked to this object.
      */
     com::sun::star::drawing::XDrawPage getMasterPage();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XMasterPageTarget::setMasterPage
-    /** links the given <type>MasterPage</type> to this object.
+    /** links a <type>MasterPage</type> to this object.
+
+        @param xMasterPage
+            the <type>MasterPage</type> that is linked to this object
      */
     void setMasterPage( [in] com::sun::star::drawing::XDrawPage xMasterPage );
 
@@ -102,21 +104,5 @@ interface XMasterPageTarget: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
index d86a8e60f093..6de3a5e11854 100644
--- a/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
+++ b/offapi/com/sun/star/drawing/XMasterPagesSupplier.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMasterPagesSupplier.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,7 +76,6 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XMasterPagesSupplier
 /** must be supported to provide access to the
     <type>MasterPage</type>s of a multi-page drawing-layer.
  */
@@ -84,11 +83,8 @@ interface XMasterPagesSupplier: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XMasterPagesSupplier::getMasterPages
-    /** returns the <type>MasterPage</type>s collection.
-
-        returns
-        a collection of all <type>MasterPage</type>s of this collection
+    /** @returns
+                an indexed container with the service <type>MasterPages</type>.
      */
     com::sun::star::drawing::XDrawPages getMasterPages();
 
@@ -98,21 +94,5 @@ interface XMasterPagesSupplier: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:23  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShape.idl b/offapi/com/sun/star/drawing/XShape.idl
index 427eb1829262..6e994d1e83c8 100644
--- a/offapi/com/sun/star/drawing/XShape.idl
+++ b/offapi/com/sun/star/drawing/XShape.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShape.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,6 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShape
 /** lets you do a basic transformation on a <type>Shape</type> and
     get its type.
  */
@@ -92,29 +91,37 @@ interface XShape: com::sun::star::drawing::XShapeDescriptor
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShape::getPosition
-    /** gets the current position of this instance.
+    /** gets the current position of this object.
+
+        @returns
+            the position of the top left edge in 100/th mm
      */
     com::sun::star::awt::Point getPosition();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShape::setPosition
-    /** sets the current position of this instance.
+    /** sets the current position of this object
+
+        @param aPosition
+            the position of the top left edge in 100/th mm
      */
     void setPosition( [in] com::sun::star::awt::Point aPosition );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShape::getSize
-    /** gets the size of this instance.
+    /** gets the size of this object.
+
+        @returns
+            the size in 100/th mm
      */
     com::sun::star::awt::Size getSize();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShape::setSize
-    /** sets the size of this instance.
+    /** sets the size of this object.
+
+        @param aSize
+            the size in 100/th mm
      */
     void setSize( [in] com::sun::star::awt::Size aSize )
             raises( com::sun::star::beans::PropertyVetoException );
@@ -125,21 +132,5 @@ interface XShape: com::sun::star::drawing::XShapeDescriptor
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeAligner.idl b/offapi/com/sun/star/drawing/XShapeAligner.idl
index 606b16b1f49d..83d488adb1bc 100644
--- a/offapi/com/sun/star/drawing/XShapeAligner.idl
+++ b/offapi/com/sun/star/drawing/XShapeAligner.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeAligner.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:33 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,6 +83,8 @@
 // DocMerge from xml: interface com::sun::star::drawing::XShapeAligner
 /** Objects implementing this interface can be used to align
     <type>Shape</type>s.
+
+    @deprecated
  */
 interface XShapeAligner: com::sun::star::uno::XInterface
 {
@@ -100,21 +102,5 @@ interface XShapeAligner: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeArranger.idl b/offapi/com/sun/star/drawing/XShapeArranger.idl
index 1d830de2b3ba..b8384dd046e5 100644
--- a/offapi/com/sun/star/drawing/XShapeArranger.idl
+++ b/offapi/com/sun/star/drawing/XShapeArranger.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeArranger.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,6 +87,8 @@
 // DocMerge from xml: interface com::sun::star::drawing::XShapeArranger
 /** Objects implementing this interface can be used to arrange
     <type>Shape</type>s.
+
+    @deprecated
  */
 interface XShapeArranger: com::sun::star::uno::XInterface
 {
@@ -149,24 +151,5 @@ interface XShapeArranger: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.2  1999/11/25 16:03:31  mi
-    welforming HTML for XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeBinder.idl b/offapi/com/sun/star/drawing/XShapeBinder.idl
index 1390fda1d4a3..45c5cf37b355 100644
--- a/offapi/com/sun/star/drawing/XShapeBinder.idl
+++ b/offapi/com/sun/star/drawing/XShapeBinder.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeBinder.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,22 +80,36 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeBinder
-/** specifies the connect/break functionality.
+/** connects or breaks the lines of <type>Shape</type>s
  */
 interface XShapeBinder: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeBinder::bind
-    /** binds the specified <type>Shape</type>s together.
+    /** binds <type>Shape</type>s together.
+
+        @param xShapes
+            a container with <type>Shape</type>s that will be bind toghether.
+            All <type>Shapes</type> will be converted to a <type>PolyPolygonBezierShape</type>
+            and the lines will be connected. The <type>Shape</types>s in xShape will be
+            removed from the <type>GenericDrawPage</type> and disposed.
+
+        @returns
+            a newly created <type>PolyPolygonBezierShape</type> which contains all
+            line segment from the supplied <type>Shape</type>s. It is also added
+            to the <type>GenericDrawPage</type> of the source <type>Shape</type>s.
      */
     com::sun::star::drawing::XShape bind( [in] com::sun::star::drawing::XShapes xShapes );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeBinder::unbind
-    /** unbinds the specified shape.
+    /** breaks a <type>Shape</type> into its line segments
+
+        @param xShape
+            the given <type>Shape</type> will be converted to a <type>PolyPolygonBezierShape</type>
+            and the line segments of this <type>Shape</type> will be used to create
+            new <type>PolyPolygonBezierShape</type> shapes. The original <type>Shape</type>
+            will be removed from its <type>GenericDrawPage</type> and disposed.
      */
     void unbind( [in] com::sun::star::drawing::XShape xShape );
 
@@ -105,21 +119,5 @@ interface XShapeBinder: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeCombiner.idl b/offapi/com/sun/star/drawing/XShapeCombiner.idl
index 0d9be9c57abe..c7b65848a947 100644
--- a/offapi/com/sun/star/drawing/XShapeCombiner.idl
+++ b/offapi/com/sun/star/drawing/XShapeCombiner.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeCombiner.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,23 +80,39 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeCombiner
 /** specifies the combine/split functionality.
  */
 interface XShapeCombiner: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeCombiner::combine
-    /** combines the <type>Shape</type>s in the given collection.
+    /** combines <type>Shape</type>s
+
+        @param xShapes
+            the <type>Shape</type>s inside this container are converted
+            to <type>PolyPolygonBezierShape</type>s and are than combined
+            into one <type>PolyPolygonBezierShape</type>.
+            The <type>Shape</types>s in xShape will be removed from the
+            <type>GenericDrawPage</type> and disposed.
+
+        @returns
+            a newly created <type>PolyPolygonBezierShape</type> which contains all
+            converted <type>PolyPolygonBezierShape</type> combined. It is also added
+            to the <type>GenericDrawPage</type> of the source <type>Shape</type>s.
+
      */
     com::sun::star::drawing::XShape combine( [in] com::sun::star::drawing::XShapes xShapes );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeCombiner::split
-    /** ungroups the combined <type>Shape</type> into its
-        individual <type>Shape</type>s.
+    /** splits <type>Shape</type>s.
+
+        @param xShapes
+            the <type>Shape</type> is converted to a
+            <type>PolyPolygonBezierShape</type>s and then splited into
+            several <type>PolyPolygonBezierShape</type>s
+            The <type>Shape</types>s in xShape will be removed from the
+            <type>GenericDrawPage</type> and disposed.
      */
     void split( [in] com::sun::star::drawing::XShape xGroup );
 
@@ -106,21 +122,5 @@ interface XShapeCombiner: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeDescriptor.idl b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
index 66fbfb8f0bc7..d43e14cdf418 100644
--- a/offapi/com/sun/star/drawing/XShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XShapeDescriptor.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeDescriptor.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,27 +72,17 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeDescriptor
 /** offers some settings which are allowed even for objects which are not yet inserted into a draw page.
 
-
-
-
-
-
-
-
-
-
-
     @deprecated
  */
 interface XShapeDescriptor: com::sun::star::uno::XInterface
 {
-    //-------------------------------------------------------------------------
-    // DOCUMENTATION OMITTED FOR XShapeDescriptor::getShapeType
-
-    // DocMerge: empty anyway
+    /**
+        @returns
+            the service name of a string. Will be replaced
+            by <type>com::sun::star::lang::ServiceName</type>
+    */
     string getShapeType();
 
 };
@@ -101,27 +91,5 @@ interface XShapeDescriptor: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:44  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeGroup.idl b/offapi/com/sun/star/drawing/XShapeGroup.idl
index c6a3c67f604c..4a943d7786e0 100644
--- a/offapi/com/sun/star/drawing/XShapeGroup.idl
+++ b/offapi/com/sun/star/drawing/XShapeGroup.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeGroup.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,9 +72,10 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeGroup
 /** is implemented by <type>Shape</type>s that contain other
     <type>Shape</type>s.
+
+    @deprecated
  */
 interface XShapeGroup: com::sun::star::drawing::XShape
 {
@@ -114,21 +115,5 @@ interface XShapeGroup: com::sun::star::drawing::XShape
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeGrouper.idl b/offapi/com/sun/star/drawing/XShapeGrouper.idl
index 6e36f88e1bec..159afc67ce86 100644
--- a/offapi/com/sun/star/drawing/XShapeGrouper.idl
+++ b/offapi/com/sun/star/drawing/XShapeGrouper.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeGrouper.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,22 +80,35 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeGrouper
 /** specifies the group/ungroup functionality.
  */
 interface XShapeGrouper: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeGrouper::group
     /** groups the <type>Shape</type>s inside a collection.
+
+        @param xShapes
+            the <type>Shape</type>s that will be grouped. They
+            must all be inserted into the same <type>GenericDrawPage</type>.
+
+        @returns
+            a newly created <type>GroupShape</type> that contains all
+            <type>Shape</type>s from xShapes and is also added to the
+            <type>GenericDrawPage</type> of the <type>Shape</type>s
+            in xShapes.
      */
     com::sun::star::drawing::XShapeGroup group( [in] com::sun::star::drawing::XShapes xShapes );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeGrouper::ungroup
-    /** ungroups a given <type>Shape</type>.
+    /** ungroups a given <type>GroupShape</type>.
+
+        @param aGroup
+            moves all <type>Shape</type>s from this <type>GroupShape</type>
+            to the parent <type>XShapes</type> of the <type>GroupShape</type>.
+            The <type>GroupShape</type> is than removed from the
+            <type>GenericDrawPage</type> and disposed.
      */
     void ungroup( [in] com::sun::star::drawing::XShapeGroup aGroup );
 
@@ -105,21 +118,5 @@ interface XShapeGrouper: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapeMirror.idl b/offapi/com/sun/star/drawing/XShapeMirror.idl
index 45c482117928..1fbd95b661b4 100644
--- a/offapi/com/sun/star/drawing/XShapeMirror.idl
+++ b/offapi/com/sun/star/drawing/XShapeMirror.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapeMirror.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,15 +84,15 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapeMirror
 /** Objects implementing this interface can be used to mirror
     <type>Shape</type>s.
+
+    @deprecated
  */
 interface XShapeMirror: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeMirror::mirror
     /** mirrors the given <type>Shape</type>s
         at the given axis.
      */
@@ -101,7 +101,6 @@ interface XShapeMirror: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapeMirror::mirrorAtAxis
     /** mirrors the given <type>Shape</type>s at
         the given axis.
      */
@@ -114,24 +113,5 @@ interface XShapeMirror: com::sun::star::uno::XInterface
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.4  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.2  1999/11/25 16:03:32  mi
-    welforming HTML for XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XShapes.idl b/offapi/com/sun/star/drawing/XShapes.idl
index d3fdba9e7580..20898b1b5f5d 100644
--- a/offapi/com/sun/star/drawing/XShapes.idl
+++ b/offapi/com/sun/star/drawing/XShapes.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XShapes.idl,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mi $ $Date: 2001-10-26 08:45:35 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,24 +76,31 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::drawing::XShapes
 /** makes it possible to access, add, and remove the
-    <type>Shape</type>s in a collection.@see    DrawPage
-        @see DrawingDocumentDrawView
+    <type>Shape</type>s in a collection.
+
+    @see DrawPage
+    @see MasterPage
+    @see DrawingDocumentDrawView
  */
 interface XShapes: com::sun::star::container::XIndexAccess
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapes::add
     /** inserts a <type>Shape</type> into this collection.
+
+        @param xShape
+            a <type>Shape</type> that will be inserted.
      */
     void add( [in] com::sun::star::drawing::XShape xShape );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::drawing::XShapes::remove
     /** removes a <type>Shape</type> from this collection.
+
+        @param xShape
+            the <type>Shape</type> will be removed from the
+            collection and disposed.
      */
     void remove( [in] com::sun::star::drawing::XShape xShape );
 
@@ -103,27 +110,5 @@ interface XShapes: com::sun::star::container::XIndexAccess
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2001/03/16 16:41:21  jsc
-    remove interfaceheader with uik and remove [const] in method definitions
-
-    Revision 1.4  2000/12/21 08:35:06  mi
-    @see interface/service/... ident -> @see ident - for new docu generator
-
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:15  hjs
-    initial import
-
-    Revision 1.3  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
index e85f669d0911..c296f730cb8f 100644
--- a/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
+++ b/offapi/com/sun/star/drawing/XUniversalShapeDescriptor.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XUniversalShapeDescriptor.idl,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jsc $ $Date: 2001-03-16 16:41:21 $
+ *  last change: $Author: mi $ $Date: 2002-10-02 15:12:35 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,27 +89,5 @@ interface XUniversalShapeDescriptor: com::sun::star::drawing::XShapeDescriptor
 
 }; }; }; };
 
-/*=============================================================================
-
-    $Log: not supported by cvs2svn $
-    Revision 1.3  2000/11/08 12:42:42  mi
-    moved from api
-
-    Revision 1.1.1.1  2000/09/18 23:35:16  hjs
-    initial import
-
-    Revision 1.5  2000/09/11 11:52:24  mi
-    documentation merged from XML
-
-    Revision 1.3  2000/03/27 10:55:44  cl
-    #70728# fixed doku
-
-    Revision 1.2  2000/02/07 11:24:30  mi
-    zu #70728# missing documentation marked
-
-    Revision 1.1.1.1  1999/11/11 09:48:42  jsc
-    new
-
-
-=============================================================================*/
 #endif
+
diff --git a/offapi/com/sun/star/drawing/makefile.mk b/offapi/com/sun/star/drawing/makefile.mk
index 49bd0093df36..29c51716916d 100644
--- a/offapi/com/sun/star/drawing/makefile.mk
+++ b/offapi/com/sun/star/drawing/makefile.mk
@@ -2,9 +2,9 @@
 #
 #   $RCSfile: makefile.mk,v $
 #
-#   $Revision: 1.12 $
+#   $Revision: 1.13 $
 #
-#   last change: $Author: cl $ $Date: 2001-06-12 14:11:09 $
+#   last change: $Author: mi $ $Date: 2002-10-02 15:12:36 $
 #
 #   The Contents of this file are made available subject to the terms of
 #   either of the following licenses
@@ -73,55 +73,61 @@ PACKAGE=com$/sun$/star$/drawing
 # ------------------------------------------------------------------------
 
 IDLFILES=\
-    GraphicExportFilter.idl\
-    ConnectorProperties.idl\
-    MeasureProperties.idl\
-    FillProperties.idl\
-    LineProperties.idl\
-    ShadowProperties.idl\
-    TextProperties.idl\
-    Defaults.idl\
-    BitmapMode.idl\
-    CameraGeometry.idl\
-    BoundVolume.idl\
     Alignment.idl\
+    AppletShape.idl\
     Arrangement.idl\
     BezierPoint.idl\
+    BitmapMode.idl\
+    BitmapTable.idl\
+    BoundVolume.idl\
+    CameraGeometry.idl\
+    CaptionEscapeDirection.idl\
+    CaptionShape.idl\
+    CaptionType.idl\
     CircleKind.idl\
     ClosedBezierShape.idl\
     color.idl\
     ColorMode.idl\
     ConnectionType.idl\
+    ConnectorProperties.idl\
     ConnectorShape.idl\
     ConnectorType.idl\
     ControlShape.idl\
     CoordinateSequence.idl\
     CoordinateSequenceSequence.idl\
     DashStyle.idl\
-    MeasureShape.idl\
+    DashTable.idl\
+    Defaults.idl\
     Direction3D.idl\
     DoubleSequence.idl\
     DoubleSequenceSequence.idl\
     DrawingDocument.idl\
     DrawingDocumentDrawView.idl\
+    DrawingDocumentFactory.idl\
     DrawPage.idl\
     DrawPages.idl\
     DrawViewMode.idl\
     EllipseShape.idl\
+    EscapeDirection.idl\
+    FillProperties.idl\
     FillStyle.idl\
     FlagSequence.idl\
     FlagSequenceSequence.idl\
     GenericDrawPage.idl\
     GluePoint.idl\
+    GluePoint2.idl\
+    GradientTable.idl\
+    GraphicExportFilter.idl\
     GraphicObjectShape.idl\
     GroupShape.idl\
     Hatch.idl\
     HatchStyle.idl\
+    HatchTable.idl\
     HomogenMatrix.idl\
-    HomogenMatrixLine.idl\
     HomogenMatrix3.idl\
-    HomogenMatrixLine3.idl\
     HomogenMatrix4.idl\
+    HomogenMatrixLine.idl\
+    HomogenMatrixLine3.idl\
     HomogenMatrixLine4.idl\
     HorizontalDimensioning.idl\
     Layer.idl\
@@ -129,12 +135,16 @@ IDLFILES=\
     LayerType.idl\
     LineDash.idl\
     LineEndType.idl\
+    LineJoint.idl\
+    LineProperties.idl\
     LineShape.idl\
     LineStyle.idl\
-    LineJoint.idl\
+    MarkerTable.idl\
     MasterPage.idl\
     MasterPages.idl\
     MeasureKind.idl\
+    MeasureProperties.idl\
+    MeasureShape.idl\
     MeasureTextHorzPos.idl\
     MeasureTextVertPos.idl\
     MirrorAxis.idl\
@@ -142,6 +152,7 @@ IDLFILES=\
     OLE2Shape.idl\
     OpenBezierShape.idl\
     PageShape.idl\
+    PluginShape.idl\
     PointSequence.idl\
     PointSequenceSequence.idl\
     PolygonFlags.idl\
@@ -159,7 +170,9 @@ IDLFILES=\
     RectangleShape.idl\
     RotationDescriptor.idl\
     ShadeMode.idl\
+    ShadowProperties.idl\
     Shape.idl\
+    ShapeCollection.idl\
     Shapes.idl\
     SnapObjectType.idl\
     Text.idl\
@@ -167,11 +180,15 @@ IDLFILES=\
     TextAnimationDirection.idl\
     TextAnimationKind.idl\
     TextFitToSizeType.idl\
+    TextHorizontalAdjust.idl\
+    TextProperties.idl\
     TextShape.idl\
     TextureKind.idl\
     TextureKind2.idl\
     TextureMode.idl\
     TextureProjectionMode.idl\
+    TextVerticalAdjust.idl\
+    TransparencyGradientTable.idl\
     VerticalDimensioning.idl\
     XConnectableShape.idl\
     XConnectorShape.idl\
@@ -184,6 +201,7 @@ IDLFILES=\
     XDrawPageSummarizer.idl\
     XDrawPageSupplier.idl\
     XDrawView.idl\
+    XGluePointsSupplier.idl\
     XLayer.idl\
     XLayerManager.idl\
     XLayerSupplier.idl\
@@ -199,15 +217,10 @@ IDLFILES=\
     XShapeGrouper.idl\
     XShapeMirror.idl\
     XShapes.idl\
-    XUniversalShapeDescriptor.idl\
-    ColorMode.idl\
-    GluePoint2.idl\
-    XGluePointsSupplier.idl\
-    EscapeDirection.idl\
-    TextVerticalAdjust.idl\
-    TextHorizontalAdjust.idl
+    XUniversalShapeDescriptor.idl
 
 # ------------------------------------------------------------------
 
 .INCLUDE :  target.mk
 .INCLUDE :  $(PRJ)$/util$/target.pmk
+
author	Michael Hönnig <mi@openoffice.org>	2002-10-02 14:12:36 +0000
committer	Michael Hönnig <mi@openoffice.org>	2002-10-02 14:12:36 +0000
commit	d081c80877dc1ae413b9d65c206485b6821d0ef8 (patch)
tree	574a746be7d1fb7283d5c879529f8c0612f6f6f2 /offapi
parent	0b051a06b6fdda4e6536ef0802c14164288914e6 (diff)