summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2013-06-04 14:02:48 +0100
committerMichael Meeks <michael.meeks@suse.com>2013-06-04 17:45:42 +0100
commitc32c11fbd49e0194534be9d21c22da6799728be3 (patch)
tree2ce05f2cd61416625dc31d7d9ff7fb278b8c4fb1 /slideshow
parentea9b4a69469cbd8bdbbd972638612632adf31d66 (diff)
MPLv2 subset improvements.
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx11
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx2
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx2
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h2
-rw-r--r--slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx2
-rw-r--r--slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx2
6 files changed, 21 insertions, 0 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
index ea8bdb6739b6..9e0445270594 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.cxx
@@ -24,8 +24,19 @@
* <http://www.openoffice.org/license.html>
* for a copy of the LGPLv3 License.
*
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
************************************************************************/
+#include <config_lgpl.h>
+
#include <osl/diagnose.hxx>
#include "OGLTrans_Shaders.hxx"
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx
index d6a2cb66e8a3..bb2aa9d13847 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_Shaders.hxx
@@ -29,6 +29,8 @@
#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
#define INCLUDED_OGLTRANS_SHADERS_HXX_
+#include <config_lgpl.h>
+
#define GL_GLEXT_PROTOTYPES 1
#include <GL/gl.h>
#include <GL/glext.h>
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
index d67fdc751b61..b74552652f76 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.hxx
@@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
+#include <config_lgpl.h>
+
#include <boost/noncopyable.hpp>
#include <boost/shared_ptr.hpp>
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h
index 358630beb583..e739a2da1044 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_Shaders.h
@@ -29,6 +29,8 @@
#ifndef INCLUDED_OGLTRANS_SHADERS_HXX_
#define INCLUDED_OGLTRANS_SHADERS_HXX_
+#include <config_lgpl.h>
+
/* FIXME : Really needed ? */
#define GL_GLEXT_PROTOTYPES 1
diff --git a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
index 983c6bd7c56f..ecca64feb9ff 100644
--- a/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/mac/OGLTrans_TransitionImpl.hxx
@@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
+#include <config_lgpl.h>
+
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>
diff --git a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
index e64f9965a57e..ecfbae682c14 100644
--- a/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
+++ b/slideshow/source/engine/OGLTrans/win/OGLTrans_TransitionImpl.hxx
@@ -28,6 +28,8 @@
#ifndef INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
#define INCLUDED_OGLTRANS_TRANSITIONIMPL_HXX_
+#include <config_lgpl.h>
+
#include <basegfx/vector/b2dvector.hxx>
#include <basegfx/vector/b3dvector.hxx>