INTEGRATION: CWS tbe4 (1.8.66); FILE MERGED

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

2 files changed, 121 insertions, 107 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
index 4567ef301..2dbc1747c 100644
--- a/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlNumericFieldModel.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlNumericFieldModel.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:44 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 08:57:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,27 +76,22 @@
  
 //============================================================================= 
  
-// DocMerge from xml: service com::sun::star::awt::UnoControlNumericFieldModel
-/** specifies the standard model of an <type scope="com::sun::star::awt">UnoControlNumericField</type>.
+/** specifies the standard model of an <type>UnoControlNumericField</type>.
  */
 service UnoControlNumericFieldModel
 { 
-    // DocMerge: empty anyway
     service com::sun::star::awt::UnoControlModel; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::BackgroundColor
-    /** specifies the background color (RGB) of the control.
+
+    /** specifies the background color(RGB) of the control.
      */
     [property] long BackgroundColor; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Border
+
     /** specifies the border style of the control. 
-        
-        
+                
         <pre>
         0: No border
         1: 3D border
@@ -106,115 +101,122 @@ service UnoControlNumericFieldModel
     [property] short Border; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::DecimalAccuracy
+
     /** specifies the decimal accuracy.
      */
     [property] short DecimalAccuracy; 
  
-    //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Enabled
-    /** determines whether a control is enabled or disabled.
+    //-------------------------------------------------------------------------
+    
+    /** determines whether the control is enabled or disabled.
      */
-    [property] boolean Enabled; 
- 
+    [property] boolean Enabled;
+    
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::FontDescriptor
     /** specifies the font attributes of the text in the control.
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::ShowThousandsSeparator
-    /** specifies if the thousands separator is displayed.
+    /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
+        value of the text in the control.
      */
-    [property] boolean ShowThousandsSeparator; 
+    [property] short FontEmphasisMark;
+ 
+    //-------------------------------------------------------------------------
+    
+    /** specifies the <type scope="com::sun::star::text">FontRelief</type>
+        value of the text in the control.
+     */
+    [property] short FontRelief;
+ 
+    //-------------------------------------------------------------------------
+     
+    /** specifies the help text of the control.
+     */
+    [property] string HelpText;
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Printable
+    /** specifies the help URL of the control.
+     */
+    [property] string HelpURL;
+    
+    //-------------------------------------------------------------------------
+
     /** specifies that the control will be printed with the document.
      */
     [property] boolean Printable; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::ReadOnly
-    /** specifies that the content of the control cannot be modified by the user.
+    /** specifies that the content of the control cannot be modified by the
+        user.
      */
     [property] boolean ReadOnly; 
  
+    //-------------------------------------------------------------------------
+
+    /** specifies whether the thousands separator is to be displayed.
+     */
+    [property] boolean ShowThousandsSeparator; 
+ 
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Spin
+
     /** specifies that the control has a spin button.
      */
     [property] boolean Spin; 
  
-    //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::StrictFormat
-    /** specifies that the value is checked during the input.
+    //-------------------------------------------------------------------------
+    
+    /** specifies that the value is checked during the user input.
      */
     [property] boolean StrictFormat; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Tabstop
-    /** specifies that the control can be reached with the tabulator key.
+
+    /** specifies that the control can be reached with the TAB key.
      */
     [property] boolean Tabstop; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::TextColor
+    
     /** specifies the text color (RGB) of the control.
      */
     [property] long TextColor; 
  
-    //------------------------------------------------------------------------- 
+    //-------------------------------------------------------------------------
+    
+    /** specifies the text line color (RGB) of the control.
+     */
+    [property] long TextLineColor;
+
+    //-------------------------------------------------------------------------
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::Value
     /** specifies the value displayed in the control.
      */
     [property] double Value; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::ValueMax
     /** specifies the maximum value that can be entered.
      */
     [property] double ValueMax; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::ValueMin
     /** specifies the minimum value that can be entered.
      */
     [property] double ValueMin; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlNumericFieldModel::ValueStep
-    /** specifies the value step when using the spin buttons.
+    /** specifies the value step when using the spin button.
      */
-    [property] double ValueStep; 
- 
-    //------------------------------------------------------------------------- 
-     
-    /** specifies the help text of the control.
-     */
-    [property] string HelpText;
- 
-    //------------------------------------------------------------------------- 
-     
-    /** specifies the help id of the control.
-     */
-    [property] string HelpURL;
- 
+    [property] double ValueStep;
+    
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
index 9eb2e9647..6b075cafc 100644
--- a/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlPatternFieldModel.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlPatternFieldModel.idl,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: hr $ $Date: 2003-03-26 13:52:44 $
+ *  last change: $Author: vg $ $Date: 2003-06-27 08:57:39 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -76,117 +76,129 @@
  
 //============================================================================= 
  
-// DocMerge from xml: service com::sun::star::awt::UnoControlPatternFieldModel
-/** specifies the standard model of an <type scope="com::sun::star::awt">UnoControlPatternField</type>
+/** specifies the standard model of an <type>UnoControlPatternField</type>.
  */
 service UnoControlPatternFieldModel
 { 
-    // DocMerge: empty anyway
     service com::sun::star::awt::UnoControlModel; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::BackgroundColor
+
     /** specifies the background color (RGB) of the control.
      */
     [property] long BackgroundColor; 
  
-    //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::Border
+    //-------------------------------------------------------------------------
+
     /** specifies the border style of the control. 
-        
-        
+                
         <pre>
         0: No border
         1: 3D border
         2: simple border
         </pre>
      */
-    [property] short Border; 
- 
-    //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::EditMask
+    [property] short Border;
+    
+    //-------------------------------------------------------------------------
+    
     /** specifies the edit mask.
      */
     [property] string EditMask; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::Enabled
-    /** determines whether a control is enabled or disabled.
+
+    /** determines whether the control is enabled or disabled.
      */
     [property] boolean Enabled; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::FontDescriptor
+
     /** specifies the font attributes of the text in the control.
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor; 
  
+    //-------------------------------------------------------------------------
+
+    /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
+        value of the text in the control.
+     */
+    [property] short FontEmphasisMark;
+ 
+    //-------------------------------------------------------------------------
+    
+    /** specifies the <type scope="com::sun::star::text">FontRelief</type>
+        value of the text in the control.
+     */
+    [property] short FontRelief;
+ 
+    //-------------------------------------------------------------------------
+
+    /** specifies the help text of the control.
+     */
+    [property] string HelpText;
+ 
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::LiteralMask
+    /** specifies the help URL of the control.
+     */
+    [property] string HelpURL;
+    
+    //-------------------------------------------------------------------------
+    
     /** specifies the literal mask.
      */
     [property] string LiteralMask; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::Printable
+
+    /** specifies the maximum character count.
+     */
+    [property] short MaxTextLen; 
+ 
+    //-------------------------------------------------------------------------
+
     /** specifies that the control will be printed with the document.
      */
     [property] boolean Printable; 
  
     //------------------------------------------------------------------------- 
      
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::ReadOnly
-    /** specifies that the content of the control cannot be modified by the user.
+    /** specifies that the content of the control cannot be modified by the
+        user.
      */
     [property] boolean ReadOnly; 
  
-    //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::StrictFormat
-    /** specifies that the string is checked during the input.
+    //-------------------------------------------------------------------------
+    
+    /** specifies that the text is checked during the user input.        
      */
     [property] boolean StrictFormat; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::Tabstop
-    /** specifies that the control can be reached with the tabulator key.
+
+    /** specifies that the control can be reached with the TAB key.
      */
     [property] boolean Tabstop; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::Text
+
     /** specifies the text displayed in the control.
      */
     [property] string Text; 
  
     //------------------------------------------------------------------------- 
-     
-    // DocMerge from xml: property com::sun::star::awt::UnoControlPatternFieldModel::TextColor
+    
     /** specifies the text color (RGB) of the control.
      */
     [property] long TextColor; 
  
-    //------------------------------------------------------------------------- 
-     
-    /** specifies the help text of the control.
-     */
-    [property] string HelpText;
- 
-    //------------------------------------------------------------------------- 
-     
-    /** specifies the help id of the control.
+    //-------------------------------------------------------------------------
+    
+    /** specifies the text line color (RGB) of the control.
      */
-    [property] string HelpURL;
- 
+    [property] long TextLineColor;
+    
 }; 
  
 //=============================================================================