commit e1019ecb0c2bd79aeda8fa3e969daf3cb3952792
author Michael Meeks <michael.meeks@collabora.com> Fri Apr 17 21:59:29 2015 +0100
committer Michael Meeks <michael.meeks@collabora.com> Fri Apr 17 21:59:29 2015 +0100
tree 61745eea23b25854e09935d8fd8ce7bfdb4e2770
parent 62532bf14eb9185f32ea8831c38d8896c6ae29ad

Windows compilation fix in DX canvas.

Change-Id: I835b0d073885a452fc1031892ad2e59d8670cfac

canvas/source/directx/dx_devicehelper.cxx

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

canvas/source/directx/dx_devicehelper.hxx

diff --git a/canvas/source/directx/dx_devicehelper.hxx b/canvas/source/directx/dx_devicehelper.hxx
index da6091f..cdf1e943 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