drop intermediate TabPage

OColumnControlWindow can be seen used in "use wizard to create table" from base

Change-Id: Ib59b487c6711321550c1b516986ef20df402b171
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99414
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

1 files changed, 26 insertions, 3 deletions

diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx
index 28a77291ce13..8f9186b01ccb 100644
--- a/dbaccess/source/ui/control/ColumnControlWindow.cxx
+++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx
@@ -34,10 +34,33 @@ using namespace ::com::sun::star::util;
 using namespace ::com::sun::star::sdbc;
 using namespace ::com::sun::star::lang;
 
+OColumnControlTopLevel::OColumnControlTopLevel(vcl::Window* pParent,
+                                               const Reference<XComponentContext>& _rxContext)
+    : InterimItemWindow(pParent, "dbaccess/ui/colcontrolbox.ui", "ColControlBox")
+    , m_xControl(new OColumnControlWindow(m_xContainer.get(), _rxContext))
+{
+}
+
+void OColumnControlTopLevel::dispose()
+{
+    m_xControl.reset();
+    InterimItemWindow::dispose();
+}
+
+void OColumnControlTopLevel::GetFocus()
+{
+    m_xControl->GetFocus();
+}
+
+void OColumnControlTopLevel::LoseFocus()
+{
+    m_xControl->LoseFocus();
+}
+
 // OColumnControlWindow
-OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent
-                                           ,const Reference<XComponentContext>& _rxContext)
-            : OFieldDescControl(nullptr, pParent, nullptr)
+OColumnControlWindow::OColumnControlWindow(weld::Container* pParent,
+                                           const Reference<XComponentContext>& _rxContext)
+            : OFieldDescControl(pParent, nullptr)
             , m_xContext(_rxContext)
             , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES))
             , m_bAutoIncrementEnabled(true)