diff options
| author | Noel Grandin <noel@peralex.com> | 2015-03-20 11:27:10 +0200 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 12:37:44 +0100 |
| commit | 61b224f392eb856bf4cfa0c04c68202a463cbdbf (patch) | |
| tree | 77a28e38763bc5f9d95e2c278601d31dc6fbf65d /vcl/workben | |
| parent | f1d9eef4163e88a3cb6360178b52ce441e65d8ae (diff) | |
vclwidget: fixup locally allocated vcl::Window objects
They need to be wrapped in ScopedVclPtr in order to be disposed properly.
Change-Id: Ib64dba353774f54711e4de7f5d15d859c6a4dc7e
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/outdevgrind.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svdem.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svpclient.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/svptest.cxx | 2 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/vcl/workben/outdevgrind.cxx b/vcl/workben/outdevgrind.cxx index cf7a0d0ea8a2..d53074847f90 100644 --- a/vcl/workben/outdevgrind.cxx +++ b/vcl/workben/outdevgrind.cxx @@ -898,7 +898,7 @@ sal_uInt16 GrindApp::Exception( sal_uInt16 nError ) int GrindApp::Main() { - VclPtr<TestWindow> aWindow(new TestWindow); + ScopedVclPtr<TestWindow> aWindow(new TestWindow); aWindow->Execute(); return 0; } diff --git a/vcl/workben/svdem.cxx b/vcl/workben/svdem.cxx index 6b2e233f9c78..f2cdb6eaebac 100644 --- a/vcl/workben/svdem.cxx +++ b/vcl/workben/svdem.cxx @@ -81,7 +81,7 @@ public: void Main() { - VclPtr<MyWin> aMainWin(new MyWin(NULL, WB_APP | WB_STDWORK) ); + ScopedVclPtr<MyWin> aMainWin(new MyWin(NULL, WB_APP | WB_STDWORK) ); aMainWin->SetText(OUString("VCL - Workbench")); aMainWin->Show(); diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index ee218bb80687..cda0b34bf521 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -121,7 +121,7 @@ public: void Main() { - VclPtr<MyWin> aMainWin(new MyWin(NULL, WB_STDWORK) ); + ScopedVclPtr<MyWin> aMainWin(new MyWin(NULL, WB_STDWORK) ); aMainWin->SetText( OUString( "SvpClient" ) ); aMainWin->Show(); diff --git a/vcl/workben/svptest.cxx b/vcl/workben/svptest.cxx index ea6988633d94..70c769b71719 100644 --- a/vcl/workben/svptest.cxx +++ b/vcl/workben/svptest.cxx @@ -91,7 +91,7 @@ public: void Main() { - VclPtr<MyWin> aMainWin(new MyWin(NULL, WB_APP | WB_STDWORK) ); + ScopedVclPtr<MyWin> aMainWin(new MyWin(NULL, WB_APP | WB_STDWORK) ); aMainWin->SetText( OUString( "VCL - Workbench" ) ); aMainWin->Show(); diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 4c4358ae4cbe..a7c0cfa503ff 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1617,7 +1617,7 @@ public: } } - VclPtr<DemoWin> aMainWin(new DemoWin(aRenderer, bThreads)); + ScopedVclPtrInstance<DemoWin> aMainWin(aRenderer, bThreads); VclPtr<DemoWidgets> aWidgets; VclPtr<DemoPopup> xPopup; |