[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - chart2/source

[Michael Meeks]

 chart2/source/view/main/AbstractShapeFactory.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fa1e5bf5473d7b98e6dfba1d52a248ef8eab06f9
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Jan 2 15:09:01 2014 +0000

    Disable OpenGL for headless mode (so unit tests pass on Linux).
    
    Change-Id: Ie4e1a59ce68932084d4635cd0f8d11cbffd6a3a2

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index d6d6b2e..3369597 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -33,6 +33,7 @@
 #include <rtl/math.hxx>
 #include <svx/svdocirc.hxx>
 #include <svx/svdopath.hxx>
+#include <vcl/svapp.hxx>
 
 #include <basegfx/point/b2dpoint.hxx>
 #include <basegfx/matrix/b2dhommatrix.hxx>
@@ -78,7 +79,7 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
     if(pShapeFactory)
         return pShapeFactory;
 
-    if(getenv("CHART_DUMMY_FACTORY"))
+    if(getenv("CHART_DUMMY_FACTORY") && !Application::IsHeadlessModeEnabled())
     {
         osl::Module* pModule = getOpenGLModule();
         if(pModule)