From a37e559ed123789f6bc8f7972242d6461ce692ab Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 20 Sep 2019 20:29:36 +0100 Subject: disinherit OWizardPage and SfxTabPage from vcl TabPage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that there's no need to support weld/unwelded mixes of pages in dialog any more. inherit from a BuilderPage which contains a Builder and Toplevel container BuilderPage Activate and Deactivate replace TabPage ActivatePage and DeactivatePage, allowing disambiguation wrt SfxTabPage ActivatePage and DeactivatePage. Change-Id: I5706e50fd92f712a25328ee9791e054bb9ad9812 Reviewed-on: https://gerrit.libreoffice.org/79317 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dbaccess/source/ui/misc/WColumnSelect.cxx | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) (limited to 'dbaccess/source/ui/misc/WColumnSelect.cxx') diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 89fd3a86bc41..5939edaacbed 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -44,10 +44,7 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper OUString OWizColumnSelect::GetTitle() const { return DBA_RES(STR_WIZ_COLUMN_SELECT_TITEL); } OWizardPage::OWizardPage(OCopyTableWizard* pWizard, TabPageParent pParent, const OUString& rUIXMLDescription, const OString& rID) - : TabPage(pParent.pPage ? Application::GetDefDialogParent() : pParent.pParent.get()) //just drag this along hidden in this scenario - , m_xBuilder(pParent.pPage ? Application::CreateBuilder(pParent.pPage, rUIXMLDescription) - : Application::CreateInterimBuilder(this, rUIXMLDescription)) - , m_xContainer(m_xBuilder->weld_container(rID)) + : ::vcl::OWizardPage(pParent, rUIXMLDescription, rID) , m_pParent(pWizard) , m_bFirstTime(true) { @@ -80,18 +77,12 @@ OWizColumnSelect::OWizColumnSelect(OCopyTableWizard* pWizard, TabPageParent pPar } OWizColumnSelect::~OWizColumnSelect() -{ - disposeOnce(); -} - -void OWizColumnSelect::dispose() { while (m_xNewColumnNames->n_children()) { delete reinterpret_cast(m_xNewColumnNames->get_id(0).toInt64()); m_xNewColumnNames->remove(0); } - OWizardPage::dispose(); } void OWizColumnSelect::Reset() @@ -116,7 +107,7 @@ void OWizColumnSelect::Reset() m_bFirstTime = false; } -void OWizColumnSelect::ActivatePage( ) +void OWizColumnSelect::Activate( ) { // if there are no dest columns reset the left side with the original columns if(m_pParent->getDestColumns().empty()) -- cgit