gridsort: allow cloning grid columns, and the (default) grid data/column model

7 files changed, 354 insertions, 249 deletions

diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
index 16e0c8a0a0bc..c1cafd568326 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.cxx
@@ -59,6 +59,7 @@ namespace toolkit
     using ::com::sun::star::container::ContainerEvent;
     using ::com::sun::star::uno::Exception;
     using ::com::sun::star::lang::IndexOutOfBoundsException;
+    using ::com::sun::star::util::XCloneable;
     /** === end UNO using === **/
 
     //==================================================================================================================
@@ -75,6 +76,35 @@ namespace toolkit
     }
 
     //------------------------------------------------------------------------------------------------------------------
+    DefaultGridColumnModel::DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource )
+        :DefaultGridColumnModel_Base( m_aMutex )
+        ,m_aContext( i_copySource.m_aContext )
+        ,m_aContainerListeners( m_aMutex )
+        ,m_aColumns()
+        ,m_nColumnHeaderHeight( i_copySource.m_nColumnHeaderHeight )
+    {
+        Columns aColumns;
+        aColumns.reserve( i_copySource.m_aColumns.size() );
+        try
+        {
+            for (   Columns::const_iterator col = i_copySource.m_aColumns.begin();
+                    col != i_copySource.m_aColumns.end();
+                    ++col
+                )
+            {
+                const Reference< XCloneable > xCloneable( *col, UNO_QUERY_THROW );
+                aColumns.push_back( Reference< XGridColumn >( xCloneable->createClone(), UNO_QUERY_THROW ) );
+            }
+        }
+        catch( const Exception& )
+        {
+            DBG_UNHANDLED_EXCEPTION();
+        }
+        if ( aColumns.size() == i_copySource.m_aColumns.size() )
+            m_aColumns.swap( aColumns );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
     DefaultGridColumnModel::~DefaultGridColumnModel()
     {
     }
@@ -210,18 +240,9 @@ namespace toolkit
     }
 
     //------------------------------------------------------------------------------------------------------------------
-    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn(const Reference< XGridColumn > & column)  throw (RuntimeException)
+    Reference< XGridColumn > SAL_CALL DefaultGridColumnModel::copyColumn( const Reference< XGridColumn > & i_column )  throw (RuntimeException)
     {
-        Reference< XGridColumn > xColumn( m_aContext.createComponent( "com.sun.star.awt.grid.GridColumn" ), UNO_QUERY_THROW );
-        xColumn->setColumnWidth(column->getColumnWidth());
-        xColumn->setPreferredWidth(column->getPreferredWidth());
-        xColumn->setMaxWidth(column->getMaxWidth());
-        xColumn->setMinWidth(column->getMinWidth());
-        xColumn->setPreferredWidth(column->getPreferredWidth());
-        xColumn->setResizeable(column->getResizeable());
-        xColumn->setTitle(column->getTitle());
-        xColumn->setHorizontalAlign(column->getHorizontalAlign());
-        return xColumn;
+        return Reference< XGridColumn >( i_column->createClone(), UNO_QUERY_THROW );
     }
 
     //------------------------------------------------------------------------------------------------------------------
@@ -293,6 +314,12 @@ namespace toolkit
         }
     }
 
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL DefaultGridColumnModel::createClone(  ) throw (RuntimeException)
+    {
+        return new DefaultGridColumnModel( *this );
+    }
+
 //......................................................................................................................
 }   // namespace toolkit
 //......................................................................................................................
diff --git a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
index 4b4382048566..dbd89df57b7d 100644
--- a/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
+++ b/toolkit/source/controls/grid/defaultgridcolumnmodel.hxx
@@ -28,7 +28,6 @@
 /** === begin UNO includes === **/
 #include <com/sun/star/awt/grid/XGridColumnModel.hpp>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
-//#include <com/sun/star/awt/grid/GridColumnEvent.hpp>
 #include <com/sun/star/lang/XEventListener.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -54,7 +53,8 @@ class DefaultGridColumnModel    :public ::cppu::BaseMutex
                                 ,public DefaultGridColumnModel_Base
 {
 public:
-    DefaultGridColumnModel(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory);
+    DefaultGridColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
+    DefaultGridColumnModel( DefaultGridColumnModel const & i_copySource );
     virtual ~DefaultGridColumnModel();
 
     // XGridColumnModel
@@ -76,6 +76,9 @@ public:
     virtual void SAL_CALL addContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeContainerListener( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XContainerListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
 
+    // XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+
     // OComponentHelper
     virtual void SAL_CALL disposing();
 
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.cxx b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
index 6adf7b994035..eb6f777c3b41 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.cxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.cxx
@@ -45,301 +45,315 @@ using namespace ::com::sun::star::lang;
 #define ROWUPDATED ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowUpdated" ))
 #define ROWHEADERWIDTH ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "RowHeaderWidth" ))
 
+//......................................................................................................................
 namespace toolkit
+//......................................................................................................................
 {
+    /** === begin UNO using === **/
+    using ::com::sun::star::uno::Reference;
+    using ::com::sun::star::uno::RuntimeException;
+    using ::com::sun::star::uno::Sequence;
+    using ::com::sun::star::uno::UNO_QUERY_THROW;
+    using ::com::sun::star::uno::UNO_QUERY;
+    using ::com::sun::star::uno::XInterface;
+    using ::com::sun::star::lang::XComponent;
+    using ::com::sun::star::lang::EventObject;
+    using ::com::sun::star::uno::Exception;
+    using ::com::sun::star::util::XCloneable;
+    /** === end UNO using === **/
+
+    //==================================================================================================================
+    //= DefaultGridDataModel
+    //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::DefaultGridDataModel()
+        :m_nRowHeight(0)
+        ,m_aRowHeaders()
+        ,m_nRowHeaderWidth(10)
+    {
+    }
 
-///////////////////////////////////////////////////////////////////////
-// class DefaultGridDataModel
-///////////////////////////////////////////////////////////////////////
-
-DefaultGridDataModel::DefaultGridDataModel()
-: rowHeight(0),
-  rowHeaders(std::vector< ::rtl::OUString >()),
-  m_nRowHeaderWidth(10)
-{
-}
-
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::DefaultGridDataModel( DefaultGridDataModel const & i_copySource )
+        :m_nRowHeight( i_copySource.m_nRowHeight )
+        ,m_aData( i_copySource.m_aData )
+        ,m_aRowHeaders( i_copySource.m_aRowHeaders )
+        ,m_nRowHeaderWidth( i_copySource.m_nRowHeaderWidth )
+    {
+    }
 
-DefaultGridDataModel::~DefaultGridDataModel()
-{
-}
+    //------------------------------------------------------------------------------------------------------------------
+    DefaultGridDataModel::~DefaultGridDataModel()
+    {
+    }
 
-void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XGridDataListener::static_type() );
-    if( pIter )
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::broadcast( broadcast_type eType, const GridDataEvent& aEvent ) throw (::com::sun::star::uno::RuntimeException)
     {
-        ::cppu::OInterfaceIteratorHelper aListIter(*pIter);
-        while(aListIter.hasMoreElements())
+        ::cppu::OInterfaceContainerHelper* pIter = BrdcstHelper.getContainer( XGridDataListener::static_type() );
+        if( pIter )
         {
-            XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next());
-            switch( eType )
+            ::cppu::OInterfaceIteratorHelper aListIter(*pIter);
+            while(aListIter.hasMoreElements())
             {
-            case row_added:     pListener->rowAdded(aEvent); break;
-            case row_removed:   pListener->rowRemoved(aEvent); break;
-            case data_changed:  pListener->dataChanged(aEvent); break;
+                XGridDataListener* pListener = static_cast<XGridDataListener*>(aListIter.next());
+                switch( eType )
+                {
+                case row_added:     pListener->rowAdded(aEvent); break;
+                case row_removed:   pListener->rowRemoved(aEvent); break;
+                case data_changed:  pListener->dataChanged(aEvent); break;
+                }
             }
         }
     }
-}
 
