diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-04-11 21:21:53 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-04-13 09:57:54 +0200 |
| commit | 34d362b5c249f78ed05c5b069fa90e9597d29c04 (patch) | |
| tree | 637e9486b5420b62d38dab08cd2c03f62f3a3b2c /svtools | |
| parent | 63f6a1970868b3f8e5bc612f405d24ac9445ccea (diff) | |
drop ModalDialog non .ui ctor
Change-Id: Ib26f0b4d76c530e0aa67f74f6a6920b1883eb8e4
Reviewed-on: https://gerrit.libreoffice.org/52766
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/dialogs/roadmapwizard.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizardmachine.cxx | 12 | ||||
| -rw-r--r-- | svtools/source/dialogs/wizdlg.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/uno/wizard/wizardshell.cxx | 2 |
4 files changed, 1 insertions, 27 deletions
diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 281009f5f5e9..33d0a6d185d2 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -115,13 +115,6 @@ namespace svt } //= RoadmapWizard - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent, const WinBits i_nStyle ) - :OWizardMachine( _pParent, i_nStyle, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) - ,m_pImpl( new RoadmapWizardImpl ) - { - impl_construct(); - } - RoadmapWizard::RoadmapWizard( vcl::Window* _pParent ) :OWizardMachine( _pParent, WizardButtonFlags::NEXT | WizardButtonFlags::PREVIOUS | WizardButtonFlags::FINISH | WizardButtonFlags::CANCEL | WizardButtonFlags::HELP ) ,m_pImpl( new RoadmapWizardImpl ) diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index ae5bdac443d3..b1bbb41155a5 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -90,18 +90,6 @@ namespace svt } }; - OWizardMachine::OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ) - :WizardDialog( _pParent, i_nStyle ) - ,m_pFinish(nullptr) - ,m_pCancel(nullptr) - ,m_pNextPage(nullptr) - ,m_pPrevPage(nullptr) - ,m_pHelp(nullptr) - ,m_pImpl( new WizardMachineImplData ) - { - implConstruct( _nButtonFlags ); - } - OWizardMachine::OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ) :WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" ) ,m_pFinish(nullptr) diff --git a/svtools/source/dialogs/wizdlg.cxx b/svtools/source/dialogs/wizdlg.cxx index c0b3c3788c4a..20ac15d14c20 100644 --- a/svtools/source/dialogs/wizdlg.cxx +++ b/svtools/source/dialogs/wizdlg.cxx @@ -331,13 +331,6 @@ TabPage* WizardDialog::ImplGetPage( sal_uInt16 nLevel ) const return nullptr; } -WizardDialog::WizardDialog( vcl::Window* pParent, WinBits nStyle ) : - ModalDialog( pParent, nStyle ) -{ - ImplInitData(); -} - - WizardDialog::WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) : ModalDialog( pParent, rID, rUIXMLDescription ) { diff --git a/svtools/source/uno/wizard/wizardshell.cxx b/svtools/source/uno/wizard/wizardshell.cxx index b08e8a9662d3..5e6916d78287 100644 --- a/svtools/source/uno/wizard/wizardshell.cxx +++ b/svtools/source/uno/wizard/wizardshell.cxx @@ -52,7 +52,7 @@ namespace svt { namespace uno //= WizardShell WizardShell::WizardShell( vcl::Window* i_pParent, const Reference< XWizardController >& i_rController, const Sequence< Sequence< sal_Int16 > >& i_rPaths ) - :WizardShell_Base( i_pParent, WB_MOVEABLE | WB_CLOSEABLE ) + :WizardShell_Base( i_pParent ) ,m_xController( i_rController ) ,m_nFirstPageID( lcl_determineFirstPageID( i_rPaths ) ) { |