summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@collabora.com>2015-05-26 14:45:46 +0100
committerMichael Meeks <michael.meeks@collabora.com>2015-05-28 09:54:21 +0100
commitf21d3a080ffa6452bb69bd046a4d387e06b843b4 (patch)
tree52ebb9e4bf0c8a3e33224c60de776250dd9191d8
parentac633cec1b2b7d6f2ffaa128490f2b90f977b024 (diff)
tdf#91426 - fix DX canvas - missed by VclPtr / Clang plugin.
Change-Id: I7969746b159051d65ea974b89ba458d0d14f466a
-rw-r--r--canvas/source/directx/dx_9rm.cxx13
1 files changed, 6 insertions, 7 deletions
diff --git a/canvas/source/directx/dx_9rm.cxx b/canvas/source/directx/dx_9rm.cxx
index 34e393897839..ba03c5398563 100644
--- a/canvas/source/directx/dx_9rm.cxx
+++ b/canvas/source/directx/dx_9rm.cxx
@@ -226,7 +226,7 @@ namespace dxcanvas
COMReference<IDirect3DSwapChain9> mpSwapChain;
COMReference<IDirect3DVertexBuffer9> mpVertexBuffer;
::canvas::ISurfaceSharedPtr mpTexture;
- ::boost::scoped_ptr<SystemChildWindow> mpWindow;
+ VclPtr<SystemChildWindow> mpWindow;
::basegfx::B2IVector maSize;
typedef std::vector<canvas::Vertex> vertexCache_t;
vertexCache_t maVertexCache;
@@ -645,7 +645,7 @@ namespace dxcanvas
return;
mpTexture.reset();
- mpWindow.reset();
+ mpWindow.disposeAndClear();
mhWnd=NULL;
// refrain from releasing the DX9 objects. We're the only
@@ -663,12 +663,11 @@ namespace dxcanvas
// TODO(P2): get rid of those fine-grained locking
::osl::MutexGuard aGuard( maMutex );
- maVertexCache.reserve(1024);
+ maVertexCache.reserve( 1024 );
- mpWindow.reset(
- VclPtr<SystemChildWindow>::Create(
-
- const_cast<vcl::Window *>(&rWindow), 0) );
+ mpWindow.disposeAndClear();
+ mpWindow.reset( VclPtr<SystemChildWindow>::Create(
+ const_cast<vcl::Window *>(&rWindow), 0) );
// system child window must not receive mouse events
mpWindow->SetMouseTransparent( TRUE );