-//---------------------------------------------------------------------
-
-void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 index, Any oldValue, Any newValue) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, name, oldValue, newValue, index, ::rtl::OUString(), Sequence< Any >());
-    broadcast( data_changed, aEvent);
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::broadcast_changed( ::rtl::OUString name, sal_Int32 index, Any oldValue, Any newValue) throw (::com::sun::star::uno::RuntimeException)
+    {
+        Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
+        GridDataEvent aEvent( xSource, name, oldValue, newValue, index, ::rtl::OUString(), Sequence< Any >());
+        broadcast( data_changed, aEvent);
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,
+                                             ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
+        GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, (const ::com::sun::star::uno::Sequence< Any >&)rowData );
+        broadcast( row_added, aEvent);
+    }
 
-void DefaultGridDataModel::broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,
-                                         ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, (const ::com::sun::star::uno::Sequence< Any >&)rowData );
-    broadcast( row_added, aEvent);
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName,
+                                                ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
+        GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, rowData );
+        broadcast( row_removed, aEvent);
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeight() throw (::com::sun::star::uno::RuntimeException)
+    {
+        return m_nRowHeight;
+    }
 
-void DefaultGridDataModel::broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName,
-                                            ::com::sun::star::uno::Sequence< Any > rowData ) throw (::com::sun::star::uno::RuntimeException)
-{
-    Reference< XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) );
-    GridDataEvent aEvent( xSource, ::rtl::OUString(), Any(), Any(), index, headerName, rowData );
-    broadcast( row_removed, aEvent);
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::setRowHeight(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        sal_Int32 oldValue = m_nRowHeight;
+        m_nRowHeight = value;
 
-//---------------------------------------------------------------------
+        broadcast_changed( ROWHEIGHT, 0, Any(oldValue), Any(value));
+    }
 
-//---------------------------------------------------------------------
-// XDefaultGridDataModel
-//---------------------------------------------------------------------
-::sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeight() throw (::com::sun::star::uno::RuntimeException)
-{
-    return rowHeight;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    ::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException)
+    {
+        return m_aData.size();
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getRowHeaders() throw (::com::sun::star::uno::RuntimeException)
+    {
+        return  comphelper::containerToSequence(m_aRowHeaders);
+    }
 
-void SAL_CALL DefaultGridDataModel::setRowHeight(::sal_Int32 value) throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Int32 oldValue = rowHeight;
-    rowHeight = value;
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::setRowHeaders(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & i_rowHeaders ) throw (::com::sun::star::uno::RuntimeException)
+    {
+        ::com::sun::star::uno::Sequence< ::rtl::OUString > oldValue( comphelper::containerToSequence( m_aRowHeaders ) );
 
-    broadcast_changed( ROWHEIGHT, 0, Any(oldValue), Any(value));
-}
+        const sal_Int32 sequenceSize = i_rowHeaders.getLength();
 
-//---------------------------------------------------------------------
+        sal_Int32 i = 0;
+        for (   std::vector< rtl::OUString >::iterator iterator = m_aRowHeaders.begin();
+                iterator != m_aRowHeaders.end();
+                ++iterator, ++i
+            )
+        {
+            if ( sequenceSize > i )
+                *iterator = i_rowHeaders[i];
+            else
+                *iterator = ::rtl::OUString();
+        }
 
-::sal_Int32 SAL_CALL DefaultGridDataModel::getRowCount() throw (::com::sun::star::uno::RuntimeException)
-{
-    return data.size();
-}
+        broadcast_changed( ROWHEADERS, 0, Any( oldValue ), Any( comphelper::containerToSequence( m_aRowHeaders ) ) );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & rRowdata) throw (::com::sun::star::uno::RuntimeException)
+    {
+        // store header name
+        m_aRowHeaders.push_back(headername);
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getRowHeaders() throw (::com::sun::star::uno::RuntimeException)
-{
-    return  comphelper::containerToSequence(rowHeaders);
-}
+        // store row m_aData
+        std::vector< Any > newRow;
+        for ( int i = 0; i < rRowdata.getLength();i++)
+        {
+            newRow.push_back(rRowdata[i]);
+        }
 
-//---------------------------------------------------------------------
+        m_aData.push_back( newRow );
 
-void SAL_CALL DefaultGridDataModel::setRowHeaders(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & i_rowHeaders ) throw (::com::sun::star::uno::RuntimeException)
-{
-    ::com::sun::star::uno::Sequence< ::rtl::OUString > oldValue( comphelper::containerToSequence( rowHeaders ) );
+        broadcast_add( m_aData.size()-1, headername, comphelper::containerToSequence(newRow));
 
-    const sal_Int32 sequenceSize = i_rowHeaders.getLength();
+    }
 
-    sal_Int32 i = 0;
-    for (   std::vector< rtl::OUString >::iterator iterator = rowHeaders.begin();
-            iterator != rowHeaders.end();
-            ++iterator, ++i
-        )
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
     {
-        if ( sequenceSize > i )
-            *iterator = i_rowHeaders[i];
+        if ( index >= 0 && index <= getRowCount()-1)
+        {
+            ::rtl::OUString headerName( (::rtl::OUString) m_aRowHeaders[index] );
+            m_aRowHeaders.erase(m_aRowHeaders.begin() + index);
+
+            Sequence< Any >& rowData ( (Sequence< Any >&)m_aData[index] );
+            m_aData.erase(m_aData.begin() + index);
+            broadcast_remove( index, headerName, rowData);
+        }
         else
-            *iterator = ::rtl::OUString();
+            return;
     }
 
-    broadcast_changed( ROWHEADERS, 0, Any( oldValue ), Any( comphelper::containerToSequence( rowHeaders ) ) );
-}
-
-//---------------------------------------------------------------------
-
-void SAL_CALL DefaultGridDataModel::addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & rRowdata) throw (::com::sun::star::uno::RuntimeException)
-{
-    // store header name
-    rowHeaders.push_back(headername);
-
-    // store row data
-    std::vector< Any > newRow;
-    for ( int i = 0; i < rRowdata.getLength();i++)
+    //------------------------------------------------------------------------------------------------------------------
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException)
     {
-        newRow.push_back(rRowdata[i]);
-    }
 
-    data.push_back( newRow );
+        std::vector< std::vector< Any > >::iterator iterator;
+        std::vector< Sequence< Any  > > dummyContainer(0);
 
-    broadcast_add( data.size()-1, headername, comphelper::containerToSequence(newRow));
 
-}
+        for(iterator = m_aData.begin(); iterator != m_aData.end(); iterator++)
+        {
+            Sequence< Any > cols(comphelper::containerToSequence(*iterator));
+            dummyContainer.push_back( cols );
+        }
+        Sequence< Sequence< Any  > > dataSequence(comphelper::containerToSequence(dummyContainer));
 
-//---------------------------------------------------------------------
+        return dataSequence;
+    }
 
