gridsort: introduced container listeners at the grid model, reworked and fixed listener relationship between grid model/control/peer

3 files changed, 19 insertions, 22 deletions

diff --git a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
index b9cf8745d96e..631b224470b0 100644
--- a/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
+++ b/offapi/com/sun/star/awt/grid/UnoControlGridModel.idl
@@ -28,19 +28,12 @@
 #define __com_sun_star_awt_grid_UnoControlGridModel_idl__
 
 #include <com/sun/star/awt/grid/XGridColumnModel.idl>
-
 #include <com/sun/star/awt/grid/XGridDataModel.idl>
-
 #include <com/sun/star/awt/grid/ScrollBarMode.idl>
-
 #include <com/sun/star/awt/UnoControlModel.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>
 
 //=============================================================================
@@ -49,7 +42,7 @@ module com {  module sun {  module star {  module awt { module grid {
 
 //=============================================================================
 
-/** specifies the standard model of a <type>UnoControlGridModel</type>.
+/** specifies the standard model of a <type>UnoControlGrid</type> control.
 
     @since OOo 3.3.0
  */
diff --git a/offapi/com/sun/star/awt/grid/XGridColumn.idl b/offapi/com/sun/star/awt/grid/XGridColumn.idl
index d217ff5d4ac6..59cfaa727167 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumn.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumn.idl
@@ -27,9 +27,7 @@
 #ifndef __com_sun_star_awt_grid_XGridColumn_idl__
 #define __com_sun_star_awt_grid_XGridColumn_idl__
 
-#ifndef __com_sun_star_uno_XInterface_idl__
-#include <com/sun/star/uno/XInterface.idl>
-#endif
+#include <com/sun/star/lang/XComponent.idl>
 #include <com/sun/star/style/HorizontalAlignment.idl>
 #include <com/sun/star/awt/grid/XGridColumnListener.idl>
 
@@ -43,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.0
  */
-interface XGridColumn
+interface XGridColumn : com::sun::star::lang::XComponent
 {
     /** Specifies the an idendifier of the colomn.**/
     [attribute] any Identifier;
diff --git a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
index 86e77680cd95..a9023db0a5fe 100644
--- a/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
+++ b/offapi/com/sun/star/awt/grid/XGridColumnModel.idl
@@ -28,10 +28,10 @@
 #define __com_sun_star_awt_grid_XGridColumnModel_idl__
 
 #include <com/sun/star/uno/XInterface.idl>
+#include <com/sun/star/lang/XComponent.idl>
 
 #include <com/sun/star/awt/grid/XGridColumn.idl>
-
-#include <com/sun/star/awt/grid/XGridColumnListener.idl>
+#include <com/sun/star/container/XContainer.idl>
 
 //=============================================================================
 
@@ -48,9 +48,13 @@ module com {  module sun {  module star {  module awt { module grid {
 */
 interface XGridColumnModel
 {
-    ///** Specifies whether column selection is allowed
-    //*/
-    //[attribute] boolean ColumnSelectionAllowed;
+    /** implements life time control for the component
+    */
+    interface ::com::sun::star::lang::XComponent;
+
+    /** allows to register listeners to be notified when columns are inserted or removed
+    */
+    interface ::com::sun::star::container::XContainer;
 
     /**Specifies the height of column header.
     */
@@ -94,7 +98,13 @@ interface XGridColumnModel
     */
     XGridColumn getColumn( [in] long index);
 
-    /** Sets default columns to the column model.
+    /** Fills the model with the given number of default columns
+
+        <p>Existing columns will be removed before adding new columns. Listeners at the column model will
+        be notified one <member scope="com::sun::star::container">XContainerListener::elementRemoved</member> event
+        for each removed column, and one <member scope="com::sun::star::container">XContainerListener::elementInserted</member>
+        event for each insertion.</p>
+
         @param elements
             the number of default columns that should be set.
     */
@@ -106,10 +116,6 @@ interface XGridColumnModel
             the column, which is already created
     */
     XGridColumn copyColumn( [in] XGridColumn column );
-
-    /*
-    long getTotalColumnWidth();
-    */
 };
 
 //=============================================================================