INTEGRATION: CWS tbe21 (1.11.122); FILE MERGED

2005/02/28 16:24:55 tbe 1.11.122.1: #i42907# missing control properties in xml im-/export for dialogs

1 files changed, 70 insertions, 27 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlButtonModel.idl b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
index f14ab63f9..a915390bb 100644
--- a/offapi/com/sun/star/awt/UnoControlButtonModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlButtonModel.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlButtonModel.idl,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: obo $ $Date: 2004-09-09 15:43:54 $
+ *  last change: $Author: kz $ $Date: 2005-03-18 14:13:51 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -60,19 +60,23 @@
  ************************************************************************/
 #ifndef __com_sun_star_awt_UnoControlButtonModel_idl__ 
 #define __com_sun_star_awt_UnoControlButtonModel_idl__ 
- 
+
+#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
+#include <com/sun/star/awt/FontDescriptor.idl> 
+#endif 
+
 #ifndef __com_sun_star_awt_UnoControlModel_idl__ 
 #include <com/sun/star/awt/UnoControlModel.idl> 
 #endif 
- 
+
+#ifndef __com_sun_star_style_VerticalAlignment_idl__
+#include <com/sun/star/style/VerticalAlignment.idl>
+#endif
+
 #ifndef __com_sun_star_util_Color_idl__
 #include <com/sun/star/util/Color.idl>
 #endif
 
-#ifndef __com_sun_star_awt_FontDescriptor_idl__ 
-#include <com/sun/star/awt/FontDescriptor.idl> 
-#endif 
- 
  
 //============================================================================= 
  
@@ -88,7 +92,7 @@ published service UnoControlButtonModel
     
     //------------------------------------------------------------------------- 
      
-    /** specifies the alignment of the text in the control. 
+    /** specifies the horizontal alignment of the text in the control. 
                 
         <pre>
         0: left
@@ -118,6 +122,19 @@ published service UnoControlButtonModel
     
     //------------------------------------------------------------------------- 
 
+    /** specifies whether the button control should grab the focus when clicked.
+
+        <p>If set to <TRUE/> (which is the default), the button control automatically grabs the
+        focus when the user clicks onto it with the mouse.<br/>
+        If set to <FALSE/>, the focus is preserved when the user operates the button control with
+        the mouse.</p>
+
+        @since OOo 2.0.0
+     */
+    [optional, property] boolean FocusOnClick;
+
+    //-------------------------------------------------------------------------
+
     /** specifies the font attributes of the text in the control.
      */
     [property] com::sun::star::awt::FontDescriptor FontDescriptor;
@@ -163,7 +180,7 @@ published service UnoControlButtonModel
 
         <p>If this property is present, it supersedes the <member>ImageAlign</member> property - setting
         one of both properties sets the other one to the best possible match.</p>
-    */
+     */
     [optional, property] short ImagePosition;
     
     //-------------------------------------------------------------------------
@@ -179,7 +196,15 @@ published service UnoControlButtonModel
     [property] string Label;
     
     //-------------------------------------------------------------------------
-    
+
+    /** specifies that the text may be displayed on more than one line.
+
+        @since OOo 2.0.0
+     */
+    [optional, property] boolean MultiLine; 
+ 
+    //------------------------------------------------------------------------- 
+
     /** specifies that the control will be printed with the document.
      */
     [property] boolean Printable;
@@ -192,6 +217,33 @@ published service UnoControlButtonModel
     
     //------------------------------------------------------------------------- 
 
+    /** specifies whether the control should show repeating behaviour.
+
+        <p>Normally, when you click a button with the mouse, you need to
+        release the mouse button, and press it again. With this property
+        set to <TRUE/>, the button is repeatedly pressed while you hold
+        down the mouse button.</p>
+
+        @since OOo 2.0.0
+     */
+    [optional, property] boolean Repeat;
+
+    //------------------------------------------------------------------------- 
+
+    /** specifies the mouse repeat delay, in milliseconds.
+
+        <p>When the user presses a mouse in a control area where this triggers
+        an action (such as pressing the button), then usual control implementations
+        allow to repeatedly trigger this action, without the need to release the
+        mouse button and to press it again. The delay between two such triggers
+        is specified with this property.</p>
+
+        @since OOo 2.0.0
+     */
+    [optional, property] long RepeatDelay;
+
+    //------------------------------------------------------------------------- 
+
     /** specifies the state of the control.
      */
     [property] short State;
@@ -214,14 +266,7 @@ published service UnoControlButtonModel
      */
     [property] com::sun::star::util::Color TextLineColor;
 
-    /** specifies whether the control should show repeating behaviour
-
-        <p>Normally, when you click a button with the mouse, you need to
-        release the mouse button, and press it again. With this property
-        set to <TRUE/>, the button is repeatedly pressed while you hold
-        down the mouse button.</p>
-    */
-    [optional, property] boolean Repeat;
+    //-------------------------------------------------------------------------
     
     /** specifies whether the button should toggle on a single operation.
 
@@ -233,19 +278,17 @@ published service UnoControlButtonModel
         push button.</p>
 
         @since OOo 2.0.0
-    */
+     */
     [optional, property] boolean Toggle;
 
-    /** specifies whether the button control should grab the focus when clicked.
+    //-------------------------------------------------------------------------
 
-        <p>If set to <TRUE/> (which is the default), the button control automatically grabs the
-        focus when the user clicks onto it with the mouse.<br/>
-        If set to <FALSE/>, the focus is preserved when the user operates the button control with
-        the mouse.</p>
+    /** specifies the vertical alignment of the text in the control.
 
         @since OOo 2.0.0
-    */
-    [optional, property] boolean FocusOnClick;
+     */
+    [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
+
 }; 
  
 //=============================================================================