-void SAL_CALL DefaultGridDataModel::removeRow(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
-{
-    if ( index >= 0 && index <= getRowCount()-1)
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
     {
-        ::rtl::OUString headerName( (::rtl::OUString) rowHeaders[index] );
-        rowHeaders.erase(rowHeaders.begin() + index);
-
-        Sequence< Any >& rowData ( (Sequence< Any >&)data[index] );
-        data.erase(data.begin() + index);
-        broadcast_remove( index, headerName, rowData);
+        BrdcstHelper.addListener( XGridDataListener::static_type(), xListener );
     }
-    else
-        return;
-}
-//---------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL DefaultGridDataModel::getData() throw (::com::sun::star::uno::RuntimeException)
-{
-
-    std::vector< std::vector< Any > >::iterator iterator;
-    std::vector< Sequence< Any  > > dummyContainer(0);
 
-
-    for(iterator = data.begin(); iterator != data.end(); iterator++)
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
     {
-        Sequence< Any > cols(comphelper::containerToSequence(*iterator));
-        dummyContainer.push_back( cols );
+        BrdcstHelper.removeListener( XGridDataListener::static_type(), xListener );
     }
-    Sequence< Sequence< Any  > > dataSequence(comphelper::containerToSequence(dummyContainer));
-
-    return dataSequence;
-}
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException)
+    {
+        m_aRowHeaders.clear();
+        m_aData.clear();
+        broadcast_remove( -1, ::rtl::OUString(), 0);
+    }
 
-void SAL_CALL DefaultGridDataModel::addGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XGridDataListener::static_type(), xListener );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
+    {
+        sal_Int32 oldValue = m_nRowHeaderWidth;
+        m_nRowHeaderWidth = _value;
+        broadcast_changed( ROWHEADERWIDTH, 0, Any(oldValue), Any(_value) );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeaderWidth() throw (::com::sun::star::uno::RuntimeException)
+    {
+        return m_nRowHeaderWidth;
+    }
 
-void SAL_CALL DefaultGridDataModel::removeGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XGridDataListener::static_type(), xListener );
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::removeAll() throw (RuntimeException)
-{
-    rowHeaders.clear();
-    data.clear();
-    broadcast_remove( -1, ::rtl::OUString(), 0);
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::setRowHeaderWidth(sal_Int32 _value) throw (::com::sun::star::uno::RuntimeException)
-{
-    sal_Int32 oldValue = m_nRowHeaderWidth;
-    m_nRowHeaderWidth = _value;
-    broadcast_changed( ROWHEADERWIDTH, 0, Any(oldValue), Any(_value) );
-}
-//---------------------------------------------------------------------
-sal_Int32 SAL_CALL DefaultGridDataModel::getRowHeaderWidth() throw (::com::sun::star::uno::RuntimeException)
-{
-    return m_nRowHeaderWidth;
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::updateCell(::sal_Int32 row, ::sal_Int32 column, const Any& value) throw (::com::sun::star::uno::RuntimeException)
-{
-    if(row >= 0 && row < (signed)data.size())
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateCell(::sal_Int32 row, ::sal_Int32 column, const Any& value) throw (::com::sun::star::uno::RuntimeException)
     {
-        if(column >= 0 && column < (signed)data[0].size())
+        if(row >= 0 && row < (signed)m_aData.size())
         {
-            data[row][column] = value;
-            Sequence< Any >dataSeq(comphelper::containerToSequence(data[row]));
-            broadcast_changed( CELLUPDATED, row, Any(column), value );
+            if(column >= 0 && column < (signed)m_aData[0].size())
+            {
+                m_aData[row][column] = value;
+                Sequence< Any >dataSeq(comphelper::containerToSequence(m_aData[row]));
+                broadcast_changed( CELLUPDATED, row, Any(column), value );
+            }
         }
     }
-}
-//---------------------------------------------------------------------
-void SAL_CALL DefaultGridDataModel::updateRow(::sal_Int32 row, const ::com::sun::star::uno::Sequence< ::sal_Int32 > & columns, const ::com::sun::star::uno::Sequence< Any > & values) throw (::com::sun::star::uno::RuntimeException)
-{
-    if(row >= 0 && row < (signed)data.size())
+
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::updateRow(::sal_Int32 row, const ::com::sun::star::uno::Sequence< ::sal_Int32 > & columns, const ::com::sun::star::uno::Sequence< Any > & values) throw (::com::sun::star::uno::RuntimeException)
     {
-        if(columns.getLength() == values.getLength())
+        if(row >= 0 && row < (signed)m_aData.size())
         {
-            for(int i = 0; i < columns.getLength(); i++)
-                data[row][i] = values[i];
-            Sequence< Any >dataSeq(comphelper::containerToSequence(data[row]));
-            broadcast_changed( ROWUPDATED, row, Any(columns), Any(values) );
+            if(columns.getLength() == values.getLength())
+            {
+                for(int i = 0; i < columns.getLength(); i++)
+                    m_aData[row][i] = values[i];
+                Sequence< Any >dataSeq(comphelper::containerToSequence(m_aData[row]));
+                broadcast_changed( ROWUPDATED, row, Any(columns), Any(values) );
+            }
         }
     }
-}
-//---------------------------------------------------------------------
-// XComponent
-//---------------------------------------------------------------------
-
-void SAL_CALL DefaultGridDataModel::dispose() throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-    ::com::sun::star::lang::EventObject aEvent;
-    aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
-    BrdcstHelper.aLC.disposeAndClear( aEvent );
-
-}
-
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::dispose() throw (RuntimeException)
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
 
-void SAL_CALL DefaultGridDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.addListener( XEventListener::static_type(), xListener );
-}
+        ::com::sun::star::lang::EventObject aEvent;
+        aEvent.Source.set( static_cast< ::cppu::OWeakObject* >( this ) );
+        BrdcstHelper.aLC.disposeAndClear( aEvent );
 
