INTEGRATION: CWS dba205b (1.11.170); FILE MERGED

2006/08/09 07:33:30 fs 1.11.170.2: added @since tag for Graphic
2006/08/08 11:32:18 fs 1.11.170.1: #i65585# optional property 'Graphic', allowing to display *any* graphics, not just an image from a file

2 files changed, 46 insertions, 9 deletions

diff --git a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
index 84f0d669cf1d..6fdcb7062374 100644
--- a/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlCheckBoxModel.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: UnoControlCheckBoxModel.idl,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 21:19:17 $
+ *  last change: $Author: ihi $ $Date: 2006-10-18 13:19:53 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,19 +38,18 @@
 #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_graphic_XGraphic_idl
+#include <com/sun/star/graphic/XGraphic.idl>
+#endif
 
 //=============================================================================
 
@@ -133,11 +132,29 @@ published service UnoControlCheckBoxModel
     //-------------------------------------------------------------------------
 
     /** specifies an URL to an image to display besides the label of the control
+        @see Graphic
      */
     [optional, property] string ImageURL;
 
     //-------------------------------------------------------------------------
 
+    /** specifies a graphic to be displayed besides the label of the control
+
+        <p>If this property is present, it interacts with the <member>ImageURL</member>in the
+        following way:
+        <ul><li>If <member>ImageURL</member> is set, <member>Graphic</member> will be reset
+            to an object as loaded from the given image URL, or <NULL/> if <member>ImageURL</member>
+            does not point to a valid image file.</li>
+            <li>If <member>Graphic</member> is set, <member>ImageURL</member> will be reset
+            to an empty string.</li>
+        </ul></p>
+
+        @since OOo 2.1
+     */
+    [optional, property, transient] com::sun::star::graphic::XGraphic Graphic;
+
+    //-------------------------------------------------------------------------
+
     /** specifies the label of the control.
      */
     [property] string Label;
diff --git a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
index 794c230f9b11..99af55be87a4 100644
--- a/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlImageControlModel.idl
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: UnoControlImageControlModel.idl,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: rt $ $Date: 2005-09-07 21:27:00 $
+ *  last change: $Author: ihi $ $Date: 2006-10-18 13:20:09 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -38,10 +38,12 @@
 #ifndef __com_sun_star_awt_UnoControlModel_idl__
 #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_graphic_XGraphic_idl
+#include <com/sun/star/graphic/XGraphic.idl>
+#endif
 
 
 //=============================================================================
@@ -106,11 +108,29 @@ published service UnoControlImageControlModel
     //-------------------------------------------------------------------------
 
     /** specifies an URL to an image to use for the control.
+        @see Graphic
      */
     [property] string ImageURL;
 
     //-------------------------------------------------------------------------
 
+    /** specifies a graphic to be displayed on the control
+
+        <p>If this property is present, it interacts with the <member>ImageURL</member>in the
+        following way:
+        <ul><li>If <member>ImageURL</member> is set, <member>Graphic</member> will be reset
+            to an object as loaded from the given image URL, or <NULL/> if <member>ImageURL</member>
+            does not point to a valid image file.</li>
+            <li>If <member>Graphic</member> is set, <member>ImageURL</member> will be reset
+            to an empty string.</li>
+        </ul></p>
+
+        @since OOo 2.1
+     */
+    [optional, property, transient] com::sun::star::graphic::XGraphic Graphic;
+
+    //-------------------------------------------------------------------------
+
     /** specifies that the control will be printed with the document.
      */
     [property] boolean Printable;