diff options
-rw-r--r-- | include/svtools/roadmapwizard.hxx | 4 | ||||
-rw-r--r-- | include/svtools/wizardmachine.hxx | 1 | ||||
-rw-r--r-- | include/svtools/wizdlg.hxx | 1 | ||||
-rw-r--r-- | include/vcl/dialog.hxx | 1 | ||||
-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 | ||||
-rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 4 | ||||
-rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
10 files changed, 2 insertions, 43 deletions
diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index f08add2269e2..30f58d6f13d3 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -67,10 +67,6 @@ namespace svt public: RoadmapWizard( - vcl::Window* _pParent, - const WinBits i_nStyle - ); - RoadmapWizard( vcl::Window* _pParent ); virtual ~RoadmapWizard( ) override; diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx index 2bb25bba8a13..68ad14a134bf 100644 --- a/include/svtools/wizardmachine.hxx +++ b/include/svtools/wizardmachine.hxx @@ -169,7 +169,6 @@ namespace svt std::unique_ptr<WizardMachineImplData> m_pImpl; public: - OWizardMachine(vcl::Window* _pParent, const WinBits i_nStyle, WizardButtonFlags _nButtonFlags ); OWizardMachine(vcl::Window* _pParent, WizardButtonFlags _nButtonFlags ); virtual ~OWizardMachine() override; virtual void dispose() override; diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx index 1dc2e48b69c7..7d8b54e33119 100644 --- a/include/svtools/wizdlg.hxx +++ b/include/svtools/wizdlg.hxx @@ -218,7 +218,6 @@ private: SVT_DLLPRIVATE TabPage* ImplGetPage( sal_uInt16 nLevel ) const; public: - WizardDialog( vcl::Window* pParent, WinBits nStyle ); WizardDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); virtual ~WizardDialog() override; virtual void dispose() override; diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 45f76c1e5521..36f88b8feb45 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -195,7 +195,6 @@ public: class VCL_DLLPUBLIC ModalDialog : public Dialog { public: - explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL ); explicit ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, bool bBorder = false ); protected: 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 ) ) { diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index 26f8796a57ea..118114736c6a 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -299,10 +299,8 @@ void LifecycleTest::testLeakage() aObjects.push_back(LeakTestObject::Create<VclVButtonBox>(xVBox)); } -#if 0 // FIXME - would be good to get internal paths working. aObjects.push_back(LeakTestObject::Create<ModelessDialog>(xParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui")); -#endif - aObjects.push_back(LeakTestObject::Create<ModalDialog>(xParent)); + aObjects.push_back(LeakTestObject::Create<ModalDialog>(xParent, "PrintProgressDialog", "vcl/ui/printprogressdialog.ui")); xParent.clear(); for (auto i = aObjects.rbegin(); i != aObjects.rend(); ++i) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a5450b582870..39c02f3efc28 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1446,12 +1446,6 @@ ModelessDialog::ModelessDialog(vcl::Window* pParent, const OUString& rID, const { } -ModalDialog::ModalDialog( vcl::Window* pParent, WinBits nStyle ) : - Dialog( WindowType::MODALDIALOG ) -{ - ImplInit( pParent, nStyle ); -} - ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, bool bBorder ) : Dialog(pParent, rID, rUIXMLDescription, WindowType::MODALDIALOG, InitFlag::Default, bBorder) { |