-//---------------------------------------------------------------------
+    }
 
-void SAL_CALL DefaultGridDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
-{
-    BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
-}
-//---------------------------------------------------------------------
-// XServiceInfo
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
+    {
+        BrdcstHelper.addListener( XEventListener::static_type(), xListener );
+    }
 
-::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.DefaultGridDataModel" ) );
-    return aImplName;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    void SAL_CALL DefaultGridDataModel::removeEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException)
+    {
+        BrdcstHelper.removeListener( XEventListener::static_type(), xListener );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::rtl::OUString SAL_CALL DefaultGridDataModel::getImplementationName(  ) throw (RuntimeException)
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+        static const OUString aImplName( RTL_CONSTASCII_USTRINGPARAM( "toolkit.DefaultGridDataModel" ) );
+        return aImplName;
+    }
 
-sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel );
-}
+    //------------------------------------------------------------------------------------------------------------------
+    sal_Bool SAL_CALL DefaultGridDataModel::supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException)
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+        return ServiceName.equalsAscii( szServiceName_DefaultGridDataModel );
+    }
 
-//---------------------------------------------------------------------
+    //------------------------------------------------------------------------------------------------------------------
+    ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException)
+    {
+        ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
+        static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridDataModel ) );
+        static const Sequence< OUString > aSeq( &aServiceName, 1 );
+        return aSeq;
+    }
 
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL DefaultGridDataModel::getSupportedServiceNames(  ) throw (RuntimeException)
-{
-    ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() );
-    static const OUString aServiceName( OUString::createFromAscii( szServiceName_DefaultGridDataModel ) );
-    static const Sequence< OUString > aSeq( &aServiceName, 1 );
-    return aSeq;
-}
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL DefaultGridDataModel::createClone(  ) throw (RuntimeException)
+    {
+        return new DefaultGridDataModel( *this );
+    }
 
