CWS-TOOLING: integrate CWS gridcontrol_03ooo/DEV300_m79

22 files changed, 366 insertions, 106 deletions

diff --git a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
index f290de563..cad071b3e 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridColumnModel.idl
@@ -38,6 +38,7 @@
 //============================================================================= 
  
 /** If you do not want to implement the <type>XGridColumnModel</type> yourself, use this service.
+    @since OOo 3.3.0
  */ 
 service DefaultGridColumnModel
 { 
diff --git a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
index 692768cc5..c4f866e58 100644
--- a/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/DefaultGridDataModel.idl
@@ -38,6 +38,8 @@
 //============================================================================= 
  
 /** If you do not want to implement the <type>XGridDataModel</type> yourself, use this service.
+
+    @since OOo 3.3.0
  */ 
 service DefaultGridDataModel
 { 
diff --git a/offapi/com/sun/star/awt/grid/GridColumn.idl b/offapi/com/sun/star/awt/grid/GridColumn.idl
index eff82edaa..d5dd5f2cc 100644
--- a/offapi/com/sun/star/awt/grid/GridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumn.idl
@@ -38,6 +38,8 @@
 //============================================================================= 
  
 /** Represents a column as used by the <type>DefaultGridColumnModel</type>
+
+    @since OOo 3.3.0
  */ 
 service GridColumn
 { 
diff --git a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
index 154fbe82c..3ee38f50e 100644
--- a/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridColumnEvent.idl
@@ -30,25 +30,15 @@
 #ifndef __com_sun_star_lang_EventObject_idl__ 
 #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.
+/** An event used by a <type>XGridColumn</type> to notify changes in the column.
 
-    @see XGridColumnModel
-    @see XGridControl
-    @see XGridColumnListener
+    @since OOo 3.3.0
  */ 
 struct GridColumnEvent: com::sun::star::lang::EventObject
 { 
@@ -60,12 +50,9 @@ struct GridColumnEvent: com::sun::star::lang::EventObject
 
     /** Contains the new value **/
     any newValue;
-    
+
     /** Contains the index of the changed column**/
     long index;
-
-    /** Contains the changed column**/
-    XGridColumn column;
     //------------------------------------------------------------------------- 
 }; 
  
diff --git a/offapi/com/sun/star/awt/grid/GridDataEvent.idl b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
index 770034ded..b406c33f4 100644
--- a/offapi/com/sun/star/awt/grid/GridDataEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridDataEvent.idl
@@ -27,10 +27,7 @@
 #ifndef __com_sun_star_awt_grid_GridDataEvent_idl__ 
 #define __com_sun_star_awt_grid_GridDataEvent_idl__ 
  
-#ifndef __com_sun_star_lang_EventObject_idl__ 
 #include <com/sun/star/lang/EventObject.idl> 
-#endif 
- 
  
 //============================================================================= 
  
@@ -46,6 +43,8 @@ module com {  module sun {  module star {  module awt {  module grid {
     @see XGridDataModel
     @see XGridControl
     @see XGridDataListener
+
+    @sonce OOo 3.3.0
  */ 
 struct GridDataEvent: com::sun::star::lang::EventObject
 { 
@@ -67,7 +66,7 @@ struct GridDataEvent: com::sun::star::lang::EventObject
     string headerName; 
 
     /** Contains the changed row**/
-    sequence<string> rowData;
+    sequence<any> rowData;
 
  
 }; 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
new file mode 100644
index 000000000..e2d44d346
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridInvalidDataException.idl
@@ -0,0 +1,58 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: GridInvalidDataException.idl,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
+#define __com_sun_star_awt_grid_GridInvalidDataException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif
+
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {
+ 
+//============================================================================= 
+ 
+/** Exception is thrown to indicate that set data is invalid, e.g. type of data is unknown 
+    or data count doesn't match with column count. 
+    
+    @since OOo 3.3.0
+ */
+exception GridInvalidDataException : com::sun::star::uno::RuntimeException
+{
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
new file mode 100644
index 000000000..71e79d5fa
--- /dev/null
+++ b/offapi/com/sun/star/awt/grid/GridInvalidModelException.idl
@@ -0,0 +1,57 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ * 
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: GridInvalidModelException.idl,v $
+ * $Revision: 1.0 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
+#define __com_sun_star_awt_grid_GridInvalidModelException_idl__ 
+ 
+#ifndef __com_sun_star_uno_RuntimeException_idl__ 
+#include <com/sun/star/uno/RuntimeException.idl> 
+#endif
+
+ 
+//============================================================================= 
+ 
+module com {  module sun {  module star {  module awt { module grid {
+ 
+//============================================================================= 
+ 
+/** Exception is thrown when data or column model isn't set.
+
+    @since OOo 3.3.0
+ */
+exception GridInvalidModelException : com::sun::star::uno::RuntimeException
+{
+    
+}; 
+ 
+//============================================================================= 
+ 
+}; }; }; }; };
+ 
+#endif 
diff --git a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
index 78731ffe4..6802e3c86 100644
--- a/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
+++ b/offapi/com/sun/star/awt/grid/GridSelectionEvent.idl
@@ -50,14 +50,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 58f36fa9a..0f922e82f 100644
--- a/offapi/com/sun/star/awt/grid/SelectionEventType.idl
+++ b/offapi/com/sun/star/awt/grid/SelectionEventType.idl
@@ -49,7 +49,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/UnoControlGrid.idl b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
index 76aba982c..87a26ba96 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGrid.idl
@@ -66,6 +66,7 @@
 
     The <type>XGridSelection</type> interface provides a bunch of methods to set and get selection for the grid control.
     </p>
+    @since OOo 3.3.0
  */
 service UnoControlGrid
 { 
diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index 3f6578242..ce2c8d5eb 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -35,8 +35,14 @@
 
 #include <com/sun/star/awt/UnoControlModel.idl> 
 
-#include <com/sun/star/view/SelectionType.idl> 
- 
+#include <com/sun/star/view/SelectionType.idl>
+
+#include <com/sun/star/awt/FontDescriptor.idl>
+
+#include <com/sun/star/style/VerticalAlignment.idl>
+
+#include <com/sun/star/util/Color.idl>
+
 //============================================================================= 
  
 module com {  module sun {  module star {  module awt { module grid { 
@@ -44,6 +50,8 @@ module com {  module sun {  module star {  module awt { module grid {
 //============================================================================= 
  
 /** specifies the standard model of a <type>UnoControlGridModel</type>.
+
+    @since OOo 3.3.0
  */
 service UnoControlGridModel
 { 
@@ -84,11 +92,68 @@ service UnoControlGridModel
     */
     [property] boolean VScroll;
 
+    /** Specifies that the control can be reached with the TAB key.
+     */
+    [property] boolean Tabstop; 
+
     /** Specifies the selection mode that is enabled for this grid control.
         <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 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 RowBackgroundColor;
+
+    /** Specifies the background color of even rows. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color EvenRowBackgroundColor;
+
+    /** Specifies the background color of header. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color HeaderBackgroundColor;
+
+    /** Specifies the text color. Default value is black.
+    */
+    [property] ::com::sun::star::util::Color TextColor;
+
+    /** Specifies the line color. Default value is white.
+    */
+    [property] ::com::sun::star::util::Color LineColor;
+    
+    /** specifies the vertical alignment of the content in the control.
+
+        <pre>
+            TOP
+            MIDDLE
+            BOTTOM
+        </pre>
+     */	
+    [property] com::sun::star::style::VerticalAlignment VerticalAlign;
+    
+    /** specifies the font attributes of the text in the control.
+     */
+    [property] com::sun::star::awt::FontDescriptor FontDescriptor;
+
+    /** specifies the <type scope="com::sun::star::text">FontEmphasis</type>
+        value of the text in the control.
+     */
+    [property] short FontEmphasisMark;
+
+    /** specifies the <type scope="com::sun::star::text">FontRelief</type>
+        value of the text in the control.
+     */
+    [property] short FontRelief;
+
+    /** specifies the help text of the control.
+     */
+    [property] string HelpText;
+
+    /** specifies the help URL of the control.
+     */
+    [property] string HelpURL;
+
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/grid/XGridCell.idl b/offapi/com/sun/star/awt/grid/XGridCell.idl
index 8dffd3ddf..7b6ea52b6 100644
--- a/offapi/com/sun/star/awt/grid/XGridCell.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCell.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt {  module grid {
  
 //============================================================================= 
 
-interface XGridCell: com::sun::star::uno::XInterface
+interface XGridCell
 { 
 
     [attribute] string Value;
diff --git a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
index fe443aff0..996874e55 100644
--- a/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
+++ b/offapi/com/sun/star/awt/grid/XGridCellRenderer.idl
@@ -37,10 +37,9 @@ module com {  module sun {  module star {  module awt { module grid {
  
 //============================================================================= 
 
-/** gives access to the items of a list box and makes it possible to
-    register item and action event listeners.
+/** renderer for cells
  */     
-interface XGridCellRenderer: com::sun::star::uno::XInterface
+interface XGridCellRenderer
 { 
     //------------------------------------------------------------------------- 
 
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index 790a451ac..0ca7fad70 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -30,6 +30,9 @@
 #ifndef __com_sun_star_uno_XInterface_idl__ 
 #include <com/sun/star/uno/XInterface.idl> 
 #endif 
+#include <com/sun/star/style/HorizontalAlignment.idl>
+#include <com/sun/star/awt/grid/XGridColumnListener.idl> 
+
  
 //============================================================================= 
  
@@ -38,28 +41,67 @@ 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: com::sun::star::uno::XInterface
+interface XGridColumn
 { 
     /** Specifies the an idendifier of the colomn.**/
     [attribute] any Identifier;
 
     /** Specifies the default column witdth. **/
     [attribute] long ColumnWidth;
-    /*
+    
+    /** Specifies the preferred column witdth. **/
     [attribute] long PreferredWidth;
 
+    /** Specifies the min column witdth. **/
     [attribute] long MinWidth;
 
+    /** Specifies the max column witdth. **/
     [attribute] long MaxWidth;
+    
+    /** Specifies whether column has fixed size or not. **/
+    [attribute] boolean Resizeable;
+    
+    /** Specifies the horizontal alignment of the content in the control.
 
-    [attribute] boolean Resizable;
-    */
-
+        <pre>
+            LEFT
+            CENTER
+            RIGHT
+        </pre>
+     */
+    [attribute] ::com::sun::star::style::HorizontalAlignment HorizontalAlign;
+    
     /** 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 19801a33b..c77943a3f 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnListener.idl
@@ -46,18 +46,20 @@ module com {  module sun {  module star {  module awt { module grid {
     
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridColumnModel</type> yourself</p>.
+    
+    @since OOo 3.3.0
  */     
-interface XGridColumnListener: com::sun::star::uno::XInterface
+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 05ac16175..b26dc2ef2 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -30,7 +30,8 @@
 #include <com/sun/star/uno/XInterface.idl> 
 
 #include <com/sun/star/awt/grid/XGridColumn.idl> 
-#include <com/sun/star/awt/grid/XGridColumnListener.idl> 
+
+#include <com/sun/star/awt/grid/XGridColumnListener.idl>
  
 //============================================================================= 
  
@@ -42,13 +43,19 @@ module com {  module sun {  module star {  module awt { module grid {
     retrieve the column structure that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridColumnModel</type>.
+    
+    @since OOo 3.3.0
 */     
-interface XGridColumnModel: com::sun::star::uno::XInterface
+interface XGridColumnModel
 { 
-    /** Specifies whether column selection is allowed
+    ///** Specifies whether column selection is allowed
+    //*/
+    //[attribute] boolean ColumnSelectionAllowed;
+
+    /**Specifies the height of column header.
     */
-    [attribute] boolean ColumnSelectionAllowed;
-    
+    [attribute] long ColumnHeaderHeight;
+
     /** Returns the number of columns.
         @returns
                 the number of columns.
@@ -81,29 +88,28 @@ interface XGridColumnModel: com::sun::star::uno::XInterface
     
     /** Returns a specific column.
         @param index
-                the position of the reuquested column.
+                the position of the requested column.
         @returns
                  the requested column.
     */
     XGridColumn getColumn( [in] long index);
+
+    /** Sets default columns to the column model.
+        @param elements
+            the number of default columns that should be set.
+    */
+    void setDefaultColumns([in] long elements);
+
+    /**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	
+    */
+    XGridColumn copyColumn( [in] XGridColumn column );
     
     /*
     long getTotalColumnWidth();
     */
-
-    /** 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); 
 }; 
  
 //============================================================================= 
diff --git a/offapi/com/sun/star/awt/grid/XGridControl.idl b/offapi/com/sun/star/awt/grid/XGridControl.idl
index e4e00e137..0ea37504a 100644
--- a/offapi/com/sun/star/awt/grid/XGridControl.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControl.idl
@@ -41,30 +41,25 @@ module com {  module sun {  module star {  module awt { module grid {
 /** An interface to a control that displays a tabular data.
 
     @see UnoControlGrid
+    
+    @since OOo 3.3.0
  */      
 interface XGridControl: XGridSelection 
 { 
-    /** Specifies the <type>XGridColumnModel</type> of the control.
-    */
-    [attribute]	XGridColumnModel ColumnModel;
-
-    /** Specifies the <type>XGridDataModel</type> of the control.
-    */
-    [attribute] XGridDataModel DataModel;
-
-
     /** Converting 
     */
 
     long getItemIndexAtPoint( [in] long x, [in] long y);
 
-    /** registers a listener for mouse events.
-     */    
-    //[oneway] void addMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
- 
-    /** unregisters a listener for mouse events.
-     */    
-    //[oneway] void removeMouseListener( [in] com::sun::star::awt::XMouseListener listener ); 
+    /** Sets tooltip for row
+        @param textForTooltip
+            text, which will be shown as tooltip. 
+            If only cell content should be displayed, leave sequence empty.
+        @param columnsForTooltip
+            column numbers, which define the cell content that should be shown in the tooltip.
+            If only text should be shown, leave this sequence empty.
+    */
+    void setToolTip( [in] sequence< string > textForTooltip, [in] sequence< long > columnsForTooltip);
  
 }; 
  
diff --git a/offapi/com/sun/star/awt/grid/XGridControlListener.idl b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
index db3099409..4e7876cbe 100644
--- a/offapi/com/sun/star/awt/grid/XGridControlListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridControlListener.idl
@@ -37,7 +37,7 @@ module com {  module sun {  module star {  module awt { module grid {
  
 //============================================================================= 
 
-interface XGridControlListener: com::sun::star::uno::XInterface
+interface XGridControlListener
 { 
  
 }; 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataListener.idl b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
index 7420837c0..534c3d788 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataListener.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataListener.idl
@@ -46,6 +46,8 @@ module com {  module sun {  module star {  module awt { module grid {
     
     <p>Usually you must not implement this interface yourself, but you must notify it correctly if
     you implement the <type>XGridDataModel</type> yourself</p>.
+    
+    @since OOo 3.3.0
  */       
 interface XGridDataListener: com::sun::star::lang::XEventListener
 { 
diff --git a/offapi/com/sun/star/awt/grid/XGridDataModel.idl b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
index 04d9f9a24..7489e4960 100644
--- a/offapi/com/sun/star/awt/grid/XGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridDataModel.idl
@@ -1,5 +1,6 @@
 /*************************************************************************
  *
+ * $Revision: 1.8 $
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  * 
  * Copyright 2000, 2010 Oracle and/or its affiliates.
@@ -41,6 +42,8 @@ module com {  module sun {  module star {  module awt { module grid {
     retrieve the content data that is displayed in the actual control.
 
     If you do not need your own model implementation, you can also use the <type>DefaultGridDataModel</type>.
+    
+    @since OOo 3.3.0
 */   
 interface XGridDataModel: ::com::sun::star::lang::XComponent 
 { 
@@ -54,7 +57,11 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
 
     /** Returns the content of each row.
     */
-    [attribute,readonly] sequence< sequence< string > > Data;
+    [attribute,readonly] sequence< sequence< any > > Data;
+
+    /**Specifies the width of row header.
+    */
+    [attribute] long RowHeaderWidth;
 
     /** Returns the number of rows in in the model.
         @returns
@@ -69,7 +76,7 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
         @param data
                 the content of the row.
     */
-    void addRow( [in] string headername, [in] sequence< string > data );
+    void addRow( [in] string headername, [in] sequence< any > data );
 
     /** Removes a row from the model.
 
@@ -82,6 +89,26 @@ interface XGridDataModel: ::com::sun::star::lang::XComponent
     */
     void removeAll();
 
+    /**Updates the content of a given cell.
+        @param row
+            the row index
+        @param column
+            the column index
+        @param value
+            the new value of the cell.
+    */
+    void updateCell([in] long row, [in] long column, [in] any value );
+        
+    /**Updates the content of a given row.
+        @param row
+            the row index
+        @param columns
+            column indexes of the cells, which should be updated
+        @param value
+            the new values of the cells.
+    */
+    void updateRow([in] long row, [in] sequence< long > columns, [in] sequence< any > values);
+
     //------------------------------------------------------------------------- 
 
     /** Adds a listener for the <type>GridDataEvent</type> posted after the grid changes.
diff --git a/offapi/com/sun/star/awt/grid/XGridSelection.idl b/offapi/com/sun/star/awt/grid/XGridSelection.idl
index 9e4e80810..a94c06ba7 100644
--- a/offapi/com/sun/star/awt/grid/XGridSelection.idl
+++ b/offapi/com/sun/star/awt/grid/XGridSelection.idl
@@ -39,7 +39,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
 /** This interfaces provides access to the selection of row for <type>UnoControlGrid</type>. 
  */     
-interface XGridSelection: com::sun::star::uno::XInterface
+interface XGridSelection
 { 
     /** Returns the lowest index of the selection. 
         @returns
@@ -53,21 +53,25 @@ interface XGridSelection: com::sun::star::uno::XInterface
     */
     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
@@ -90,17 +94,17 @@ interface XGridSelection: com::sun::star::uno::XInterface
     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); 
@@ -108,7 +112,7 @@ interface XGridSelection: com::sun::star::uno::XInterface
     //------------------------------------------------------------------------- 
 
     /** Removes a listener previously added with <method>addSelectionListener()</method>.
-        @param Listener
+        @param listener
             the listener to remove.
     */   
     [oneway] void removeSelectionListener( [in] XGridSelectionListener listener); 
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
index 3cfe6d83b..02c159f8f 100644
--- a/offapi/com/sun/star/awt/grid/makefile.mk
+++ b/offapi/com/sun/star/awt/grid/makefile.mk
@@ -57,7 +57,9 @@ IDLFILES=\
     ScrollBarMode.idl\
     XGridControl.idl\
     UnoControlGrid.idl\
-    UnoControlGridModel.idl
+    UnoControlGridModel.idl\
+    GridInvalidDataException.idl\
+    GridInvalidModelException.idl
 # ------------------------------------------------------------------
 
 .INCLUDE :  target.mk