gridsort: alllow removing columns from a grid control column model

2 files changed, 27 insertions, 3 deletions

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index eecb530aae55..acd02f37db1c 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -117,6 +117,12 @@ namespace toolkit
     }
 
     //------------------------------------------------------------------------------------------------------------------
+    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  ) throw (RuntimeException)
+    {
+        return new GridColumn();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
     ::sal_Int32 SAL_CALL DefaultGridColumnModel::addColumn( const Reference< XGridColumn > & i_column ) throw (RuntimeException, IllegalArgumentException)
     {
         ::osl::ClearableMutexGuard aGuard( m_aMutex );
@@ -133,6 +139,7 @@ namespace toolkit
         aEvent.Source = *this;
         aEvent.Accessor <<= index;
         aEvent.Element <<= i_column;
+
         aGuard.clear();
         m_aContainerListeners.notifyEach( &XContainerListener::elementInserted, aEvent );
 
@@ -140,9 +147,25 @@ namespace toolkit
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::createColumn(  ) throw (RuntimeException)
+    void SAL_CALL DefaultGridColumnModel::removeColumn( ::sal_Int32 i_columnIndex )  throw (RuntimeException, IndexOutOfBoundsException)
     {
-        return new GridColumn();
+        ::osl::ClearableMutexGuard aGuard( m_aMutex );
+
+        if ( ( i_columnIndex < 0 ) || ( size_t( i_columnIndex ) >= m_aColumns.size() ) )
+            throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+
+        Columns::iterator pos = m_aColumns.begin() + i_columnIndex;
+        Reference< XGridColumn > const xColumn( *pos );
+        m_aColumns.erase( pos );
+
+        // fire removal notifications
+        ContainerEvent aEvent;
+        aEvent.Source = *this;
+        aEvent.Accessor <<= i_columnIndex;
+        aEvent.Element <<= xColumn;
+
+        aGuard.clear();
+        m_aContainerListeners.notifyEach( &XContainerListener::elementRemoved, aEvent );
     }
 
     //------------------------------------------------------------------------------------------------------------------
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 99751f37c25c..31b3c45afd67 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -59,8 +59,9 @@ public:
 
     // XGridColumnModel
     virtual ::sal_Int32 SAL_CALL getColumnCount() throw (::com::sun::star::uno::RuntimeException);
-    virtual ::sal_Int32 SAL_CALL addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL createColumn(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL addColumn(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > & column) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException);
+    virtual void SAL_CALL removeColumn( ::sal_Int32 i_columnIndex )  throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IndexOutOfBoundsException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > > SAL_CALL getColumns() throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumn > SAL_CALL getColumn(::sal_Int32 index) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setDefaultColumns(sal_Int32 rowElements) throw (::com::sun::star::uno::RuntimeException);