INTEGRATION: CWS tbe4 (1.8.66); FILE MERGED

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

3 files changed, 17 insertions, 36 deletions

diff --git a/offapi/com/sun/star/awt/XPatternField.idl b/offapi/com/sun/star/awt/XPatternField.idl
index 56829365c129..9e3cfceaac62 100644
--- a/offapi/com/sun/star/awt/XPatternField.idl
+++ b/offapi/com/sun/star/awt/XPatternField.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPatternField.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:51 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:03:59 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,14 +72,12 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::awt::XPatternField
-/** makes it possible to access the value and formatting of this pattern field.
+/** gives access to the value and formatting of a pattern field.
  */
 interface XPatternField: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPatternField::setMasks
     /** sets the pattern mask.
      */
     [oneway] void setMasks( [in] string EditMask,
@@ -87,42 +85,35 @@ interface XPatternField: com::sun::star::uno::XInterface
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::awt::XPatternField::getMasks
-    /** @returns
-                    the currently set pattern mask.
+    /** returns the currently set pattern mask.
      */
     void getMasks( [out] string EditMask,
              [out] string LiteralMask );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPatternField::setString
-    /** sets the string value of this pattern field.
+    /** sets the string value of the pattern field.
      */
     [oneway] void setString( [in] string Str );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::awt::XPatternField::getString
-    /** @returns
-                    the currently set string value of this pattern field.
+    /** returns the currently set string value of the pattern field.
      */
     string getString();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPatternField::setStrictFormat
-    /** determines whether the format is checked even during editing.
+    /** determines if the format is checked during user input.
      */
     [oneway] void setStrictFormat( [in] boolean bStrict );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::awt::XPatternField::isStrictFormat
-    /** @returns
-                    whether the format is currently checked even during editing.
+    /** returns whether the format is currently checked during user input.
      */
     boolean isStrictFormat();
+
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/XPointer.idl b/offapi/com/sun/star/awt/XPointer.idl
index fd1b95790b57..4363134bf4b9 100644
--- a/offapi/com/sun/star/awt/XPointer.idl
+++ b/offapi/com/sun/star/awt/XPointer.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPointer.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:51 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:04:10 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,23 +72,20 @@
 
 //=============================================================================
 
-// DocMerge from xml: interface com::sun::star::awt::XPointer
 /** gives access to the type of mouse pointer.
  */
 interface XPointer: com::sun::star::uno::XInterface
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPointer::setType
     /** selects a <type>SystemPointer</type> for this mouse pointer.
      */
     [oneway] void setType( [in] long nType );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from idl: method com::sun::star::awt::XPointer::getType
-    /** @returns
-                    the currently set <type>SystemPointer</type> of this mouse pointer.
+    /** returns the currently set <type>SystemPointer</type> of this mouse
+        pointer.
      */
     long getType();
 
diff --git a/offapi/com/sun/star/awt/XPopupMenu.idl b/offapi/com/sun/star/awt/XPopupMenu.idl
index 68ddb4b84a81..36a53cf1cf14 100644
--- a/offapi/com/sun/star/awt/XPopupMenu.idl
+++ b/offapi/com/sun/star/awt/XPopupMenu.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: XPopupMenu.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:51 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 09:04:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,50 +77,43 @@ interface XWindowPeer;
 
 //=============================================================================
 
-// DocMerge from idl: interface com::sun::star::awt::XPopupMenu
 /** controls a popup menu.
  */
 interface XPopupMenu: XMenu
 {
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::insertSeparator
     /** inserts a separator at the specified position.
      */
     [oneway] void insertSeparator( [in] short nPos );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::setDefaultItem
     /** sets the menu default item.
      */
     [oneway] void setDefaultItem( [in] short nItemId );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::getDefaultItem
     /** returns the menu default item.
      */
     short getDefaultItem();
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::checkItem
-    /** set the state of the item to be checked or unchecked.
+    /** sets the state of the item to be checked or unchecked.
      */
     [oneway] void checkItem( [in] short nItemId,
              [in] boolean bCheck );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::isItemChecked
-    /** returns whether the item is checked or not checked.
+    /** returns whether the item is checked or unchecked.
      */
     boolean isItemChecked( [in] short nItemId );
 
     //-------------------------------------------------------------------------
 
-    // DocMerge from xml: method com::sun::star::awt::XPopupMenu::execute
     /** executes the popup menu and returns the selected item
         or <code>0</code>, if cancelled.
      */