From 5430eb76db1ca40248717bcbee6b65e56c1a0e9b Mon Sep 17 00:00:00 2001 From: Michael Meeks Date: Thu, 16 Apr 2015 20:50:12 +0100 Subject: [PATCH] slideshow: convert new to ::Create to get initial ref-counting right. Change-Id: I513dacfa0dd2e902437578611b6d39575f2e7314 --- slideshow/source/engine/shapes/viewmediashape.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index afddec0b6b51..f026b21a8eb2 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -471,20 +471,20 @@ namespace slideshow #else if( avmedia::IsModel(rMimeType) ) { - mpEventHandlerParent.reset(new vcl::Window(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); + mpEventHandlerParent.reset(VclPtr::Create(pWindow, WB_NOBORDER|WB_NODIALOGCONTROL)); mpEventHandlerParent->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); mpEventHandlerParent->EnablePaint(false); mpEventHandlerParent->Show(); SystemWindowData aWinData = OpenGLContext::generateWinData(mpEventHandlerParent.get(), false); - mpMediaWindow.reset(new SystemChildWindow(mpEventHandlerParent.get(), 0, &aWinData)); + mpMediaWindow.reset(VclPtr::Create(mpEventHandlerParent.get(), 0, &aWinData)); mpMediaWindow->SetPosSizePixel( Point( 0, 0 ), Size( aAWTRect.Width, aAWTRect.Height ) ); } else #endif { - mpMediaWindow.reset( new SystemChildWindow( pWindow, WB_CLIPCHILDREN ) ); + mpMediaWindow.reset( VclPtr::Create( pWindow, WB_CLIPCHILDREN ) ); mpMediaWindow->SetPosSizePixel( Point( aAWTRect.X, aAWTRect.Y ), Size( aAWTRect.Width, aAWTRect.Height ) ); }