commit 07f3d95b3d5201f758906c5cd5286f0d54c12672
author Michael Meeks <michael.meeks@collabora.com> Tue Mar 31 20:25:31 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 10 13:26:59 2015 +0100
tree 6c15abea04e83c92900bec7f190ca55288badd17
parent 3072f80c53adebe1242f90b16cf4e83064cb4f4f

vcl: stop vcl::Window clobbering mnRefCnt itself.

Change-Id: If1926c8ecc94c3b9786a3f255371b440c482a155

vcl/qa/cppunit/lifecycle.cxx

diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index cbe0ef6..5f5f4e3 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();

vcl/source/window/window.cxx

diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 89679ba..bcf21e9 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;