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 /extensions/source/dbpilots/gridwizard.cxx | |
| parent | disinherit OWizardPage and SfxTabPage from vcl TabPage (diff) | |
| download | core-deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb.tar.gz core-deb37c44ecfb8f6aa7c2ceec4771b0505fa7b6bb.zip | |
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 'extensions/source/dbpilots/gridwizard.cxx')
| -rw-r--r-- | extensions/source/dbpilots/gridwizard.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/extensions/source/dbpilots/gridwizard.cxx b/extensions/source/dbpilots/gridwizard.cxx index 2fc497e720bf..aba9a1f46506 100644 --- a/extensions/source/dbpilots/gridwizard.cxx +++ b/extensions/source/dbpilots/gridwizard.cxx @@ -220,15 +220,13 @@ namespace dbp { OString sIdent(OString::number(_nState)); weld::Container* pPageContainer = m_xAssistant->append_page(sIdent); - // TODO eventually pass DialogController as distinct argument instead of bundling into TabPageParent - TabPageParent aParent(pPageContainer, this); switch (_nState) { case GW_STATE_DATASOURCE_SELECTION: - return std::make_unique<OTableSelectionPage>(this, aParent); + return std::make_unique<OTableSelectionPage>(pPageContainer, this); case GW_STATE_FIELDSELECTION: - return std::make_unique<OGridFieldsSelection>(this, aParent); + return std::make_unique<OGridFieldsSelection>(pPageContainer, this); } return nullptr; @@ -283,8 +281,8 @@ namespace dbp return true; } - OGridFieldsSelection::OGridFieldsSelection(OGridWizard* pParent, TabPageParent pPageParent) - : OGridPage(pParent, pPageParent, "modules/sabpilot/ui/gridfieldsselectionpage.ui", "GridFieldsSelection") + OGridFieldsSelection::OGridFieldsSelection(weld::Container* pPage, OGridWizard* pWizard) + : OGridPage(pPage, pWizard, "modules/sabpilot/ui/gridfieldsselectionpage.ui", "GridFieldsSelection") , m_xExistFields(m_xBuilder->weld_tree_view("existingfields")) , m_xSelectOne(m_xBuilder->weld_button("fieldright")) , m_xSelectAll(m_xBuilder->weld_button("allfieldsright")) |