[Libreoffice-commits] core.git: Branch 'feature/vclref' - vcl/qa

Michael Meeks michael.meeks at collabora.com
Fri Mar 13 14:14:18 PDT 2015


 vcl/qa/cppunit/lifecycle.cxx |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit a486815fad8f243708eeef0860d1e6eb4f250283
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Mar 13 21:18:16 2015 +0000

    vcl: fix lifecycle test to disposeOnce.
    
    Change-Id: Idef33e0b8e6c986c8808c2b611c5f4b6632e7511

diff --git a/vcl/qa/cppunit/lifecycle.cxx b/vcl/qa/cppunit/lifecycle.cxx
index d73dcc8..04a4719 100644
--- a/vcl/qa/cppunit/lifecycle.cxx
+++ b/vcl/qa/cppunit/lifecycle.cxx
@@ -57,9 +57,9 @@ void LifecycleTest::testMultiDispose()
     VclPtr<WorkWindow> xWin(new WorkWindow((vcl::Window *)NULL,
                                            WB_APP|WB_STDWORK));
     CPPUNIT_ASSERT(xWin.get() != NULL);
-    xWin->dispose();
-    xWin->dispose();
-    xWin->dispose();
+    xWin->disposeOnce();
+    xWin->disposeOnce();
+    xWin->disposeOnce();
     CPPUNIT_ASSERT(xWin->GetWindow(0) == NULL);
     CPPUNIT_ASSERT(xWin->GetChild(0) == NULL);
     CPPUNIT_ASSERT(xWin->GetChildCount() == 0);
@@ -113,8 +113,8 @@ void LifecycleTest::testChildDispose()
     CPPUNIT_ASSERT(xWin.get() != NULL);
     VclPtr<DisposableChild> xChild(new DisposableChild(xWin.get()));
     xWin->Show();
-    xChild->dispose();
-    xWin->dispose();
+    xChild->disposeOnce();
+    xWin->disposeOnce();
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(LifecycleTest);


More information about the Libreoffice-commits mailing list