-}
+//......................................................................................................................
+}   // namespace toolkit
+//......................................................................................................................
 
 Reference< XInterface > SAL_CALL DefaultGridDataModel_CreateInstance( const Reference< XMultiServiceFactory >& )
 {
diff --git a/toolkit/source/controls/grid/defaultgriddatamodel.hxx b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
index b30bd758147c..242c8ba514ab 100644
--- a/toolkit/source/controls/grid/defaultgriddatamodel.hxx
+++ b/toolkit/source/controls/grid/defaultgriddatamodel.hxx
@@ -57,6 +57,7 @@ class DefaultGridDataModel : public ::cppu::WeakImplHelper2< XGridDataModel, XSe
 {
 public:
     DefaultGridDataModel();
+    DefaultGridDataModel( DefaultGridDataModel const & i_copySource );
     virtual ~DefaultGridDataModel();
 
     // XGridDataModel
@@ -66,7 +67,7 @@ public:
     virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getRowHeaders() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL setRowHeaders(const ::com::sun::star::uno::Sequence< ::rtl::OUString > & value) throw (::com::sun::star::uno::RuntimeException);
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< Any > > SAL_CALL getData() throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & data) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addRow(const ::rtl::OUString & headername, const ::com::sun::star::uno::Sequence< Any > & m_aData) throw (::com::sun::star::uno::RuntimeException);
        virtual void SAL_CALL removeRow(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL addGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException);
     virtual void SAL_CALL removeGridDataListener( const Reference< XGridDataListener >& xListener ) throw (RuntimeException);
@@ -75,11 +76,15 @@ public:
     virtual sal_Int32 SAL_CALL getRowHeaderWidth() throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL updateCell( ::sal_Int32 row, ::sal_Int32 column, const ::com::sun::star::uno::Any& value ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL updateRow( ::sal_Int32 row, const ::com::sun::star::uno::Sequence< ::sal_Int32 >& columns, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& values ) throw (::com::sun::star::uno::RuntimeException);
+
     // XComponent
     virtual void SAL_CALL dispose(  ) throw (RuntimeException);
     virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException);
     virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException);
 
+    // XCloneable
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (RuntimeException);
     virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
@@ -92,10 +97,10 @@ private:
     void broadcast_add( sal_Int32 index, const ::rtl::OUString & headerName,  const ::com::sun::star::uno::Sequence< Any  > rowData ) throw (::com::sun::star::uno::RuntimeException);
     void broadcast_remove( sal_Int32 index, const ::rtl::OUString & headerName, const ::com::sun::star::uno::Sequence< Any  > rowData ) throw (::com::sun::star::uno::RuntimeException);
 
-    sal_Int32 rowHeight;
-    std::vector< std::vector < Any > > data;
-    std::vector< ::rtl::OUString > rowHeaders;
-    sal_Int32 m_nRowHeaderWidth;
+    sal_Int32                           m_nRowHeight;
+    std::vector< std::vector < Any > >  m_aData;
+    std::vector< ::rtl::OUString >      m_aRowHeaders;
+    sal_Int32                           m_nRowHeaderWidth;
 };
 
 }
diff --git a/toolkit/source/controls/grid/gridcolumn.cxx b/toolkit/source/controls/grid/gridcolumn.cxx
index d966e6656661..576871fc677a 100644
--- a/toolkit/source/controls/grid/gridcolumn.cxx
+++ b/toolkit/source/controls/grid/gridcolumn.cxx
@@ -46,11 +46,13 @@ namespace toolkit
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::awt::grid;
     using namespace ::com::sun::star::lang;
+    using namespace ::com::sun::star::util;
     using namespace ::com::sun::star::style;
 
     //==================================================================================================================
     //= DefaultGridColumnModel
     //==================================================================================================================
+    //------------------------------------------------------------------------------------------------------------------
     GridColumn::GridColumn()
         :GridColumn_Base( m_aMutex )
         ,m_aIdentifier()
@@ -60,7 +62,21 @@ namespace toolkit
         ,m_nMaxWidth(0)
         ,m_nMinWidth(0)
         ,m_bResizeable(true)
