gridsort: introduce XSortableGridDataModel::removeColumnSort

4 files changed, 11 insertions, 7 deletions

diff --git a/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl b/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
index 2b7aca1ca..b76913bf0 100755
--- a/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/SortableGridDataModel.idl
@@ -39,11 +39,11 @@ interface XMutableGridDataModel;
 
 //==================================================================================================================
 
-/** provides a default implementation of a <type>XSortableGridData</type>.
+/** provides a default implementation of a <type>XSortableGridDataModel</type>.
 
     <p>This service must be created with a secondary grid data model, which all actual data requests are delegated to.
     But before providing this data to the service's own clients, it is sorted, according to the sort order defined
-    via the <code>XSortableGridData</code> interface.</p>
+    via the <code>XSortableGridDataModel</code> interface.</p>
 
     <p>The service implementation is able to compare the default scalar types, plus strings.</p>
 
@@ -58,7 +58,7 @@ interface XMutableGridDataModel;
 
     <p>Note that changing the data might result in the sort order being destroyed. If you want to ensure
     that the data represented by the model is still sorted after your modifications, you should call
-    <member>XSortableGridData::sortByColumn</member>, again.</p>
+    <member>XSortableGridDataModel::sortByColumn</member>, again.</p>
  */
 service SortableGridDataModel : XSortableMutableGridDataModel
 {
diff --git a/offapi/com/sun/star/awt/grid/XSortableGridData.idl b/offapi/com/sun/star/awt/grid/XSortableGridDataModel.idl
index f06436ffe..f1e1cb23b 100755
--- a/offapi/com/sun/star/awt/grid/XSortableGridData.idl
+++ b/offapi/com/sun/star/awt/grid/XSortableGridDataModel.idl
@@ -38,7 +38,7 @@ module com { module sun { module star { module awt { module grid {
 
 /** allows to sort the data represented by a <type>XGridDataModel</type>
  */
-interface XSortableGridData
+interface XSortableGridDataModel
 {
     /** sorts the rows represented by the model by a given column's data.
 
@@ -52,6 +52,10 @@ interface XSortableGridData
     void    sortByColumn( [in] long ColumnIndex, [in] boolean SortAscending )
         raises ( ::com::sun::star::lang::IndexOutOfBoundsException );
 
+    /** removes any possibly present sorting of the grid data
+    */
+    void    removeColumnSort();
+
     /** returns the current sort order.
 
         @return
diff --git a/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl b/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
index 7c9222f33..3a12526be 100755
--- a/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
+++ b/offapi/com/sun/star/awt/grid/XSortableMutableGridDataModel.idl
@@ -28,7 +28,7 @@
 #define __com_sun_star_awt_grid_XSortableMutableGridDataModel_idl__
 
 #include <com/sun/star/awt/grid/XMutableGridDataModel.idl>
-#include <com/sun/star/awt/grid/XSortableGridData.idl>
+#include <com/sun/star/awt/grid/XSortableGridDataModel.idl>
 
 //==================================================================================================================
 
@@ -41,7 +41,7 @@ module com { module sun { module star { module awt { module grid {
 interface XSortableMutableGridDataModel
 {
     interface XMutableGridDataModel;
-    interface XSortableGridData;
+    interface XSortableGridDataModel;
 };
 
 //==================================================================================================================
diff --git a/offapi/com/sun/star/awt/grid/makefile.mk b/offapi/com/sun/star/awt/grid/makefile.mk
index 8499dca27..27daa0c1a 100644
--- a/offapi/com/sun/star/awt/grid/makefile.mk
+++ b/offapi/com/sun/star/awt/grid/makefile.mk
@@ -56,7 +56,7 @@ IDLFILES=\
     UnoControlGridModel.idl\
     GridInvalidDataException.idl\
     GridInvalidModelException.idl\
-    XSortableGridData.idl\
+    XSortableGridDataModel.idl\
     SortableGridDataModel.idl\
     XSortableMutableGridDataModel.idl\