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, 13 insertions, 11 deletions

diff --git a/dbaccess/source/ui/uno/ColumnPeer.cxx b/dbaccess/source/ui/uno/ColumnPeer.cxx
index 9dc357eb2a8c..48f5fbce5692 100644
--- a/dbaccess/source/ui/uno/ColumnPeer.cxx
+++ b/dbaccess/source/ui/uno/ColumnPeer.cxx
@@ -36,7 +36,7 @@ OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext
 {
     osl_atomic_increment( &m_refCount );
     {
-        VclPtrInstance<OColumnControlWindow> pFieldControl(_pParent, _rxContext);
+        VclPtrInstance<OColumnControlTopLevel> pFieldControl(_pParent, _rxContext);
         pFieldControl->SetComponentInterface(this);
         pFieldControl->Show();
     }
@@ -46,19 +46,21 @@ OColumnPeer::OColumnPeer(vcl::Window* _pParent,const Reference<XComponentContext
 void OColumnPeer::setEditWidth(sal_Int32 _nWidth)
 {
     SolarMutexGuard aGuard;
-    VclPtr<OColumnControlWindow> pFieldControl = GetAs<OColumnControlWindow>();
+    VclPtr<OColumnControlTopLevel> pFieldControl = GetAs<OColumnControlTopLevel>();
     if ( pFieldControl )
-        pFieldControl->setEditWidth(_nWidth);
+        pFieldControl->GetControl().setEditWidth(_nWidth);
 }
 
 void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
 {
     SolarMutexGuard aGuard;
 
-    VclPtr<OColumnControlWindow> pFieldControl = GetAs<OColumnControlWindow>();
+    VclPtr<OColumnControlTopLevel> pFieldControl = GetAs<OColumnControlTopLevel>();
     if ( !pFieldControl )
         return;
 
+    OColumnControlWindow& rControl = pFieldControl->GetControl();
+
     if ( m_pActFieldDescr )
     {
         delete m_pActFieldDescr;
@@ -88,22 +90,22 @@ void OColumnPeer::setColumn(const Reference< XPropertySet>& _xColumn)
         m_pActFieldDescr = new OFieldDescription(_xColumn,true);
         // search for type
         bool bForce;
-        TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*pFieldControl->getTypeInfo(),nType,sTypeName,"x",nPrecision,nScale,bAutoIncrement,bForce);
+        TOTypeInfoSP pTypeInfo = ::dbaui::getTypeInfoFromType(*rControl.getTypeInfo(),nType,sTypeName,"x",nPrecision,nScale,bAutoIncrement,bForce);
         if ( !pTypeInfo )
-            pTypeInfo = pFieldControl->getDefaultTyp();
+            pTypeInfo = rControl.getDefaultTyp();
 
         m_pActFieldDescr->FillFromTypeInfo(pTypeInfo,true,false);
         m_xColumn = _xColumn;
     }
-    pFieldControl->DisplayData(m_pActFieldDescr);
+    rControl.DisplayData(m_pActFieldDescr);
 }
 
 void OColumnPeer::setConnection(const Reference< XConnection>& _xCon)
 {
     SolarMutexGuard aGuard;
-    VclPtr<OColumnControlWindow> pFieldControl = GetAs<OColumnControlWindow>();
+    VclPtr<OColumnControlTopLevel> pFieldControl = GetAs<OColumnControlTopLevel>();
     if ( pFieldControl )
-        pFieldControl->setConnection(_xCon);
+        pFieldControl->GetControl().setConnection(_xCon);
 }
 
 void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value)
@@ -127,14 +129,14 @@ void OColumnPeer::setProperty( const OUString& _rPropertyName, const Any& Value)
 Any OColumnPeer::getProperty( const OUString& _rPropertyName )
 {
     Any aProp;
-    VclPtr< OFieldDescControl > pFieldControl = GetAs< OFieldDescControl >();
+    VclPtr<OColumnControlTopLevel> pFieldControl = GetAs<OColumnControlTopLevel>();
     if (pFieldControl && _rPropertyName == PROPERTY_COLUMN)
     {
         aProp <<= m_xColumn;
     }
     else if (pFieldControl && _rPropertyName == PROPERTY_ACTIVE_CONNECTION)
     {
-        aProp <<= pFieldControl->getConnection();
+        aProp <<= pFieldControl->GetControl().getConnection();
     }
     else
         aProp = VCLXWindow::getProperty(_rPropertyName);