diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-06-05 16:37:49 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-06-05 19:45:12 +0000 |
| commit | 7aae8772aa18744cb1bbd8348272be99cc882c47 (patch) | |
| tree | c4824605af0def9fe11cb1c302f9b0e18993c06e /vcl/qa | |
| parent | b9f95769495e8d9885b64f1d68118336a4fc8d38 (diff) | |
Clear VclPtr instance reference on removed UserEvents.
Also extend VclPtr lifecycle test.
Change-Id: I4d989375ca02327216eb1f37e466aefdb733579d
Reviewed-on: https://gerrit.libreoffice.org/16107
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'vcl/qa')
| -rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index afc77b3de78f..3b78d5346d19 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -19,6 +19,7 @@ #include <vcl/tabctrl.hxx> #include <vcl/dialog.hxx> #include <vcl/layout.hxx> +#include <vcl/svapp.hxx> class LifecycleTest : public test::BootstrapFixture { @@ -247,6 +248,7 @@ void LifecycleTest::testLeakage() // Create objects aObjects.push_back(LeakTestObject::Create<WorkWindow>(nullptr, WB_APP|WB_STDWORK)); VclPtr<vcl::Window> xParent = aObjects.back()->getRef(); + aObjects.push_back(LeakTestObject::Create<PushButton>(xParent)); aObjects.push_back(LeakTestObject::Create<OKButton>(xParent)); aObjects.push_back(LeakTestObject::Create<CancelButton>(xParent)); @@ -256,20 +258,18 @@ void LifecycleTest::testLeakage() aObjects.push_back(LeakTestObject::Create<ComboBox>(xParent)); aObjects.push_back(LeakTestObject::Create<RadioButton>(xParent)); -#if 0 { // something that looks like a dialog aObjects.push_back(LeakTestObject::Create<Dialog>(xParent,WB_CLIPCHILDREN|WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_SIZEABLE)); VclPtr<vcl::Window> xDlgParent = aObjects.back()->getRef(); - aObjects.push_back(LeakTestObject::Create<VclVBox>(xDlgParent)); VclPtr<vcl::Window> xVBox = aObjects.back()->getRef(); - 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")); - aObjects.push_back(LeakTestObject::Create<ModalDialog>(xParent)); #endif + aObjects.push_back(LeakTestObject::Create<ModalDialog>(xParent)); xParent.clear(); for (auto i = aObjects.rbegin(); i != aObjects.rend(); ++i) |