INTEGRATION: CWS frmcontrols04 (1.5.398); FILE MERGED

2004/06/16 06:07:00 fs 1.5.398.2: RESYNC: (1.5-1.7); FILE MERGED
2004/05/04 15:22:21 fs 1.5.398.1: new optional properties for #i24683# #i25684# #i24685# #i24686# #i24688# #i24694# #i28672#

1 files changed, 31 insertions, 2 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 5bf70840c..f2ac1d52b 100644
--- a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: UnoControlComboBoxModel.idl,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: obo $ $Date: 2004-06-03 17:19:20 $
+ *  last change: $Author: obo $ $Date: 2004-07-05 16:00:13 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -88,6 +88,18 @@ published service UnoControlComboBoxModel
  
     //------------------------------------------------------------------------- 
      
+    /** specifies the alignment of the text in the control. 
+                
+        <pre>
+        0: left
+        1: center
+        2: right
+        </pre>
+     */
+    [optional, property] short Align; 
+ 
+    //------------------------------------------------------------------------- 
+     
     /** specifies whether automatic completion of text is enabled.
      */
     [property] boolean Autocomplete; 
@@ -111,6 +123,17 @@ published service UnoControlComboBoxModel
     [property] short Border; 
  
     //------------------------------------------------------------------------- 
+
+    /** specifies the color of the border, if present
+
+        <p>Not every border style (see <member>Border</member>) may support coloring.
+        For instance, usually a border with 3D effect will ignore the BorderColor setting.</p>
+
+        @since #i24694#
+     */
+    [optional, property] long BorderColor;
+ 
+    //------------------------------------------------------------------------- 
      
     /** specifies if the control has a drop down button.
      */
@@ -210,6 +233,12 @@ published service UnoControlComboBoxModel
      */
     [property] com::sun::star::util::Color TextLineColor;
     
+    //-------------------------------------------------------------------------
+    
+    /** specifies whether the selection in the control should be hidden when the control is not
+        active (focused).
+    */
+    [optional, property] boolean HideInactiveSelection;
 }; 
  
 //=============================================================================