From 282c16a3713e23b3a594e7d3fbaa5b36491b86f6 Mon Sep 17 00:00:00 2001
From: Markus Mohrhard <markus.mohrhard@googlemail.com>
Date: Mon, 11 Aug 2014 21:04:20 +0200
Subject: fix OpenGL canvas windows build

Change-Id: Ic6ed9c69003fa79a60310dc0b010ffc0ca868791
---
 canvas/Library_oglcanvas.mk                     | 1 +
 canvas/source/opengl/ogl_canvasbitmap.cxx       | 2 +-
 canvas/source/opengl/ogl_canvascustomsprite.cxx | 2 +-
 canvas/source/opengl/ogl_spritecanvas.cxx       | 2 +-
 canvas/source/opengl/ogl_spritedevicehelper.cxx | 3 +++
 canvas/source/opengl/ogl_spritedevicehelper.hxx | 1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'canvas')

diff --git a/canvas/Library_oglcanvas.mk b/canvas/Library_oglcanvas.mk
index a5efb6b3b226..b5d33774c518 100644
--- a/canvas/Library_oglcanvas.mk
+++ b/canvas/Library_oglcanvas.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Library_add_exception_objects,oglcanvas,\
 $(eval $(call gb_Library_use_externals,oglcanvas,\
 	boost_headers \
 	glew \
+	mesa_headers \
 ))
 
 ifeq ($(strip $(OS)),MACOSX)
diff --git a/canvas/source/opengl/ogl_canvasbitmap.cxx b/canvas/source/opengl/ogl_canvasbitmap.cxx
index d78baf58bd97..b7c5d9bd3e01 100644
--- a/canvas/source/opengl/ogl_canvasbitmap.cxx
+++ b/canvas/source/opengl/ogl_canvasbitmap.cxx
@@ -38,7 +38,7 @@ namespace oglcanvas
         maCanvasHelper = rSrc.maCanvasHelper;
     }
 
-    void SAL_CALL CanvasBitmap::disposeThis()
+    void CanvasBitmap::disposeThis()
     {
         mpDevice.clear();
 
diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx
index 2f2853e78543..f088180c98cd 100644
--- a/canvas/source/opengl/ogl_canvascustomsprite.cxx
+++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx
@@ -50,7 +50,7 @@ namespace oglcanvas
                              rDeviceHelper );
     }
 
-    void SAL_CALL CanvasCustomSprite::disposeThis()
+    void CanvasCustomSprite::disposeThis()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx
index 3073e2b1d571..c965b9f5e571 100644
--- a/canvas/source/opengl/ogl_spritecanvas.cxx
+++ b/canvas/source/opengl/ogl_spritecanvas.cxx
@@ -80,7 +80,7 @@ namespace oglcanvas
         maArguments.realloc(0);
     }
 
-    void SAL_CALL SpriteCanvas::disposeThis()
+    void SpriteCanvas::disposeThis()
     {
         ::osl::MutexGuard aGuard( m_aMutex );
 
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx
index 76da6e1565ce..72df0e9b32a9 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.cxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx
@@ -90,6 +90,9 @@ namespace oglcanvas
         mnRectangularMultiColorGradientProgram(0)
     {}
 
+    SpriteDeviceHelper::~SpriteDeviceHelper()
+    {}
+
     void SpriteDeviceHelper::init( Window&               rWindow,
                                    SpriteCanvas&         rSpriteCanvas,
                                    const awt::Rectangle& rViewArea )
diff --git a/canvas/source/opengl/ogl_spritedevicehelper.hxx b/canvas/source/opengl/ogl_spritedevicehelper.hxx
index f43a3af3efda..bb4a976985a1 100644
--- a/canvas/source/opengl/ogl_spritedevicehelper.hxx
+++ b/canvas/source/opengl/ogl_spritedevicehelper.hxx
@@ -41,6 +41,7 @@ namespace oglcanvas
     {
     public:
         SpriteDeviceHelper();
+        ~SpriteDeviceHelper();
 
         void init( Window&                                 rWindow,
                    SpriteCanvas&                           rSpriteCanvas,
-- 
cgit