INTEGRATION: CWS tbe4 (1.8.66); FILE MERGED

2003/06/23 13:27:48 tbe 1.8.66.1: #56751# IDL review

3 files changed, 23 insertions, 43 deletions

diff --git a/offapi/com/sun/star/awt/XMenu.idl b/offapi/com/sun/star/awt/XMenu.idl
index aa1a03c8c596..4a2e9504943c 100644
--- a/offapi/com/sun/star/awt/XMenu.idl
+++ b/offapi/com/sun/star/awt/XMenu.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMenu.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:49 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:02:32 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 
+
 //=============================================================================
 
  module com {  module sun {  module star {  module awt {
@@ -74,33 +75,29 @@ interface XMenuListener;
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::awt::XMenu
-/** represents a simple menu.
+/** specifies a simple menu.
  */
 interface XMenu: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::addMenuListener
-    /** adds the specified menu listener to receive events
-        from this menu.
+    /** adds the specified menu listener to receive events from this menu.
      */
     [oneway] void addMenuListener( [in] XMenuListener xListener );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::removeMenuListener
-    /** removes the specified menu listener so it no longer
-        receives item events from this menu.
+    /** removes the specified menu listener so that it no longer
+        receives events from this menu.
      */
     [oneway] void removeMenuListener( [in] XMenuListener xListener );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::insertItem
     /** inserts an item into the menu.
-        This appends the item if the position is greater than or equal to
-        <code>getItemCount()</code> or if it is negative.
+
+        <p>The item is appended if the position is greater than or equal to
+        <code>getItemCount()</code> or if it is negative.</p>
      */
     [oneway] void insertItem( [in] short nItemId,
              [in] string aText,
@@ -109,36 +106,31 @@ interface XMenu: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::removeItem
-    /** remove one or more items from the menu.
+    /** removes one or more items from the menu.
      */
     [oneway] void removeItem( [in] short nPos,
              [in] short nCount );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::getItemCount
     /** returns the number of items in the menu.
      */
     short getItemCount();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::getItemId
     /** returns the id of the item at the specified position.
      */
     short getItemId( [in] short nPos );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::getItemPos
     /** returns the position of the item with the specified id.
      */
     short getItemPos( [in] short nId );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::enableItem
     /** enables or disables the menu item.
      */
     [oneway] void enableItem( [in] short nItemId,
@@ -146,14 +138,12 @@ interface XMenu: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::isItemEnabled
     /** returns the state of the menu item.
      */
     boolean isItemEnabled( [in] short nItemId );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::setItemText
     /** sets the text for the menu item.
      */
     [oneway] void setItemText( [in] short nItemId,
@@ -161,23 +151,19 @@ interface XMenu: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::awt::XMenu::getItemText
-    /** @returns
-                    the string for the given item id.
+    /** returns the string for the given item id.
      */
     string getItemText( [in] short nItemId );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::setPopupMenu
-    /** set the popup menu for a specified menu item.
+    /** sets the popup menu for a specified menu item.
      */
     [oneway] void setPopupMenu( [in] short nItemId,
              [in] XPopupMenu aPopupMenu );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenu::getPopupMenu
     /** returns the popup menu from the menu item.
      */
     XPopupMenu getPopupMenu( [in] short nItemId );
diff --git a/offapi/com/sun/star/awt/XMenuBar.idl b/offapi/com/sun/star/awt/XMenuBar.idl
index 83668d22c08f..07e15b668717 100644
--- a/offapi/com/sun/star/awt/XMenuBar.idl
+++ b/offapi/com/sun/star/awt/XMenuBar.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMenuBar.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:49 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:02:42 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,7 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::awt::XMenuBar
-/** identifies a menu as a menu bar.
+/** identifies a menu bar.
  */
 interface XMenuBar: com::sun::star::awt::XMenu
 {
diff --git a/offapi/com/sun/star/awt/XMenuListener.idl b/offapi/com/sun/star/awt/XMenuListener.idl
index c46482b3ae40..84804948efda 100644
--- a/offapi/com/sun/star/awt/XMenuListener.idl
+++ b/offapi/com/sun/star/awt/XMenuListener.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XMenuListener.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:50 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:02:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,36 +76,31 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::awt::XMenuListener
-/** the listener interface for receiving menu events on a window.
+/** makes it possible to receive menu events on a window.
  */
 interface XMenuListener: com::sun::star::lang::XEventListener
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenuListener::highlight
-    /** gets invoked when a menu item is highlighted.
+    /** is invoked when a menu item is highlighted.
      */
     [oneway] void highlight( [in] com::sun::star::awt::MenuEvent rEvent );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenuListener::select
-    /** gets invoked when a menu item is seleted.
+    /** is invoked when a menu item is selected.
      */
     [oneway] void select( [in] com::sun::star::awt::MenuEvent rEvent );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenuListener::activate
-    /** gets invoked when a menu is activated.
+    /** is invoked when a menu is activated.
      */
     [oneway] void activate( [in] com::sun::star::awt::MenuEvent rEvent );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XMenuListener::deactivate
-    /** gets invoked when a menu is deactivated.
+    /** is invoked when a menu is deactivated.
      */
     [oneway] void deactivate( [in] com::sun::star::awt::MenuEvent rEvent );