INTEGRATION: CWS fwkfinal3 (1.2.22); FILE MERGED

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

2 files changed, 71 insertions, 10 deletions

diff --git a/offapi/com/sun/star/ui/UICommandDescription.idl b/offapi/com/sun/star/ui/UICommandDescription.idl
index 69ee60468b4c..3877b254b768 100644
--- a/offapi/com/sun/star/ui/UICommandDescription.idl
+++ b/offapi/com/sun/star/ui/UICommandDescription.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UICommandDescription.idl,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: kz $ $Date: 2005-03-01 18:26:42 $
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:19:50 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -68,6 +68,10 @@
 
 //=============================================================================
 
+module com { module sun { module star { module ui {
+
+//=============================================================================
+
 /** a service which provides information about user interface commands of modules.
 
     <p>
@@ -79,10 +83,6 @@
     @since OOo 2.0.0
 */
 
-//=============================================================================
-
-module com { module sun { module star { module ui {
-
 service UICommandDescription
 {
     /** provides access to user interface commands of the installed modules.
diff --git a/offapi/com/sun/star/ui/UIElement.idl b/offapi/com/sun/star/ui/UIElement.idl
index e7c95c7b5824..c5c0b0d30143 100644
--- a/offapi/com/sun/star/ui/UIElement.idl
+++ b/offapi/com/sun/star/ui/UIElement.idl
@@ -1,3 +1,64 @@
+/*************************************************************************
+ *
+ *  $RCSfile: UIElement.idl,v $
+ *
+ *  $Revision: 1.3 $
+ *
+ *  last change: $Author: rt $ $Date: 2005-03-30 08:20:03 $
+ *
+ *  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_UIElement_idl__
 #define __com_sun_star_ui_UIElement_idl__
 
@@ -31,6 +92,10 @@
 
 //=============================================================================
 
+module com { module sun { module star { module ui {
+
+//=============================================================================
+
 /** specifies a user interface element.
 
     <p>
@@ -43,10 +108,6 @@
     @since OOo 2.0.0
 */
 
-module com { module sun { module star { module ui {
-
-//=============================================================================
-
 service UIElement
 {
     /** provides a function to retrieve a special purpose interface which depends on