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 /vcl | |
| 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 'vcl')
| -rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 6 |
2 files changed, 1 insertions, 9 deletions
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) { |