Kaydet (Commit) f21d3a08 authored tarafından Michael Meeks's avatar Michael Meeks

tdf#91426 - fix DX canvas - missed by VclPtr / Clang plugin.

Change-Id: I7969746b159051d65ea974b89ba458d0d14f466a
üst ac633cec
...@@ -226,7 +226,7 @@ namespace dxcanvas ...@@ -226,7 +226,7 @@ namespace dxcanvas
COMReference<IDirect3DSwapChain9> mpSwapChain; COMReference<IDirect3DSwapChain9> mpSwapChain;
COMReference<IDirect3DVertexBuffer9> mpVertexBuffer; COMReference<IDirect3DVertexBuffer9> mpVertexBuffer;
::canvas::ISurfaceSharedPtr mpTexture; ::canvas::ISurfaceSharedPtr mpTexture;
::boost::scoped_ptr<SystemChildWindow> mpWindow; VclPtr<SystemChildWindow> mpWindow;
::basegfx::B2IVector maSize; ::basegfx::B2IVector maSize;
typedef std::vector<canvas::Vertex> vertexCache_t; typedef std::vector<canvas::Vertex> vertexCache_t;
vertexCache_t maVertexCache; vertexCache_t maVertexCache;
...@@ -645,7 +645,7 @@ namespace dxcanvas ...@@ -645,7 +645,7 @@ namespace dxcanvas
return; return;
mpTexture.reset(); mpTexture.reset();
mpWindow.reset(); mpWindow.disposeAndClear();
mhWnd=NULL; mhWnd=NULL;
// refrain from releasing the DX9 objects. We're the only // refrain from releasing the DX9 objects. We're the only
...@@ -663,11 +663,10 @@ namespace dxcanvas ...@@ -663,11 +663,10 @@ namespace dxcanvas
// TODO(P2): get rid of those fine-grained locking // TODO(P2): get rid of those fine-grained locking
::osl::MutexGuard aGuard( maMutex ); ::osl::MutexGuard aGuard( maMutex );
maVertexCache.reserve(1024); maVertexCache.reserve( 1024 );
mpWindow.reset(
VclPtr<SystemChildWindow>::Create(
mpWindow.disposeAndClear();
mpWindow.reset( VclPtr<SystemChildWindow>::Create(
const_cast<vcl::Window *>(&rWindow), 0) ); const_cast<vcl::Window *>(&rWindow), 0) );
// system child window must not receive mouse events // system child window must not receive mouse events
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment