gridfixes: #i117398# allow to specify selection-related colors in table/grid control models (VCL/UNO)

6 files changed, 44 insertions, 18 deletions

diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 4ab6e71caf51..dc082fb14864 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3.0
  */
-struct GridColumnEvent: com::sun::star::lang::EventObject
+published struct GridColumnEvent : ::com::sun::star::lang::EventObject
 {
     /** Contains the name of the attributes whose value changed. **/
     string AttributeName;
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index a348d4b3e23c..a1aa9f787efa 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -45,7 +45,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3.0
  */
-service UnoControlGridModel
+published service UnoControlGridModel
 {
     /** specifies the standard model of an <type scope="com::sun::star::awt">UnoControl</type>. */
     service com::sun::star::awt::UnoControlModel;
@@ -132,14 +132,14 @@ service UnoControlGridModel
 
     /** controls whether or not to paint horizontal and vertical lines between the grid cells.
 
-        @see LineColor
+        @see GridLineColor
     */
     [property] boolean UseGridLines;
 
     /** specifies the color to be used when drawing lines between cells
 
         <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
-        depending on the system's style settings.</p>
+        depending on the control's style settings.</p>
 
         @see UseGridLines
     */
@@ -148,17 +148,47 @@ service UnoControlGridModel
     /** specifies the color to be used when drawing the background of row or column headers
 
         <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
-        depending on the system's style settings.</p>
+        depending on the control's style settings.</p>
     */
     [property, maybevoid] ::com::sun::star::util::Color             HeaderBackgroundColor;
 
     /** specifies the color to be used when drawing the text within row or column headers
 
         <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
-        depending on the system's style settings.</p>
+        depending on the control's style settings.</p>
     */
     [property, maybevoid] ::com::sun::star::util::Color             HeaderTextColor;
 
+    /** specifies the color to be used when drawing the background of selected cells, while the control has the focus.
+
+        <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
+        depending on the control's style settings.</p>
+    */
+    [property, maybevoid] ::com::sun::star::util::Color             ActiveSelectionBackgroundColor;
+
+    /** specifies the color to be used when drawing the background of selected cells, while the control does not have
+        the focus.
+
+        <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
+        depending on the control's style settings.</p>
+    */
+    [property, maybevoid] ::com::sun::star::util::Color             InactiveSelectionBackgroundColor;
+
+    /** specifies the color to be used when drawing the text of selected cells, while the control has the focus.
+
+        <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
+        depending on the control's style settings.</p>
+    */
+    [property, maybevoid] ::com::sun::star::util::Color             ActiveSelectionTextColor;
+
+    /** specifies the color to be used when drawing the text of selected cells, while the control does not have
+        the focus.
+
+        <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
+        depending on the control's style settings.</p>
+    */
+    [property, maybevoid] ::com::sun::star::util::Color             InactiveSelectionTextColor;
+
     /** specifies the colors to be used as background for data rows.
 
         <p>If this sequence is non-empty, the data rows will be rendered with alternating background colors: Assuming
@@ -167,19 +197,13 @@ service UnoControlGridModel
 
         <p>If this sequence is empty, all rows will use the same background color as the control as whole.</p>
 
-        <p>If this property does not exist at a particular implementation, or is <VOID/>, rows will be painted
+        <p>If this property has a value of <VOID/>, rows will be painted
         in alternating background colors, every second row having a background color derived from the control's
         selection color.</p>
     */
     [property, maybevoid] sequence< ::com::sun::star::util::Color > RowBackgroundColors;
 
     /** specifies the vertical alignment of the content in the control.
-
-        <pre>
-            TOP
-            MIDDLE
-            BOTTOM
-        </pre>
      */
     [property] com::sun::star::style::VerticalAlignment VerticalAlign;
 
@@ -190,14 +214,14 @@ service UnoControlGridModel
     /** specifies the color to be used when drawing cell texts
 
         <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
-        depending on the system's style settings.</p>
+        depending on the control's style settings.</p>
     */
     [property, maybevoid] ::com::sun::star::util::Color             TextColor;
 
     /** specifies the color to be used when drawing text lines (underlining and strikethrough)
 
         <p>If this property has a value of <VOID/>, the grid control renderer will use some default color,
-        depending on the system's style settings.</p>
+        depending on the control's style settings.</p>
      */
     [property, maybevoid] com::sun::star::util::Color               TextLineColor;
 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index a73025d7715a..8e61a3432dd2 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -42,7 +42,7 @@ module com {  module sun {  module star {  module awt {  module grid {
 /** The <type>XGridColumn</types> defines the properties and behavior of a column in a grid control
     @since OOo 3.3.0
  */
-interface XGridColumn
+published interface XGridColumn
 {
     /** implements life time control for the component
     */
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index 9a8a02eca8f2..52e1b4733953 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -41,7 +41,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3.0
  */
-interface XGridColumnListener : ::com::sun::star::lang::XEventListener
+published interface XGridColumnListener : ::com::sun::star::lang::XEventListener
 {
     /** Invoked after a column was modified.
     */
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 257f597fc7d2..b2943c6131eb 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -49,7 +49,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3.0
 */
-interface XGridColumnModel
+published interface XGridColumnModel
 {
     /** implements life time control for the component
     */
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
index 4114ca685187..8decdb294931 100644
--- a/offapi/com/sun/star/awt/grid/XGridControl.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -27,6 +27,8 @@
 #ifndef __com_sun_star_awt_grid_XGridControl_idl__
 #define __com_sun_star_awt_grid_XGridControl_idl__
 
+#include <com/sun/star/uno/XInterface.idl>
+
 //=============================================================================
 
 module com {  module sun {  module star {  module awt { module grid {