CWS-TOOLING: integrate CWS gridcontrol_01

2009-08-13 07:53:28 +0200 tkr  r274919 : #103210# remove mixed-line-endings
2009-08-13 07:36:19 +0200 tkr  r274918 : #103210# remove mixed-line-endings
2009-08-06 14:02:11 +0200 tkr  r274725 : #103210# build issues fixed
2009-08-06 12:11:52 +0200 tkr  r274711 : #103210# build issues fixed
2009-08-06 12:03:32 +0200 tkr  r274710 : #103210# add grid directory to d.lst
2009-08-05 17:00:11 +0200 misheto  r274689 : CWS-TOOLING: rebase CWS gridcontrol_01 to trunk@274622 (milestone: DEV300:m54)
2009-08-05 14:31:42 +0200 tkr  r274668 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
2009-08-05 14:30:06 +0200 tkr  r274667 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
2009-08-05 14:29:09 +0200 tkr  r274666 : #103210# remove add/removeMouseListener from XGridControl and use XWindow
2009-08-05 12:02:15 +0200 misheto  r274649 : fox for HScroll problem
2009-08-05 11:37:22 +0200 misheto  r274644 : CWS-TOOLING: rebase CWS gridcontrol_01 to trunk@274203 (milestone: DEV300:m53)
2009-08-03 10:12:50 +0200 tkr  r274568 : #103210# Method getItemIndexPos() added
2009-07-31 18:25:42 +0200 misheto  r274547 : fixed bug no cursor with NONE-selection, arrow keys cause selection disappear
2009-07-31 16:36:34 +0200 tkr  r274541 : #103210# MouseListener added
2009-07-31 16:35:48 +0200 tkr  r274540 : #103210# MouseListener added
2009-07-31 14:37:45 +0200 misheto  r274533 : event handlers
2009-07-31 09:43:52 +0200 tkr  r274513 : #103210# MouseListener added
2009-07-31 09:42:46 +0200 tkr  r274512 : #103210# MouseListenerMultiplexer exported
2009-07-30 18:19:55 +0200 misheto  r274501 : 2009-07-30 18:15:00 +0200 misheto  r274500 : mouselistener changes
2009-07-30 15:23:03 +0200 tkr  r274491 : #i103210# remove XItemListener and add XMouseListener
2009-07-30 15:22:01 +0200 tkr  r274490 : #i103210# remove XItemListener and add XMouseListener
2009-07-28 16:47:37 +0200 misheto  r274415 : fixed text left intented, removeAllScroll mode, selection mode, single selection
2009-07-28 16:45:32 +0200 misheto  r274413 : 2009-07-28 14:56:33 +0200 tkr  r274407 : #i103210# build issue fixed
2009-07-28 12:49:23 +0200 tkr  r274397 : #i103210# use HScroll and VScroll for Scrolbarmode
2009-07-28 12:24:14 +0200 tkr  r274396 : #i103210# use HScroll and VScroll for Scrolbarmode
2009-07-28 11:33:46 +0200 tkr  r274393 : ##i103210# api changes
2009-07-28 11:32:48 +0200 tkr  r274392 : ##i103210# add ItemListener
2009-07-28 11:31:49 +0200 tkr  r274391 : ##i103210# add ItemListener
2009-07-28 08:30:30 +0200 tkr  r274388 : #i103210# paint background color
2009-07-24 17:22:10 +0200 misheto  r274314 : focus problem solved, single selection with keys UP DOWN
2009-07-22 11:43:24 +0200 misheto  r274226 : removed vclxcontrol dependencies
2009-07-22 10:23:34 +0200 misheto  r274220 : 2009-07-21 15:04:26 +0200 misheto  r274200 : tablecontrol added items
2009-07-21 15:00:44 +0200 misheto  r274198 : tablecontrol
2009-07-17 09:58:59 +0200 misheto  r274082 : changes mihaela
2009-07-15 11:04:27 +0200 tkr  r273999 : #i103210# api documentation added
2009-07-15 11:03:18 +0200 tkr  r273998 : #i103210# adapt idl changes
2009-07-14 08:47:32 +0200 tkr  r273959 : #i103210# Method removeRow added
2009-07-14 08:46:52 +0200 tkr  r273958 : #i103210# Method removeRow added
2009-07-13 08:20:11 +0200 tkr  r273914 : #i103210# XGridSelectionModel removed
2009-07-10 13:50:01 +0200 tkr  r273888 : #i103210# selection support and listener added
2009-07-10 13:42:17 +0200 tkr  r273887 : #i103210# selection support added
2009-07-06 10:21:51 +0200 tkr  r273724 : #i103210# implement listener
2009-07-06 10:13:25 +0200 tkr  r273723 : #i103210# remove wrong interfaces
2009-07-06 10:11:47 +0200 tkr  r273722 : #i103210# interface changes
2009-07-02 15:28:50 +0200 tkr  r273659 : #i103210# create new services
2009-07-02 15:26:21 +0200 tkr  r273658 : #i103210# create new services
2009-07-02 12:00:39 +0200 tkr  r273633 : #i103210# defaultgriddatamodel works now
2009-07-02 11:59:24 +0200 tkr  r273631 : #i103210# now XGridDataModel inherits XComponent
2009-07-01 14:07:31 +0200 tkr  r273579 : #i103210# initial implementation of the grid control data model
2009-07-01 13:14:21 +0200 tkr  r273571 : #i103210# adding new service and some methods
2009-06-30 12:15:13 +0200 tkr  r273500 : #i103210# change attribute names
2009-06-30 10:55:07 +0200 tkr  r273496 : #i103210# create services and interfaces for the grid control
2009-06-30 10:47:26 +0200 tkr  r273495 : #i103210# create services and interfaces for the grid control

