resolved conflicts rev 265602

8 files changed, 88 insertions, 67 deletions

diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index ee63d9873a61..dbc4743c4b49 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -34,24 +34,12 @@
 #include <com/sun/star/lang/EventObject.idl>
 #endif
 
-#ifndef __com_sun_star_awt_grid_XGridColumn_idl__
-#include <com/sun/star/awt/grid/XGridColumn.idl>
-#endif
-
 //=============================================================================
 
 module com {  module sun {  module star {  module awt { module grid {
 
 //=============================================================================
-
-/** An event used by a <type>XGridColumnModel</type> to notify changes in the column
-    model to the <type>XGridControl</type>.
-    You usually need to fill this event only if you implement the <type>XGridColumnModel</type>
-    yourself.
-
-    @see XGridColumnModel
-    @see XGridControl
-    @see XGridColumnListener
+/** An event used by a <type>XGridColumn</type> to notify changes in the column.
 
     @since OOo 3.3.0
  */
@@ -68,9 +56,6 @@ struct GridColumnEvent: com::sun::star::lang::EventObject
 
     /** Contains the index of the changed column**/
     long index;
-
-    /** Contains the changed column**/
-    XGridColumn column;
     //-------------------------------------------------------------------------
 };
 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index a2ec28361ca0..7d657b832c41 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -53,14 +53,17 @@ struct GridSelectionEvent: com::sun::star::lang::EventObject
 {
     //-------------------------------------------------------------------------
 
-    /** Contains the x coordinate of the selected cell**/
-    long x;
+    /** the selected row*/
+    long Row;
 
-    /** Contains the y coordinate of the selected cell**/
-    long y;
+    /** the selected column*/
+    long Column;
+
+    /**number of selected rows, if multiple rows selected*/
+    long Range;
 
     /** Contains the action <type>SelectionEventType</types> that was performed **/
-    SelectionEventType action;
+    SelectionEventType Action;
 
 };
 
diff --git a/offapi/com/sun/star/awt/grid/SelectionEventType.idl b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
index 4d8aa7fc0cdb..b31076e139fa 100644
--- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -52,7 +52,13 @@ enum SelectionEventType
 
     /** This value indicates that a selection was removed from the grid control
      */
-    REMOVE
+    REMOVE,
+
+    //-------------------------------------------------------------------------
+
+    /** This value indicates that a selection was changed
+     */
+    CHANGE
 
 };
 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index 12017dcea5be..5900ba8a9870 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -103,10 +103,11 @@ service UnoControlGridModel
         <p>The default value is <member scope="com::sun::star::view">SelectionType::SINGLE</member></p>
     */
     [property] ::com::sun::star::view::SelectionType SelectionModel;
-    /** Specifies the background color of odd rows. If color for even rows isn't set, then specifies
-        the color of all rows. Default value is white.
+
+    /** Specifies the background color of rows. If color for even rows is set, then specifies
+        the color of odd rows. Default value is white.
     */
-    [property] ::com::sun::star::util::Color BackgroundColor;
+    [property] ::com::sun::star::util::Color RowBackgroundColor;
 
     /** Specifies the background color of even rows. Default value is white.
     */
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 898b429598ff..96cd6209cbb1 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -34,6 +34,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 #endif
 #include <com/sun/star/style/HorizontalAlignment.idl>
+#include <com/sun/star/awt/grid/XGridColumnListener.idl>
 
 
 //=============================================================================
@@ -77,6 +78,33 @@ interface XGridColumn
 
     /** A title is displayed in the colum header row if <method>UnoControlGridModel::ShowRowHeader</method> is set to <true/>**/
     [attribute] string Title;
+
+    /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
+        @param Listener
+            the listener to add.
+    */
+    [oneway] void addColumnListener( [in] XGridColumnListener  listener);
+
+    //-------------------------------------------------------------------------
+
+    /** Removes a listener previously added with <method>addColumnListener()</method>.
+        @param Listener
+            the listener to remove.
+    */
+    [oneway] void removeColumnListener( [in] XGridColumnListener listener);
+
+    /**Updates changed column widths, when column widths are being resized.
+        @param name
+            can be PrefWidth or ColWidth, depending on which was changed
+        @param width
+            the new column width
+    */
+    void updateColumn( [in] string name, [in] long width);
+    /**Sets column index
+        @param index
+            index, which is the index of the column in the column array of the column model
+    */
+    void setIndex( [in] long index );
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
index 2cad804a0b8e..58d3f52a66c8 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -54,15 +54,15 @@ module com {  module sun {  module star {  module awt { module grid {
  */
 interface XGridColumnListener
 {
-    /**
-        Invoked after a column was added to the column model.
-    */
-    void columnAdded( [in] GridColumnEvent event );
-
-    /**
-        Invoked after a column was removed from the column model.
-    */
-    void columnRemoved( [in] GridColumnEvent event );
+ //   /**
+    //  Invoked after a column was added to the column model.
+    //*/
+    //void columnAdded( [in] GridColumnEvent event );
+    //
+ //   /**
+    //  Invoked after a column was removed from the column model.
+    //*/
+    //void columnRemoved( [in] GridColumnEvent event );
 
     /**
         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 fa63661185b5..11979efef9e3 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -33,6 +33,7 @@
 #include <com/sun/star/uno/XInterface.idl>
 
 #include <com/sun/star/awt/grid/XGridColumn.idl>
+
 #include <com/sun/star/awt/grid/XGridColumnListener.idl>
 
 //=============================================================================
@@ -50,9 +51,9 @@ module com {  module sun {  module star {  module awt { module grid {
 */
 interface XGridColumnModel
 {
-    /** Specifies whether column selection is allowed
-    */
-    [attribute] boolean ColumnSelectionAllowed;
+    ///** Specifies whether column selection is allowed
+    //*/
+    //[attribute] boolean ColumnSelectionAllowed;
 
     /**Specifies the height of column header.
     */
@@ -102,23 +103,16 @@ interface XGridColumnModel
     */
     void setDefaultColumns([in] long elements);
 
-    /*
-    long getTotalColumnWidth();
-    */
-
-    /** Adds a listener for the <type>GridColumnEvent</type> posted after the grid changes.
-        @param Listener
-            the listener to add.
+    /**Creates new XGridColumn with the settings of other column. To be used if the columns which are added to
+        the column model have the same settings.
+        @param column
+            the column, which is already created
     */
-    [oneway] void addColumnListener( [in] XGridColumnListener  listener);
-
-    //-------------------------------------------------------------------------
+    XGridColumn copyColumn( [in] XGridColumn column );
 
-    /** Removes a listener previously added with <method>addColumnListener()</method>.
-        @param Listener
-            the listener to remove.
+    /*
+    long getTotalColumnWidth();
     */
-    [oneway] void removeColumnListener( [in] XGridColumnListener listener);
 };
 
 //=============================================================================
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index 972fce979e8a..3c7aa994362b 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -56,21 +56,25 @@ interface XGridSelection
     */
     long getMaxSelectionIndex();
 
-    /** Adds a selection intervall.
-        @param start
-                the start row index.
-        @param length
-                the number of rows to be selected.
+    /** Selects all rows.
     */
-    [oneway] void insertIndexIntervall( [in] long start, [in] long length);
+    [oneway] void selectAllRows();
 
-    /** Removes a selection intervall.
-        @param start
-                the start row index.
-        @param length
-                the number of rows to be selected.
+    /** Selects multiple rows. Previous selections will be removed.
+        @param rangeOfRows
+                array of rows indexes, which will be selected.
     */
-    [oneway] void removeIndexIntervall( [in] long start, [in] long length);
+    [oneway] void selectRows( [in] sequence< long > rangeOfRows);
+
+    /** Deselects all selected rows.
+    */
+    [oneway] void deselectAllRows();
+
+    /** Deselects selected rows. Selected rows, which aren't in the range remain selected.
+        @param rangeOfRows
+                array of rows indexes, which will be deselected.
+    */
+    [oneway] void deselectRows( [in] sequence< long > rangeOfRows);
 
     /** Returns the indicies of all selected rows.
         @returns
@@ -93,17 +97,17 @@ interface XGridSelection
     boolean isSelectedIndex( [in] long index);
 
     /** Marks a row as selected.
-        @param
+        @param index
             the index of a row.
     */
-    [oneway] void selectRow( [in] long y);
+    [oneway] void selectRow( [in] long index);
 
     /*
     [oneway] void selectColumn( [in] long x);
     */
 
     /** Adds a listener for the <type>GridSelectionEvent</type> posted after the grid changes.
-        @param Listener
+        @param listener
             the listener to add.
     */
     [oneway] void addSelectionListener( [in] XGridSelectionListener  listener);
@@ -111,7 +115,7 @@ interface XGridSelection
     //-------------------------------------------------------------------------
 
     /** Removes a listener previously added with <method>addSelectionListener()</method>.
-        @param Listener
+        @param listener
             the listener to remove.
     */
     [oneway] void removeSelectionListener( [in] XGridSelectionListener listener);