diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-01-22 14:49:55 +0100 |
| commit | a1d57594cffc6d93bb637247a74c86f138b8ffc5 (patch) | |
| tree | 3c6473872ecaeac1ce5138a4f06a800372219e83 /svtools/source/uno/unoiface.cxx | |
| parent | d919fae167e345762843da3e50054963dcc5cf45 (diff) | |
| parent | 8765a3bf9f2926a50d0f644e4263782269abe023 (diff) | |
cbosdo02: merging changesets up to DEV300_m69
Diffstat (limited to 'svtools/source/uno/unoiface.cxx')
| -rw-r--r-- | svtools/source/uno/unoiface.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index 54cc448ff89e..a1ff1ad2ac3e 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -48,14 +48,13 @@ #include <toolkit/helper/convert.hxx> #include <toolkit/helper/property.hxx> #include <svtools/fmtfield.hxx> -#include <numuno.hxx> +#include <svl/numuno.hxx> #include <calendar.hxx> #include <prgsbar.hxx> #include <svtools/svtreebx.hxx> #include "treecontrolpeer.hxx" -//#include "vclxgridcontrol.hxx" -#include "unocontroltablemodel.hxx" +#include "svtxgridcontrol.hxx" #include <svtools/table/tablecontrol.hxx> namespace @@ -172,10 +171,8 @@ SAL_DLLPUBLIC_EXPORT Window* CreateWindow( VCLXWindow** ppNewComp, const ::com:: { if ( pParent ) { - ::svt::table::TableControl* m_pTable = new ::svt::table::TableControl(pParent, nWinBits); - UnoControlTableModel* pModel = new UnoControlTableModel(); - *ppNewComp = pModel; - pWindow = m_pTable; + pWindow = new ::svt::table::TableControl(pParent, nWinBits); + *ppNewComp = new SVTXGridControl; } else { |