sd/qa/unit/export-tests.cxx | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
New commits:
commit a7df5753d91c17fb102cf9783e34cf0f60178a51
Author: Tor Lillqvist <t...@collabora.com>
Date: Fri Jun 3 16:49:30 2016 +0300
Try to fix tinderbox build running in RDP session from Linux on Windows
pre-10
It is a complicated scenario, but I think something like this is going
on:
Before Windows 10, only OpenGL 1.1 was supported in RDP sessions. Our
code detects RDP and tries to disable the use of OpenGL in that
case. This code for this is in the neighbourhood of the blacklisting
of OpenGL implementations. But the use of OpenGL in GLTF and chart2
does not go through code paths that would take that into
consideration, so it tries to use OpenGL anyway, and eventually we end
up in InitGLEW(), where the recently added check for OpenGL 3.0 or
newer causes an (intentional) abrupt termination of the process.
Change-Id: Ia57bfc8d2cefe4e6d7a00282973608d17967d3fd
(cherry picked from commit f062b89b277a0830f038cafdd13bd074b5188455)
Reviewed-on: https://gerrit.libreoffice.org/25955
Reviewed-by: Tor Lillqvist <t...@collabora.com>
Tested-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 624d290..1665ac2 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -30,7 +30,6 @@
#include <rsc/rscsfx.hxx>
-
#include <svx/svdoutl.hxx>
#include <svx/svdotext.hxx>
#include <svx/svdoashp.hxx>
@@ -44,6 +43,8 @@
#include <unotools/ucbstreamhelper.hxx>
#include <rtl/ustring.hxx>
+#include <vcl/opengl/OpenGLWrapper.hxx>
+
#include <com/sun/star/drawing/XDrawPage.hpp>
#include <com/sun/star/drawing/XDrawPagesSupplier.hpp>
#include <com/sun/star/animations/XAnimationNodeSupplier.hpp>
@@ -443,6 +444,9 @@ void SdExportTest::testTransparentBackground()
void SdExportTest::testMediaEmbedding()
{
+ if (!OpenGLWrapper::isVCLOpenGLEnabled())
+ return;
+
::sd::DrawDocShellRef xDocShRef =
loadURL(m_directories.getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"),
ODP);
#if HAVE_FEATURE_GLTF
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
