INTEGRATION: CWS fwkfinal3 (1.2.22); FILE MERGED

2005/03/18 16:24:58 cd 1.2.22.1: #i45427# Fixed documentation problems with autodoc

3 files changed, 140 insertions, 8 deletions

diff --git a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
index debfd28dc..455a1c1bd 100644
--- a/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
+++ b/offapi/com/sun/star/ui/XUIConfigurationStorage.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XUIConfigurationStorage.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2005-03-01 18:31:02 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:25:34 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -66,8 +66,18 @@
 #include <com/sun/star/embed/XStorage.idl>
 #endif
 
+//============================================================================= 
+
 module com { module sun { module star { module ui { 
 
+//============================================================================= 
+
+/** supplies functions to change or get information about the storage
+    of a user interface configuration manager.
+
+    @since OOo 2.0.0
+*/
+
 interface XUIConfigurationStorage : ::com::sun::star::uno::XInterface
 {
     /** connects a storage to the user interface configuration manager 
diff --git a/offapi/com/sun/star/ui/XUIElement.idl b/offapi/com/sun/star/ui/XUIElement.idl
index a8828deb9..7c18db5cb 100644
--- a/offapi/com/sun/star/ui/XUIElement.idl
+++ b/offapi/com/sun/star/ui/XUIElement.idl
@@ -1,3 +1,64 @@
+/*************************************************************************
+ *
+ *  $RCSfile: XUIElement.idl,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:26:48 $
+ *
+ *  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_ui_XUIElement_idl__
 #define __com_sun_star_ui_XUIElement_idl__
 
diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 817e334d8..cdbcf8371 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -1,3 +1,64 @@
+/*************************************************************************
+ *
+ *  $RCSfile: XUIElementFactory.idl,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:28:50 $
+ *
+ *  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_ui_XUIElementFactory_idl__
 #define __com_sun_star_ui_XUIElementFactory_idl__
 
@@ -19,6 +80,10 @@
 
 //============================================================================= 
 
+module com { module sun { module star { module ui {
+
+//============================================================================= 
+
 /** specifies a user interface element factory that can create and initialize 
     user interface elements. 
     
@@ -31,7 +96,7 @@
         <li><b>menubar</b>A configurable user interface element.</li>
         <li><b>popupmenu</b>A configurable user interface element.</li>
         <li><b>toolbar</b>A configurable user interface element.</li>
-        <li><b>statusbar</b>A configurable user interfave element.</li>
+        <li><b>statusbar</b>A configurable user interface element.</li>
         <li><b>floater</b>A basic user interface element.</li>
     </ul>
     </p>
@@ -39,10 +104,6 @@
     @since OOo 2.0.0
 */
 
-//============================================================================= 
-
-module com { module sun { module star { module ui {
-
 interface XUIElementFactory : ::com::sun::star::uno::XInterface
 {
     /** creates a new instances of a specific user interface element.
@@ -77,7 +138,7 @@ interface XUIElementFactory : ::com::sun::star::uno::XInterface
         
         <p>
         An implementation is responsible to initialize every newly created user 
-        interface element if the necessary properties where provided. Especially 
+        interface element if the necessary properties are provided. Especially 
         it must connect a configurable user interface element to the correct user 
         interface configuration manager. Without this connection the configurable 
         user interface element cannot retrieve its structure data and changes to