[Libreoffice-commits] core.git: Branch 'feature/vclptr' - canvas/source

[Michael Meeks]

 canvas/source/directx/dx_devicehelper.cxx |    6 +++++-
 canvas/source/directx/dx_devicehelper.hxx |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

New commits:
commit e1019ecb0c2bd79aeda8fa3e969daf3cb3952792
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Fri Apr 17 21:59:29 2015 +0100

    Windows compilation fix in DX canvas.
    
    Change-Id: I835b0d073885a452fc1031892ad2e59d8670cfac

diff --git a/canvas/source/directx/dx_devicehelper.cxx b/canvas/source/directx/dx_devicehelper.cxx
index cc82471..759bb0b 100644
--- a/canvas/source/directx/dx_devicehelper.cxx
+++ b/canvas/source/directx/dx_devicehelper.cxx
@@ -52,6 +52,10 @@ namespace dxcanvas
     {
     }
 
+    DeviceHelper::~DeviceHelper()
+    {
+    }
+
     void DeviceHelper::init( HDC hdc, OutputDevice* pOutDev,
                              rendering::XGraphicDevice& rDevice )
     {
@@ -191,7 +195,7 @@ namespace dxcanvas
 
     uno::Any DeviceHelper::getDeviceHandle() const
     {
-        return uno::makeAny( reinterpret_cast< sal_Int64 >(mpOutDev) );
+        return uno::makeAny( reinterpret_cast< sal_Int64 >(mpOutDev.get()) );
     }
 
     uno::Any DeviceHelper::getSurfaceHandle() const
diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index da6091f..cdf1e94 100644
--- a/canvas/source/directx/dx_devicehelper.hxx
+++ b/canvas/source/directx/dx_devicehelper.hxx
@@ -28,7 +28,7 @@
 #include "dx_bitmap.hxx"
 
 #include <canvas/rendering/isurfaceproxymanager.hxx>
-#include <vcl/outdev.hxx>
+#include <vcl/vclptr.hxx>
 #include <boost/utility.hpp>
 
 class OutputDevice;
@@ -40,6 +40,7 @@ namespace dxcanvas
     {
     public:
         DeviceHelper();
+        ~DeviceHelper();
 
         /** Init the device helper