[Libreoffice-commits] core.git: 4 commits - chart2/Library_chartopengl.mk chart2/source include/vcl vcl/source

[Zolnai Tamás]

 chart2/Library_chartopengl.mk          |    1 +
 chart2/source/view/inc/DummyXShape.hxx |    3 ---
 include/vcl/OpenGLContext.hxx          |    3 ++-
 include/vcl/OpenGLRender.hxx           |    5 +++--
 include/vcl/vclopengl_dllapi.hxx       |   23 +++++++++++++++++++++++
 vcl/source/opengl/OpenGLContext.cxx    |    4 ++--
 6 files changed, 31 insertions(+), 8 deletions(-)

New commits:
commit 28469999d1d228db04c326398d84cf7034a7f391
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Mar 14 22:08:15 2014 +0100

    Define dllapi for vclopengl
    
    Change-Id: I0815dbf9f580e8fa092ebf485a60df61e2fdf15a

diff --git a/include/vcl/OpenGLContext.hxx b/include/vcl/OpenGLContext.hxx
index cc7a3e7..3731568 100644
--- a/include/vcl/OpenGLContext.hxx
+++ b/include/vcl/OpenGLContext.hxx
@@ -10,9 +10,10 @@
 #ifndef VCL_OPENGL_CONTEXT_HXX
 #define VCL_OPENGL_CONTEXT_HXX
 
+#include <vcl/vclopengl_dllapi.hxx>
 #include <vcl/OpenGLRender.hxx>
 
-class VCL_DLLPUBLIC OpenGLContext
+class VCLOPENGL_DLLPUBLIC OpenGLContext
 {
 public:
     bool init(OpenGLRender& rGLRender);
diff --git a/include/vcl/OpenGLRender.hxx b/include/vcl/OpenGLRender.hxx
index 2f7903a..022cac8 100755
--- a/include/vcl/OpenGLRender.hxx
+++ b/include/vcl/OpenGLRender.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/drawing/HomogenMatrix3.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <vcl/font.hxx>
+#include <vcl/vclopengl_dllapi.hxx>
 
 
 #if defined( _WIN32 )
@@ -93,7 +94,7 @@ typedef std::vector<GLfloat> PieSegment2DPointList;
 typedef std::vector<GLfloat> PointList;
 
 /// Holds the information of our new child window
-struct VCL_DLLPUBLIC GLWindow
+struct VCLOPENGL_DLLPUBLIC GLWindow
 {
 #if defined( _WIN32 )
     HWND                    hWnd;
@@ -143,7 +144,7 @@ struct VCL_DLLPUBLIC GLWindow
     }
 };
 
-class VCL_DLLPUBLIC OpenGLRender
+class VCLOPENGL_DLLPUBLIC OpenGLRender
 {
 public:
     OpenGLRender(com::sun::star::uno::Reference<
diff --git a/include/vcl/vclopengl_dllapi.hxx b/include/vcl/vclopengl_dllapi.hxx
new file mode 100644
index 0000000..0b3cac6
--- /dev/null
+++ b/include/vcl/vclopengl_dllapi.hxx
@@ -0,0 +1,23 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+#ifndef INCLUDED_VCL_INC_VCLOPENGL_DLLAPI_H
+#define INCLUDED_VCL_INC_VCLOPENGL_DLLAPI_H
+
+#include "sal/types.h"
+
+#if defined(VCLOPENGL_DLLIMPLEMENTATION)
+#define VCLOPENGL_DLLPUBLIC  SAL_DLLPUBLIC_EXPORT
+#else
+#define VCLOPENGL_DLLPUBLIC  SAL_DLLPUBLIC_IMPORT
+#endif
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit be147e18e738d3372924c0f6b9c99e2740bdc16a
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Mar 14 22:06:55 2014 +0100

    Fix build: namespace in wrong place.
    
    Change-Id: I1c13e8932b3b95267470963c2b64bb98026749dd

diff --git a/vcl/source/opengl/OpenGLContext.cxx b/vcl/source/opengl/OpenGLContext.cxx
index 70ec988..c19f8f5 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -12,8 +12,6 @@
 
 using namespace com::sun::star;
 
-namespace {
-
 #ifdef DBG_UTIL
 
 namespace {
@@ -100,6 +98,8 @@ debug_callback(GLenum source, GLenum type, GLuint id,
 
 #endif
 
+namespace {
+
 #if defined( UNX )
 static bool errorTriggered;
 int oglErrorHandler( Display* /*dpy*/, XErrorEvent* /*evnt*/ )
commit febe62cd6a501e046d35c6c3528e270c3cff0ebc
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Mar 14 21:53:14 2014 +0100

    Remove unused OpenGLContext struct
    
    Change-Id: I4a619794f42bfc13c5685899c81f21aff68a9b5e

diff --git a/chart2/source/view/inc/DummyXShape.hxx b/chart2/source/view/inc/DummyXShape.hxx
index 2862b23..d7e137d 100644
--- a/chart2/source/view/inc/DummyXShape.hxx
+++ b/chart2/source/view/inc/DummyXShape.hxx
@@ -71,9 +71,6 @@ namespace dummy {
 
 class DummyChart;
 
-struct OpenglContext;
-
-
 class TextCache
 {
 public:
commit 5b499dee163b36aac5944379dfb6eacd6e624b6b
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Fri Mar 14 21:51:05 2014 +0100

    Fix build: missing boost_headers
    
    Change-Id: I84a006d69a2ddf58fcd6d30f6e82a66a91c07456

diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
index 15260d4..5ca68bd 100644
--- a/chart2/Library_chartopengl.mk
+++ b/chart2/Library_chartopengl.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Library_set_include,chartopengl,\
 ))
 
 $(eval $(call gb_Library_use_externals,chartopengl,\
+	boost_headers \
 	mdds_headers \
 	glm_headers \
 	mesa_headers \