-        ,m_eHorizontalAlign(HorizontalAlignment(0))
+        ,m_eHorizontalAlign( HorizontalAlignment_LEFT )
+    {
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    GridColumn::GridColumn( GridColumn const & i_copySource )
+        :GridColumn_Base( m_aMutex )
+        ,m_aIdentifier( i_copySource.m_aIdentifier )
+        ,m_nIndex( i_copySource.m_nIndex )
+        ,m_nColumnWidth( i_copySource.m_nColumnWidth )
+        ,m_nPreferredWidth( i_copySource.m_nPreferredWidth )
+        ,m_nMaxWidth( i_copySource.m_nMaxWidth )
+        ,m_nMinWidth( i_copySource.m_nMinWidth )
+        ,m_bResizeable( i_copySource.m_bResizeable )
+        ,m_eHorizontalAlign( i_copySource.m_eHorizontalAlign )
     {
     }
 
@@ -283,6 +299,12 @@ namespace toolkit
         const Sequence< ::rtl::OUString > aSeq( &aServiceName, 1 );
         return aSeq;
     }
+
+    //------------------------------------------------------------------------------------------------------------------
+    Reference< XCloneable > SAL_CALL GridColumn::createClone(  ) throw (RuntimeException)
+    {
+        return new GridColumn( *this );
+    }
 }
 
 ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL GridColumn_CreateInstance( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& )
diff --git a/toolkit/source/controls/grid/gridcolumn.hxx b/toolkit/source/controls/grid/gridcolumn.hxx
index f621f68c9d88..b8d70551032a 100644
--- a/toolkit/source/controls/grid/gridcolumn.hxx
+++ b/toolkit/source/controls/grid/gridcolumn.hxx
@@ -51,6 +51,7 @@ class GridColumn    :public ::cppu::BaseMutex
 {
 public:
     GridColumn();
+    GridColumn( GridColumn const & i_copySource );
     virtual ~GridColumn();
 
     // ::com::sun::star::awt::grid::XGridColumn
@@ -78,6 +79,9 @@ public:
     virtual void SAL_CALL addEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& xListener ) throw (::com::sun::star::uno::RuntimeException);
     virtual void SAL_CALL removeEventListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener >& aListener ) throw (::com::sun::star::uno::RuntimeException);
 
+    // XCloneable (base of XGridColumn)
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
+
     // XServiceInfo
     virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw (::com::sun::star::uno::RuntimeException);
     virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException);
diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx
index 79b8ae8a6c61..8b323648a887 100644
--- a/toolkit/source/controls/grid/gridcontrol.cxx
+++ b/toolkit/source/controls/grid/gridcontrol.cxx
@@ -92,8 +92,38 @@ UnoGridModel::UnoGridModel( const ::com::sun::star::uno::Reference< ::com::sun::
 
 //----------------------------------------------------------------------------------------------------------------------
 UnoGridModel::UnoGridModel( const UnoGridModel& rModel )
-: UnoControlModel( rModel )
+    :UnoControlModel( rModel )
 {
+    // clone the data model
+    const Reference< XFastPropertySet > xCloneSource( &const_cast< UnoGridModel& >( rModel ) );
+    bool success = false;
+    try
+    {
+        const Reference< XCloneable > xCloneable( xCloneSource->getFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL ), UNO_QUERY_THROW );
+        setFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL, makeAny( xCloneable->createClone() ) );
+        success = true;
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    if ( !success )
+        setFastPropertyValue( BASEPROPERTY_GRID_DATAMODEL, makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridDataModel" ) ) );
+
+    // clone the column model
+    success = false;
+    try
+    {
+        const Reference< XCloneable > xCloneable( xCloneSource->getFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL ), UNO_QUERY_THROW );
+        setFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( xCloneable->createClone() ) );
+        success = true;
+    }
+    catch( const Exception& )
+    {
+        DBG_UNHANDLED_EXCEPTION();
+    }
+    if ( !success )
+        setFastPropertyValue( BASEPROPERTY_GRID_COLUMNMODEL, makeAny( maContext.createComponent( "com.sun.star.awt.grid.DefaultGridColumnModel" ) ) );
 }
 
 //----------------------------------------------------------------------------------------------------------------------