gridfixes: #i117398# allow to specify selection colors in table/grid

Conflicts:

toolkit/inc/toolkit/helper/property.hxx
toolkit/source/controls/grid/defaultgriddatamodel.cxx

Change-Id: Ie863aa7cecb4c7bda230ab829e6090689518dab8

7 files changed, 44 insertions, 19 deletions

diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 4999f8b09531..ab883e86467a 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
  */
-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 9a153ff0dfa9..9b8b17009efd 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -44,7 +44,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
  */
-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;
@@ -131,14 +131,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
     */
@@ -147,17 +147,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
@@ -166,19 +196,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;
 
@@ -189,14 +213,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 3161ded69a71..a89cfa4fc1a2 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -41,7 +41,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
  */
-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 8824ad146fe3..442a7283f99d 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -40,7 +40,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
  */
-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 11e11d8a68d4..745703cd8b42 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -47,7 +47,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
     @since OOo 3.3
 */
-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 b1e20053f25e..5cf2a743d91f 100644
--- a/offapi/com/sun/star/awt/grid/XGridControl.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -30,6 +30,7 @@
 
 #include <com/sun/star/uno/XInterface.idl>
 
+
 module com {  module sun {  module star {  module awt { module grid {
 
 
diff --git a/offapi/com/sun/star/view/SelectionType.idl b/offapi/com/sun/star/view/SelectionType.idl
index 0d5601d6b94d..15a8f9a56d31 100644
--- a/offapi/com/sun/star/view/SelectionType.idl
+++ b/offapi/com/sun/star/view/SelectionType.idl
@@ -34,7 +34,7 @@ module com {  module sun {  module star {  module view {
 
 /** Specifies a selection type for a view that supports a selection model.
  */
-enum SelectionType
+published enum SelectionType
 {
 
     /** No selection is possible.