INTEGRATION: CWS sdk10 (1.5.322); FILE MERGED

2004/02/10 15:39:28 mi 1.5.322.1: #i18677# color/long -> Color

1 files changed, 9 insertions, 5 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl b/offapi/com/sun/star/awt/UnoControlComboBoxModel.idl
index 9d6ef3894fab..e9595060ab0d 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.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: mi $ $Date: 2002-10-03 13:00:39 $
+ *  last change: $Author: kz $ $Date: 2004-05-19 10:32:44 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,6 +65,10 @@
 #include <com/sun/star/awt/UnoControlModel.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
@@ -92,7 +96,7 @@ service UnoControlComboBoxModel
 
     /** specifies the background color (RGB) of the control.
      */
-    [property] long BackgroundColor;
+    [property] com::sun::star::util::Color BackgroundColor;
 
     //-------------------------------------------------------------------------
 
@@ -198,13 +202,13 @@ service UnoControlComboBoxModel
 
     /** specifies the text color (RGB) of the control.
      */
-    [property] long TextColor;
+    [property] com::sun::star::util::Color TextColor;
 
     //-------------------------------------------------------------------------
 
     /** specifies the text line color (RGB) of the control.
      */
-    [property] long TextLineColor;
+    [property] com::sun::star::util::Color TextLineColor;
 
 };