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

[Caolán McNamara]

 chart2/source/view/main/3DChartObjects.cxx |    1 +
 include/vcl/opengl/GLMHelper.hxx           |   24 ++++++++++++++++++++++++
 include/vcl/opengl/OpenGLHelper.hxx        |    7 -------
 vcl/source/opengl/OpenGLHelper.cxx         |    1 +
 4 files changed, 26 insertions(+), 7 deletions(-)

New commits:
commit 9ab9d22f820831e16551f90105edaea5319c528e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Jul 21 14:37:25 2014 +0100

    split helper and fix build
    
    Change-Id: Ie479d363152d3c6a109d6e924b09c155c79511c8

diff --git a/chart2/source/view/main/3DChartObjects.cxx b/chart2/source/view/main/3DChartObjects.cxx
index c5df687..9786c00 100644
--- a/chart2/source/view/main/3DChartObjects.cxx
+++ b/chart2/source/view/main/3DChartObjects.cxx
@@ -11,6 +11,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 
+#include <vcl/opengl/GLMHelper.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 #include <vcl/bmpacc.hxx>
 
diff --git a/include/vcl/opengl/GLMHelper.hxx b/include/vcl/opengl/GLMHelper.hxx
new file mode 100644
index 0000000..8287c34
--- /dev/null
+++ b/include/vcl/opengl/GLMHelper.hxx
@@ -0,0 +1,24 @@
+/* -*- 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_GLM_GLMHELPER_HXX
+#define INCLUDED_VCL_GLM_GLMHELPER_HXX
+
+#include "glm/glm.hpp"
+#include <vcl/vclopengl_dllapi.hxx>
+
+#include <ostream>
+
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
+VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/opengl/OpenGLHelper.hxx b/include/vcl/opengl/OpenGLHelper.hxx
index 87a71fa..f80d34b 100644
--- a/include/vcl/opengl/OpenGLHelper.hxx
+++ b/include/vcl/opengl/OpenGLHelper.hxx
@@ -11,14 +11,11 @@
 #define INCLUDED_VCL_OPENGL_OPENGLHELPER_HXX
 
 #include <GL/glew.h>
-#include "glm/glm.hpp"
 #include <vcl/vclopengl_dllapi.hxx>
 #include <vcl/bitmapex.hxx>
 
 #include <rtl/ustring.hxx>
 
-#include <ostream>
-
 class VCLOPENGL_DLLPUBLIC OpenGLHelper
 {
 public:
@@ -41,10 +38,6 @@ public:
     static float getGLVersion();
 };
 
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::mat4& rMatrix);
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec4& rPos);
-VCLOPENGL_DLLPUBLIC std::ostream& operator<<(std::ostream& rStrm, const glm::vec3& rPos);
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index 0629d90..84a1399 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <vcl/opengl/GLMHelper.hxx>
 #include <vcl/opengl/OpenGLHelper.hxx>
 
 #include <osl/file.hxx>