diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-03-31 20:25:31 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-04-10 13:26:59 +0100 |
| commit | 07f3d95b3d5201f758906c5cd5286f0d54c12672 (patch) | |
| tree | 6c15abea04e83c92900bec7f190ca55288badd17 | |
| parent | automated VclPtrInstance conversion. (diff) | |
| download | core-07f3d95b3d5201f758906c5cd5286f0d54c12672.tar.gz core-07f3d95b3d5201f758906c5cd5286f0d54c12672.zip | |
vcl: stop vcl::Window clobbering mnRefCnt itself.
Change-Id: If1926c8ecc94c3b9786a3f255371b440c482a155
| -rw-r--r-- | vcl/qa/cppunit/lifecycle.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/window/window.cxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx index cbe0ef62b096..5f5f4e30f749 100644 --- a/vcl/qa/cppunit/lifecycle.cxx +++ b/vcl/qa/cppunit/lifecycle.cxx @@ -68,8 +68,7 @@ void LifecycleTest::testVirtualDevice() void LifecycleTest::testMultiDispose() { - VclPtrInstance<WorkWindow> xWin((vcl::Window *)NULL, - WB_APP|WB_STDWORK); + VclPtrInstance<WorkWindow> xWin(nullptr, WB_APP|WB_STDWORK); CPPUNIT_ASSERT(xWin.get() != NULL); xWin->disposeOnce(); xWin->disposeOnce(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 89679bab4be1..bcf21e923a0b 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -1211,7 +1211,6 @@ void Window::ImplInitAppFontData( vcl::Window* pWindow ) void Window::ImplInitWindowData( WindowType nType ) { - mnRefCnt = 0; mpWindowImpl = new WindowImpl( nType ); meOutDevType = OUTDEV_WINDOW; |