4 files changed, 1011 insertions, 3 deletions

diff --git a/svtools/source/uno/makefile.mk b/svtools/source/uno/makefile.mk
index 76ab335d58d5..51e55a1f9123 100644
--- a/svtools/source/uno/makefile.mk
+++ b/svtools/source/uno/makefile.mk
@@ -1,4 +1,4 @@
-
+#*************************************************************************
 #
 # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 # 
@@ -55,6 +55,7 @@ SLOFILES= \
             $(SLO)$/genericunodialog.obj \
             $(SLO)$/generictoolboxcontroller.obj \
             $(SLO)$/treecontrolpeer.obj \
+            $(SLO)$/unocontroltablemodel.obj \
             $(SLO)$/registerservices.obj\
             $(SLO)$/contextmenuhelper.obj
 
diff --git a/svtools/source/uno/unocontroltablemodel.cxx b/svtools/source/uno/unocontroltablemodel.cxx
new file mode 100644
index 000000000000..e322dbb8f96e
--- /dev/null
+++ b/svtools/source/uno/unocontroltablemodel.cxx
@@ -0,0 +1,812 @@
+/*************************************************************************
+ *
+ * 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: unocontroltablemodel.cxx,v $
+ * $Revision: 1.32 $
+ *
+ * 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.
+ *
+ ************************************************************************/
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_svtools.hxx"
+
+#include "unocontroltablemodel.hxx"
+#include <com/sun/star/view/SelectionType.hpp>
+#include "svtools/table/gridtablerenderer.hxx"
+#include "svtools/table/defaultinputhandler.hxx"
+#include "svtools/table/tablecontrol.hxx"
+#include <comphelper/sequence.hxx>
+#include <rtl/ref.hxx>
+#include <tools/debug.hxx>
+#include <toolkit/helper/property.hxx>
+#include <comphelper/processfactory.hxx>
+#include <com/sun/star/awt/grid/XGridColumn.hpp>
+
+using ::rtl::OUString;
+using namespace ::svt::table;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::awt::grid;
+
+using namespace ::svt::table;
+using namespace ::com::sun::star::uno;
+using namespace ::com::sun::star::view;
+using namespace ::toolkit;
+
+class UnoControlTableColumn : public IColumnModel
+    {
+    private:
+        ColumnID        m_nID;
+        String          m_sName;
+        bool            m_bIsResizable;
+        TableMetrics    m_nWidth;
+        TableMetrics    m_nMinWidth;
+        TableMetrics    m_nMaxWidth;
+
+    public:
+        UnoControlTableColumn(Reference<XGridColumn>);
+
+        // IColumnModel overridables
+        virtual ColumnID        getID() const;
+        virtual bool            setID( const ColumnID _nID );
+        virtual String          getName() const;
+        virtual void            setName( const String& _rName );
+        virtual bool            isResizable() const;
+        virtual void            setResizable( bool _bResizable );
+        virtual TableMetrics    getWidth() const;
+        virtual void            setWidth( TableMetrics _nWidth );
+        virtual TableMetrics    getMinWidth() const;
+        virtual void            setMinWidth( TableMetrics _nMinWidth );
+        virtual TableMetrics    getMaxWidth() const;
+        virtual void            setMaxWidth( TableMetrics _nMaxWidth );
+    };
+
+    //--------------------------------------------------------------------
+    UnoControlTableColumn::UnoControlTableColumn(Reference<XGridColumn> m_xGridColumn)
+        :m_nID( 0 )
+        ,m_sName()
+        ,m_bIsResizable( false )
+        ,m_nWidth( 10 * 100 )    // 1 cm
+        ,m_nMinWidth( 0 )   // no min width
+        ,m_nMaxWidth( 0 )   // no max width
+    {
+        //m_nID = m_xGridColumn->getIdentifier();
+        //m_nWidth = m_xGridColumn->getColumnWidth();
+        m_sName = m_xGridColumn->getTitle();
+    }
+
+    //--------------------------------------------------------------------
+    ColumnID UnoControlTableColumn::getID() const
+    {
+        return m_nID;
+    }
+
+    //--------------------------------------------------------------------
+    bool UnoControlTableColumn::setID( const ColumnID _nID )
+    {
+        // TODO: conflict check
+
+        m_nID = _nID;
+        // TODO: notifications?
+
+        return true;
+    }
+
+    //--------------------------------------------------------------------
+    String UnoControlTableColumn::getName() const
+    {
+        return m_sName;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableColumn::setName( const String& _rName )
+    {
+        m_sName = _rName;
+        // TODO: notifications?
+    }
+
+    //--------------------------------------------------------------------
+    bool UnoControlTableColumn::isResizable() const
+    {
+        return m_bIsResizable;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableColumn::setResizable( bool _bResizable )
+    {
+        m_bIsResizable = _bResizable;
+        // TODO: notifications?
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableColumn::getWidth() const
+    {
+        return m_nWidth;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableColumn::setWidth( TableMetrics _nWidth )
+    {
+        m_nWidth = _nWidth;
+        // TODO: notifications?
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableColumn::getMinWidth() const
+    {
+        return m_nMinWidth;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableColumn::setMinWidth( TableMetrics _nMinWidth )
+    {
+        m_nMinWidth = _nMinWidth;
+        // TODO: notifications?
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableColumn::getMaxWidth() const
+    {
+        return m_nMaxWidth;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableColumn::setMaxWidth( TableMetrics _nMaxWidth )
+    {
+        m_nMaxWidth = _nMaxWidth;
+        // TODO: notifications?
+    }
+
+    //====================================================================
+    //= DefaultTableModel_Impl
+    //====================================================================
+    struct UnoControlTableModel_Impl
+    {
+        ::std::vector< PColumnModel >   aColumns;
+        TableSize                       nRowCount;
+        bool                            bHasColumnHeaders;
+        bool                            bHasRowHeaders;
+        PTableRenderer                  pRenderer;
+        PTableInputHandler              pInputHandler;
+        TableMetrics                    nRowHeight;
+        TableMetrics                    nColumnHeaderHeight;
+        TableMetrics                    nRowHeaderWidth;
+        std::vector<rtl::OUString>      aRowHeadersTitle;
+        std::vector<std::vector<rtl::OUString> >    aCellContent;
+
+        UnoControlTableModel_Impl()
+            :nRowCount          ( 0         )
+            ,bHasColumnHeaders  ( false     )
+            ,bHasRowHeaders     ( false     )
+            ,pRenderer          (           )
+            ,pInputHandler      (           )
+            ,nRowHeight         ( 4 * 100   )   // 40 mm
+            ,nColumnHeaderHeight( 5 * 100   )   // 50 mm
+            ,nRowHeaderWidth    ( 10 * 100  )    // 50 mm
+            ,aRowHeadersTitle   ( 0         )
+            ,aCellContent       ( 0         )
+        {
+        }
+    };
+
+    //====================================================================
+    //= UnoControlTableModel
+    //====================================================================
+    //--------------------------------------------------------------------
+    UnoControlTableModel::UnoControlTableModel()
+        :m_pImpl( new UnoControlTableModel_Impl ),
+        m_xDataModel(0),
+        m_xColumnModel(0),
+        m_bHasColumnHeaders(false),
+        m_bHasRowHeaders(false),
+        m_bVScroll(false),
+        m_bHScroll(false)
+    {
+        m_pImpl->bHasColumnHeaders = m_bHasColumnHeaders;
+        m_pImpl->bHasRowHeaders = m_bHasRowHeaders;
+        m_pImpl->pRenderer.reset( new GridTableRenderer( *this ) );
+        m_pImpl->pInputHandler.reset( new DefaultInputHandler );
+    }
+
+    //--------------------------------------------------------------------
+    UnoControlTableModel::~UnoControlTableModel()
+    {
+        DELETEZ( m_pImpl );
+    }
+
+    //--------------------------------------------------------------------
+    TableSize UnoControlTableModel::getColumnCount() const
+    {
+        m_pImpl->aColumns.resize( m_xColumnModel->getColumnCount());
+        return (TableSize)m_pImpl->aColumns.size();
+    }
+
+    //--------------------------------------------------------------------
+    TableSize UnoControlTableModel::getRowCount() const
+    {
+        return m_pImpl->nRowCount;
+    }
+
+    //--------------------------------------------------------------------
+    bool UnoControlTableModel::hasColumnHeaders() const
+    {
+        return m_pImpl->bHasColumnHeaders;
+    }
+
+    //--------------------------------------------------------------------
+    bool UnoControlTableModel::hasRowHeaders() const
+    {
+        return m_pImpl->bHasRowHeaders;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::setRowHeaders(bool _bRowHeaders)
+    {
+        m_pImpl->bHasRowHeaders = _bRowHeaders;
+    }
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::setColumnHeaders(bool _bColumnHeaders)
+    {
+        m_pImpl->bHasColumnHeaders = _bColumnHeaders;
+    }
+
+    void UnoControlTableModel::setColumnCount(TableSize _nColCount)
+    {
+       m_pImpl->aColumns.resize( _nColCount);
+    }
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::setRowCount(TableSize _nRowCount)
+    {
+       m_pImpl->nRowCount = _nRowCount;
+    }
+    //--------------------------------------------------------------------
+    bool UnoControlTableModel::isCellEditable( ColPos col, RowPos row ) const
+    {
+        (void)col;
+        (void)row;
+        return false;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::addTableModelListener( const PTableModelListener& listener )
+    {
+        (void) listener;
+        //listener->onTableModelChanged(PTableModel(this));
+        // TODO
+        DBG_ERROR( "DefaultTableModel::addTableModelListener: not yet implemented!" );
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::removeTableModelListener( const PTableModelListener& listener )
+    {
+        (void)listener;
+        // TODO
+        DBG_ERROR( "DefaultTableModel::removeTableModelListener: not yet implemented!" );
+    }
+
+    //--------------------------------------------------------------------
+    PColumnModel UnoControlTableModel::getColumnModel( ColPos column )
+    {
+        DBG_ASSERT( ( column >= 0 ) && ( column < getColumnCount() ),
+            "DefaultTableModel::getColumnModel: invalid index!" );
+        return m_pImpl->aColumns[ column ];
+    }
+
+    //--------------------------------------------------------------------
+    PColumnModel UnoControlTableModel::getColumnModelByID( ColumnID id )
+    {
+        (void)id;
+        // TODO
+        DBG_ERROR( "DefaultTableModel::getColumnModelByID: not yet implemented!" );
+        return PColumnModel();
+    }
+
+    //--------------------------------------------------------------------
+    PTableRenderer UnoControlTableModel::getRenderer() const
+    {
+        return m_pImpl->pRenderer;
+    }
+
+    //--------------------------------------------------------------------
+    PTableInputHandler UnoControlTableModel::getInputHandler() const
+    {
+        return m_pImpl->pInputHandler;
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableModel::getRowHeight() const
+    {
+        return m_pImpl->nRowHeight;
+    }
+        //--------------------------------------------------------------------
+    void UnoControlTableModel::setRowHeight(TableMetrics _nRowHeight)
+    {
+        m_pImpl->nRowHeight = _nRowHeight;
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableModel::getColumnHeaderHeight() const
+    {
+        DBG_ASSERT( hasColumnHeaders(), "DefaultTableModel::getColumnHeaderHeight: invalid call!" );
+        return m_pImpl->nColumnHeaderHeight;
+    }
+
+    //--------------------------------------------------------------------
+    TableMetrics UnoControlTableModel::getRowHeaderWidth() const
+    {
+        DBG_ASSERT( hasRowHeaders(), "DefaultTableModel::getRowHeaderWidth: invalid call!" );
+        return m_pImpl->nRowHeaderWidth;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::SetTitleHeight( TableMetrics _nHeight )
+    {
+        DBG_ASSERT( _nHeight > 0, "DefaultTableModel::SetTitleHeight: invalid height value!" );
+        m_pImpl->nColumnHeaderHeight = _nHeight;
+        // TODO: notification
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::SetHandleWidth( TableMetrics _nWidth )
+    {
+        DBG_ASSERT( _nWidth > 0, "DefaultTableModel::SetHandleWidth: invalid width value!" );
+        m_pImpl->nRowHeaderWidth = _nWidth;
+        // TODO: notification
+    }
+
+    //--------------------------------------------------------------------
+    ScrollbarVisibility UnoControlTableModel::getVerticalScrollbarVisibility(int overAllHeight, int actHeight) const
+    {
+        if(overAllHeight>=actHeight && !m_bVScroll)
+            return ScrollbarShowNever;
+        else
+            return ScrollbarShowAlways;
+    }
+
+    //--------------------------------------------------------------------
+    ScrollbarVisibility UnoControlTableModel::getHorizontalScrollbarVisibility(int overAllWidth, int actWidth) const
+    {
+        if(overAllWidth>=actWidth && !m_bHScroll)
+            return ScrollbarShowNever;
+        else
+            return ScrollbarShowAlways;
+    }
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::setCellContent(std::vector<std::vector<rtl::OUString> > cellContent)
+    {
+        if(cellContent.empty())
+        {
+            unsigned int i = m_pImpl->aColumns.size();
+            std::vector<rtl::OUString> emptyCells;
+            while(i!=0)
+            {
+                cellContent.push_back(emptyCells);
+                --i;
+            }
+        }
+        std::vector<rtl::OUString> cCC;
+        for(::std::vector<std::vector<rtl::OUString> >::iterator iter = cellContent.begin(); iter!= cellContent.end();++iter)
+        {
+            cCC = *iter;
+            m_pImpl->aCellContent.push_back(cCC);
+        }
+    }
+
+    std::vector<std::vector<rtl::OUString> > UnoControlTableModel::getCellContent()
+    {
+        return m_pImpl->aCellContent;
+    }
+
+    //--------------------------------------------------------------------
+    void UnoControlTableModel::setRowHeaderName(std::vector<rtl::OUString> cellColumnContent)
+    {
+        if(cellColumnContent.empty())
+        {
+            unsigned int i = m_pImpl->aColumns.size();
+            while(i!=0)
+            {
+                cellColumnContent.push_back(rtl::OUString::createFromAscii(""));
+                --i;
+            }
+        }
+        for(::std::vector<rtl::OUString>::iterator iter = cellColumnContent.begin(); iter!= cellColumnContent.end();++iter)
+        {
+            rtl::OUString s = *iter;
+            m_pImpl->aRowHeadersTitle.push_back(*iter);
+        }
+    }
+
+    std::vector<rtl::OUString> UnoControlTableModel::getRowHeaderName()
+    {
+        return m_pImpl->aRowHeadersTitle;
+    }
+
+::com::sun::star::uno::Any UnoControlTableModel::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
+{
+    ::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
+                                        SAL_STATIC_CAST( ::com::sun::star::awt::grid::XGridControl*, this ),
+                                        SAL_STATIC_CAST( ::com::sun::star::awt::grid::XGridDataListener*, this ),
+                                        //SAL_STATIC_CAST( com::sun::star::lang::XEventListener*, this ),
+                                        //SAL_STATIC_CAST( com::sun::star::awt::XMouseListener*, this ),
+                                        SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ) );
+    return (aRet.hasValue() ? aRet : VCLXWindow::queryInterface( rType ));
+}
+
+// ::com::sun::star::lang::XTypeProvider
+IMPL_XTYPEPROVIDER_START( UnoControlTableModel )
+    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridControl>* ) NULL ),
+    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel>* ) NULL ),
+    getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener>* ) NULL ),
+    VCLXWindow::getTypes()
+IMPL_XTYPEPROVIDER_END
+
+::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel > SAL_CALL UnoControlTableModel::getColumnModel(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    return NULL;
+}
+void SAL_CALL UnoControlTableModel::setColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel >& model ) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)model;
+}
+::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel > SAL_CALL UnoControlTableModel::getDataModel(  ) throw (::com::sun::star::uno::RuntimeException)
+{
+    return NULL;
+}
+void SAL_CALL UnoControlTableModel::setDataModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel >& model ) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)model;
+}
+sal_Int32 SAL_CALL UnoControlTableModel::getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
+{
+    TableControl* pTableControl = (TableControl*)GetWindow();
+    return pTableControl->GetCurrentRow( Point(x,y) );
+}
+
+/*
+void SAL_CALL UnoControlTableModel::addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener ) throw(::com::sun::star::uno::RuntimeException)
+{
+    VCLXWindow::addMouseListener( listener );
+}
+
+void SAL_CALL UnoControlTableModel::removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener ) throw(::com::sun::star::uno::RuntimeException)
+{
+    VCLXWindow::removeMouseListener( listener );
+}
+*/
+/*
+void SAL_CALL UnoControlTableModel::mousePressed( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException)
+{
+    (void)rEvent;
+}
+void SAL_CALL UnoControlTableModel::mouseReleased( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException)
+{
+    (void)rEvent;
+}
+void SAL_CALL UnoControlTableModel::mouseEntered( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException)
+{
+    (void) rEvent;
+}
+void SAL_CALL UnoControlTableModel::mouseExited( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException)
+{
+    (void) rEvent;
+}
+*/
+void SAL_CALL UnoControlTableModel::addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)listener;
+}
+
+void SAL_CALL UnoControlTableModel::removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void) listener;
+}
+
+void UnoControlTableModel::setProperty( const ::rtl::OUString& PropertyName, const Any& aValue) throw(RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    TableControl* pTableControl = (TableControl*)GetWindow();
+
+    switch( GetPropertyId( PropertyName ) )
+    {
+        case BASEPROPERTY_GRID_SELECTIONMODE:
+        {
+            SelectionType eSelectionType;
+            if( aValue >>= eSelectionType )
+            {
+                SelectionMode eSelMode;
+                switch( eSelectionType )
+                {
+                case SelectionType_SINGLE:  eSelMode = SINGLE_SELECTION; break;
+                case SelectionType_RANGE:   eSelMode = RANGE_SELECTION; break;
+                case SelectionType_MULTI:   eSelMode = MULTIPLE_SELECTION; break;
+    //          case SelectionType_NONE:
+                default:                    eSelMode = NO_SELECTION; break;
+                }
+                if( pTableControl->getSelEngine()->GetSelectionMode() != eSelMode )
+                    pTableControl->getSelEngine()->SetSelectionMode( eSelMode );
+            }
+            break;
+        }
+        case BASEPROPERTY_HSCROLL:
+        {
+            sal_Bool bHScroll = true;
+            if( aValue >>= bHScroll )
+            {
+                m_bHScroll = bHScroll;
+            }
+            break;
+        }
+        case BASEPROPERTY_VSCROLL:
+        {
+            sal_Bool bVScroll = true;
+            if( aValue >>= bVScroll )
+            {
+                m_bVScroll = bVScroll;
+            }
+            break;
+        }
+        case BASEPROPERTY_GRID_SHOWROWHEADER:
+        {
+            sal_Bool rowHeader = true;
+            if( aValue >>= rowHeader )
+            {
+                setRowHeaders(rowHeader);
+            }
+            break;
+        }
+
+        case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
+        {
+            sal_Bool colHeader = true;
+            if( aValue >>= colHeader )
+            {
+                setColumnHeaders(colHeader);
+            }
+            break;
+        }
+        case BASEPROPERTY_GRID_DATAMODEL:
+        {
+            m_xDataModel = Reference< XGridDataModel >( aValue, UNO_QUERY );
+            Sequence<Sequence< ::rtl::OUString > > cellData = m_xDataModel->getData();
+            Sequence<rtl::OUString> rowData(0);
+            for(int i = 0; i< m_xDataModel->getRowCount();++i)
+            {
+                rowData = cellData[i];
+                std::vector<rtl::OUString> newRow(
+                    comphelper::sequenceToContainer< std::vector<rtl::OUString > >(rowData));
+                if(newRow.size()<m_pImpl->aColumns.size())
+                    newRow.resize(m_pImpl->aColumns.size(),rtl::OUString::createFromAscii(""));
+                m_pImpl->aCellContent.push_back(newRow);
+            }
+            Sequence< ::rtl::OUString > rowHeaders = m_xDataModel->getRowHeaders();
+            std::vector< rtl::OUString > newRow(
+                comphelper::sequenceToContainer< std::vector<rtl::OUString > >(rowHeaders));
+            m_pImpl->nRowCount = m_xDataModel->getRowCount();
+            setRowHeaderName(newRow);
+            break;
+        }
+        case BASEPROPERTY_GRID_COLUMNMODEL:
+        {
+            m_xColumnModel = Reference< XGridColumnModel >( aValue, UNO_QUERY );
+            Sequence<Reference< XGridColumn > > columns = m_xColumnModel->getColumns();
+            std::vector<Reference< XGridColumn > > aNewColumns(
+                comphelper::sequenceToContainer<std::vector<Reference< XGridColumn > > >(columns));
+            if(!m_pImpl->aColumns.empty())
+                m_pImpl->aColumns.clear();
+            for ( ::svt::table::ColPos col = 0; col < m_xColumnModel->getColumnCount(); ++col )
+            {
+                UnoControlTableColumn* tableColumn = new UnoControlTableColumn(aNewColumns[col]);
+                m_pImpl->aColumns.push_back((PColumnModel)tableColumn);
+            }
+            break;
+        }
+        default:
+            VCLXWindow::setProperty( PropertyName, aValue );
+        break;
+    }
+}
+
+Any UnoControlTableModel::getProperty( const ::rtl::OUString& PropertyName ) throw(RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+
+    const sal_uInt16 nPropId = GetPropertyId( PropertyName );
+    TableControl* pTableControl = (TableControl*)GetWindow();
+    if(pTableControl)
+    {
+        switch(nPropId)
+        {
+        case BASEPROPERTY_GRID_SELECTIONMODE:
+        {
+            SelectionType eSelectionType;
+
+            SelectionMode eSelMode = pTableControl->getSelEngine()->GetSelectionMode();
+            switch( eSelMode )
+            {
+                case SINGLE_SELECTION:  eSelectionType = SelectionType_SINGLE; break;
+                case RANGE_SELECTION:   eSelectionType = SelectionType_RANGE; break;
+                case MULTIPLE_SELECTION:eSelectionType = SelectionType_MULTI; break;
+//              case NO_SELECTION:
+                default:                eSelectionType = SelectionType_NONE; break;
+            }
+            return Any( eSelectionType );
+        }
+            case BASEPROPERTY_GRID_SHOWROWHEADER:
+            {
+                return Any ((sal_Bool) pTableControl->GetModel()->hasRowHeaders());
+            }
+            case BASEPROPERTY_GRID_SHOWCOLUMNHEADER:
+                return Any ((sal_Bool) pTableControl->GetModel()->hasColumnHeaders());
+            case BASEPROPERTY_GRID_DATAMODEL:
+                return Any ( m_xDataModel );
+            case BASEPROPERTY_GRID_COLUMNMODEL:
+                return Any ( m_xColumnModel);
+            case BASEPROPERTY_HSCROLL:
+                return Any ( m_bHScroll);
+            case BASEPROPERTY_VSCROLL:
+                return Any ( m_bVScroll);
+        }
+    }
+    return VCLXWindow::getProperty( PropertyName );
+}
+
+void UnoControlTableModel::ImplGetPropertyIds( std::list< sal_uInt16 > &rIds )
+{
+    PushPropertyIds( rIds,
+                     BASEPROPERTY_GRID_SHOWROWHEADER,
+                     BASEPROPERTY_GRID_SHOWCOLUMNHEADER,
+                     BASEPROPERTY_GRID_DATAMODEL,
+                     BASEPROPERTY_GRID_COLUMNMODEL,
+                     BASEPROPERTY_GRID_SELECTIONMODE,
+                     0);
+    VCLXWindow::ImplGetPropertyIds( rIds, true );
+}
+void SAL_CALL UnoControlTableModel::setVisible( sal_Bool bVisible ) throw(::com::sun::star::uno::RuntimeException)
+{
+    TableControl* pTable = (TableControl*)GetWindow();
+    if ( pTable )
+    {
+        pTable->SetModel(PTableModel(this));
+        pTable->Show( bVisible );
+    }
+}
+void SAL_CALL UnoControlTableModel::setFocus() throw(::com::sun::star::uno::RuntimeException)
+{
+    ::vos::OGuard aGuard( GetMutex() );
+    if ( GetWindow())
+        GetWindow()->GrabFocus();
+}
+void SAL_CALL UnoControlTableModel::rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+{
+    std::vector<OUString> aNewRow(
+        comphelper::sequenceToContainer< std::vector<rtl::OUString > >(Event.rowData));
+    if(aNewRow.size()<m_pImpl->aColumns.size())
+        aNewRow.resize(m_pImpl->aColumns.size(),rtl::OUString::createFromAscii(""));
+    m_pImpl->aCellContent.push_back(aNewRow);
+    if(hasRowHeaders())
+        m_pImpl->aRowHeadersTitle.push_back(Event.headerName);
+    m_pImpl->nRowCount=m_pImpl->aCellContent.size();
+    TableControl* pTable = (TableControl*)GetWindow();
+    pTable->InvalidateDataWindow(m_pImpl->nRowCount-1, false);
+    //pTable->GrabFocus();
+}
+
+void SAL_CALL UnoControlTableModel::rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+{
+    TableControl* pTable = (TableControl*)GetWindow();
+    //unsigned int rows =m_pImpl->aCellContent.size()-1;
+    if(Event.index == -1)
+    {
+        if(hasRowHeaders())
+            m_pImpl->aRowHeadersTitle.clear();
+        m_pImpl->aCellContent.clear();
+    }
+    else
+    {
+        pTable->removeSelectedRow(Event.index);
+        if(m_pImpl->aCellContent.size()>1)
+        {
+            if(hasRowHeaders())
+                m_pImpl->aRowHeadersTitle.erase(m_pImpl->aRowHeadersTitle.begin()+Event.index);
+            m_pImpl->aCellContent.erase(m_pImpl->aCellContent.begin()+Event.index);
+
+        }
+        else
+        {
+            if(hasRowHeaders())
+                m_pImpl->aRowHeadersTitle.clear();
+            m_pImpl->aCellContent.clear();
+            //m_pImpl->nRowCount=0;
+        }
+    }
+    //pTable->InvalidateDataWindow(Event.index, true);
+    setRowCount(m_pImpl->aCellContent.size());
+    pTable->InvalidateDataWindow(Event.index, true);
+    //pTable->Invalidate();
+}
+
+void SAL_CALL  UnoControlTableModel::dataChanged(const ::com::sun::star::awt::grid::GridDataEvent& Event ) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void) Event;
+}
+
+ void SAL_CALL UnoControlTableModel::disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException)
+ {
+    VCLXWindow::disposing( Source );
+ }
+
+::sal_Int32 SAL_CALL UnoControlTableModel::getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException)
+{
+    return 0;
+}
+
+::sal_Int32 SAL_CALL UnoControlTableModel::getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException)
+{
+    return 0;
+}
+
+void SAL_CALL UnoControlTableModel::insertIndexIntervall(::sal_Int32 start, ::sal_Int32 length) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)length;
+    (void)start;
+}
+
+void SAL_CALL UnoControlTableModel::removeIndexIntervall(::sal_Int32 start, ::sal_Int32 end) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)end;
+    (void)start;
+}
+
+::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL UnoControlTableModel::getSelection() throw (::com::sun::star::uno::RuntimeException)
+{
+    TableControl* pTable = (TableControl*)GetWindow();
+    std::vector<RowPos> selectedRows = pTable->getSelectedRows();
+    Sequence<sal_Int32> selectedRowsToSequence(comphelper::containerToSequence(selectedRows));
+    return selectedRowsToSequence;
+}
+
+::sal_Bool SAL_CALL UnoControlTableModel::isCellEditable() throw (::com::sun::star::uno::RuntimeException)
+{
+    return sal_False;
+}
+
+::sal_Bool SAL_CALL UnoControlTableModel::isSelectionEmpty() throw (::com::sun::star::uno::RuntimeException)
+{
+    return sal_False;
+}
+
+::sal_Bool SAL_CALL UnoControlTableModel::isSelectedIndex(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)index;
+    return sal_False;
+}
+
+void SAL_CALL UnoControlTableModel::selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)y;
+}
+
+void SAL_CALL UnoControlTableModel::selectColumn(::sal_Int32 x) throw (::com::sun::star::uno::RuntimeException)
+{
+    (void)x;
+}
diff --git a/svtools/source/uno/unocontroltablemodel.hxx b/svtools/source/uno/unocontroltablemodel.hxx
new file mode 100644
index 000000000000..5da9cc871756
--- /dev/null
+++ b/svtools/source/uno/unocontroltablemodel.hxx
@@ -0,0 +1,179 @@
+/*************************************************************************
+ *
+ * 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: unocontroltablemodel.hxx,v $
+ * $Revision: 1.32 $
+ *
+ * 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 _UNOCONTROL_TABLEMODEL_HXX_
+#define _UNOCONTROL_TABLEMODEL_HXX_
+
+#include <svtools/table/tablemodel.hxx>
+#include <svtools/table/tablecontrol.hxx>
+#include <com/sun/star/awt/grid/XGridControl.hpp>
+#include <com/sun/star/awt/grid/XGridDataListener.hpp>
+#include <com/sun/star/awt/grid/GridDataEvent.hpp>
+#include <com/sun/star/awt/grid/XGridColumnModel.hpp>
+#include <com/sun/star/awt/grid/XGridDataModel.hpp>
+#include <com/sun/star/awt/grid/XGridSelectionListener.hpp>
+#include <toolkit/awt/vclxwindow.hxx>
+#include <toolkit/awt/vclxwindows.hxx>
+#include <cppuhelper/typeprovider.hxx>
+#include <cppuhelper/implbase2.hxx>
+//#include <toolkit/helper/listenermultiplexer.hxx>
+
+
+using namespace ::svt::table;
+
+    struct UnoControlTableModel_Impl;
+
+    class UnoControlTableModel : public ITableModel, public ::cppu::ImplInheritanceHelper2< VCLXWindow, ::com::sun::star::awt::grid::XGridControl,
+                                 ::com::sun::star::awt::grid::XGridDataListener>
+    {
+    private:
+        UnoControlTableModel_Impl*     m_pImpl;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel >m_xDataModel;
+        ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel >m_xColumnModel;
+        bool m_bHasColumnHeaders;
+        bool m_bHasRowHeaders;
+        bool m_bVScroll;
+        bool m_bHScroll;
+        //MouseListenerMultiplexer m_aMouseListeners;
+
+    public:
+        UnoControlTableModel();
+        ~UnoControlTableModel();
+
+        /// returns the current row height, in 1/100 millimeters
+        inline  TableMetrics    GetRowHeight() const { return getRowHeight(); }
+        /// sets a new row height.
+        void                    setRowHeight( TableMetrics _nHeight );
+
+        /// returns the height of the title row (containing the column headers)
+        inline  TableMetrics    GetTitleHeight() const { return getColumnHeaderHeight(); }
+        /// sets a new height for the title row (containing the column headers)
+        void                    SetTitleHeight( TableMetrics _nHeight );
+
+        /// returns the width of the handle column (containing the row headers)
+        inline  TableMetrics    GetHandleWidth() const { return getRowHeaderWidth(); }
+        /// sets a new width for the handle column (containing the row headers)
+        void                    SetHandleWidth( TableMetrics _nWidth );
+
+        /// sets the width of a column
+        inline void            SetColumnWidth( ColPos _nColumn, TableMetrics _nWidth100thMM );
+        /// retrieves the width of a column, in 1/100th millimeters
+        inline TableMetrics    GetColumnWidth( ColPos _nColumn );
+
+        // TODO: setters and getters for ID, Name, Resizable, MinWidth, MaxWidth
+
+    public:
+        // ITableModel overridables
+        virtual TableSize           getColumnCount() const;
+        virtual TableSize           getRowCount() const;
+        virtual void                setColumnCount(TableSize _nColCount);
+        virtual void                setRowCount(TableSize _nRowCount);
+        virtual bool                hasColumnHeaders() const;
+        virtual bool                hasRowHeaders() const;
+        virtual void                setRowHeaders(bool _bRowHeaders);
+        virtual void                setColumnHeaders(bool _bColumnHeaders);
+        virtual bool                isCellEditable( ColPos col, RowPos row ) const;
+        virtual void                addTableModelListener( const PTableModelListener& listener );
+        virtual void                removeTableModelListener( const PTableModelListener& listener );
+        virtual PColumnModel        getColumnModel( ColPos column );
+        virtual PColumnModel        getColumnModelByID( ColumnID id );
+        virtual PTableRenderer      getRenderer() const;
+        virtual PTableInputHandler  getInputHandler() const;
+        virtual TableMetrics        getRowHeight() const;
+        virtual TableMetrics        getColumnHeaderHeight() const;
+        virtual TableMetrics        getRowHeaderWidth() const;
+        virtual ScrollbarVisibility getVerticalScrollbarVisibility(int overAllHeight, int actHeight) const;
+        virtual ScrollbarVisibility getHorizontalScrollbarVisibility(int overAllWidth, int actWidth) const;
+        virtual void                setCellContent(std::vector<std::vector<rtl::OUString> > cellContent);
+        virtual std::vector<std::vector<rtl::OUString> >        getCellContent();
+        virtual void                setRowHeaderName(std::vector<rtl::OUString> cellColumnContent);
+        virtual std::vector<rtl::OUString>  getRowHeaderName();
+
+        //XGridDataListener overridables
+        virtual void SAL_CALL rowAdded(const ::com::sun::star::awt::grid::GridDataEvent& Event) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL rowRemoved(const ::com::sun::star::awt::grid::GridDataEvent & Event) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL dataChanged(const ::com::sun::star::awt::grid::GridDataEvent & Event) throw (::com::sun::star::uno::RuntimeException);
+        virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw(::com::sun::star::uno::RuntimeException);
+
+    ::com::sun::star::uno::Any                  SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
+    void                                        SAL_CALL acquire() throw()  { VCLXWindow::acquire(); }
+    void                                        SAL_CALL release() throw()  { VCLXWindow::release(); }
+
+    // ::com::sun::star::lang::XTypeProvider
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >  SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< sal_Int8 >                     SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
+
+    //::com::sun::star::awt::grid::XGridControl
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel > SAL_CALL getColumnModel(  ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL setColumnModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridColumnModel >& model ) throw (::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel > SAL_CALL getDataModel(  ) throw (::com::sun::star::uno::RuntimeException);
+    void SAL_CALL setDataModel( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridDataModel >& model ) throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ::sal_Int32 SAL_CALL getMinSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getMaxSelectionIndex() throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertIndexIntervall(::sal_Int32 start, ::sal_Int32 length) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeIndexIntervall(::sal_Int32 start, ::sal_Int32 end) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::sal_Int32 > SAL_CALL getSelection() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isCellEditable() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isSelectionEmpty() throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Bool SAL_CALL isSelectedIndex(::sal_Int32 index) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectRow(::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL selectColumn(::sal_Int32 x) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeSelectionListener(const ::com::sun::star::uno::Reference< ::com::sun::star::awt::grid::XGridSelectionListener > & listener) throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int32 SAL_CALL getItemIndexAtPoint(::sal_Int32 x, ::sal_Int32 y) throw (::com::sun::star::uno::RuntimeException);
+
+    //void SAL_CALL addMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener ) throw(::com::sun::star::uno::RuntimeException);
+    //void SAL_CALL removeMouseListener( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMouseListener > & listener ) throw(::com::sun::star::uno::RuntimeException);
+    //::com::sun::star::awt::XMouseListener
+    /*
+    virtual void SAL_CALL mousePressed( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL mouseReleased( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL mouseEntered( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL mouseExited( const ::com::sun::star::awt::MouseEvent& rEvent ) throw(::com::sun::star::uno::RuntimeException);
+    */
+
+    void SAL_CALL setProperty( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Any& Value ) throw(::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any SAL_CALL getProperty( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::uno::RuntimeException);
+    static void     ImplGetPropertyIds( std::list< sal_uInt16 > &aIds );
+    void SAL_CALL setVisible(sal_Bool bVisible) throw(::com::sun::star::uno::RuntimeException);
+    void SAL_CALL setFocus() throw(::com::sun::star::uno::RuntimeException);
+    };
+
+    inline void UnoControlTableModel::SetColumnWidth( ColPos _nColumn, TableMetrics _nWidth100thMM )
+    {
+        getColumnModel( _nColumn )->setWidth( _nWidth100thMM );
+    }
+
+    inline TableMetrics UnoControlTableModel::GetColumnWidth( ColPos _nColumn )
+    {
+        return getColumnModel( _nColumn )->getWidth();
+    }
+ #endif // _UNOCONTROL_TABLEMODEL_HXX_
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx
index 91a6de4c404d..e6922aa4f099 100644
--- a/svtools/source/uno/unoiface.cxx
+++ b/svtools/source/uno/unoiface.cxx
@@ -54,6 +54,9 @@
 
 #include <svtools/svtreebx.hxx>
 #include "treecontrolpeer.hxx"
+//#include "vclxgridcontrol.hxx"
+#include "unocontroltablemodel.hxx"
+#include <svtools/table/tablecontrol.hxx>
 
 namespace
 {
@@ -83,8 +86,6 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
         if ( pParent )
         {
             pWindow = new MultiLineEdit( pParent, nWinBits|WB_IGNORETAB);
-            static_cast< MultiLineEdit* >( pWindow )->DisableSelectionOnFocus();
-                // #i89821# / 2008-12-17 / frank.schoenheit@sun.com
             *ppNewComp = new VCLXMultiLineEdit;
         }
         else
@@ -167,6 +168,21 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com::
             return NULL;
         }
     }
+    else if ( aServiceName.EqualsIgnoreCaseAscii( "Grid" ) )
+    {
+        if ( pParent )
+        {
+            ::svt::table::TableControl* m_pTable = new ::svt::table::TableControl(pParent, nWinBits);
+            UnoControlTableModel* pModel = new UnoControlTableModel();
+            *ppNewComp = pModel;
+            pWindow = m_pTable;
+        }
+        else
+        {
+            *ppNewComp = NULL;
+            return NULL;
+        }
+    }
     return pWindow;
 }