diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-09-24 14:10:48 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-09-26 09:54:49 +0200 |
| commit | deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb (patch) | |
| tree | 3953ca620e27fed0442272fdabea9735fd6f3dcd /dbaccess/source/ui/control | |
| parent | a37e559ed123789f6bc8f7972242d6461ce692ab (diff) | |
now drop TabPageParent intermediate
Change-Id: I47328f76342ac023628d9042bdfa8213a1c93d0c
Reviewed-on: https://gerrit.libreoffice.org/79469
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/ColumnControlWindow.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/FieldDescControl.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/control/ColumnControlWindow.cxx b/dbaccess/source/ui/control/ColumnControlWindow.cxx index 20711d3e6b4e..f1ec5954edce 100644 --- a/dbaccess/source/ui/control/ColumnControlWindow.cxx +++ b/dbaccess/source/ui/control/ColumnControlWindow.cxx @@ -38,7 +38,7 @@ using namespace ::com::sun::star::lang; // OColumnControlWindow OColumnControlWindow::OColumnControlWindow(vcl::Window* pParent ,const Reference<XComponentContext>& _rxContext) - : OFieldDescControl(pParent,nullptr) + : OFieldDescControl(nullptr, pParent, nullptr) , m_xContext(_rxContext) , m_sTypeNames(DBA_RES(STR_TABLEDESIGN_DBFIELDTYPES)) , m_bAutoIncrementEnabled(true) diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index 86a1ed6eb6c0..1e4cfca41a3c 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -77,10 +77,10 @@ namespace } // class OFieldDescControl -OFieldDescControl::OFieldDescControl(TabPageParent pParent, OTableDesignHelpBar* pHelpBar) - :TabPage(pParent.pPage ? Application::GetDefDialogParent() : pParent.pParent.get(), WB_3DLOOK | WB_DIALOGCONTROL) - ,m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, "dbaccess/ui/fielddescpage.ui") - : Application::CreateInterimBuilder(this, "dbaccess/ui/fielddescpage.ui")) +OFieldDescControl::OFieldDescControl(weld::Container* pPage, vcl::Window* pParent, OTableDesignHelpBar* pHelpBar) + :TabPage(pPage ? Application::GetDefDialogParent() : pParent, WB_3DLOOK | WB_DIALOGCONTROL) + ,m_xBuilder(pPage ? Application::CreateBuilder(pPage, "dbaccess/ui/fielddescpage.ui") + : Application::CreateInterimBuilder(this, "dbaccess/ui/fielddescpage.ui")) ,m_xContainer(m_xBuilder->weld_container("FieldDescPage")) ,pHelp( pHelpBar ) ,m_pLastFocusWindow(nullptr) |