summaryrefslogtreecommitdiff
path: root/chart2/source/model/template/ChartTypeManager.cxx
diff options
context:
space:
mode:
authorOliver Specht <oliver.specht@cib.de>2016-03-23 13:40:13 +0100
committerOliver Specht <oliver.specht@cib.de>2016-03-25 11:05:47 +0000
commit96c1ae1d8e78ae8b9bd7d4001645cad24d62b720 (patch)
tree1482b9e0b899a783f64aaed3b9728533a81eff58 /chart2/source/model/template/ChartTypeManager.cxx
parent44a6d8ac3063511a149d4abdd6c2a556b3f477fe (diff)
fix headless build
disables OpenGL and glew usage, lets --without-gui do what --without-x did before and disables X related test Change-Id: I680b47c9962a0d43c8ece593db0b82e347ceebdb Reviewed-on: https://gerrit.libreoffice.org/23474 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Oliver Specht <oliver.specht@cib.de>
Diffstat (limited to 'chart2/source/model/template/ChartTypeManager.cxx')
-rw-r--r--chart2/source/model/template/ChartTypeManager.cxx9
1 files changed, 7 insertions, 2 deletions
diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx
index adee48ecad68..a8b96e42a226 100644
--- a/chart2/source/model/template/ChartTypeManager.cxx
+++ b/chart2/source/model/template/ChartTypeManager.cxx
@@ -33,7 +33,10 @@
#include "StockChartTypeTemplate.hxx"
#include "NetChartTypeTemplate.hxx"
#include "BubbleChartTypeTemplate.hxx"
+#include <config_features.h>
+#if HAVE_FEATURE_OPENGL
#include "GL3DBarChartTypeTemplate.hxx"
+#endif
#include <cppuhelper/component_context.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <comphelper/InlineContainer.hxx>
@@ -534,14 +537,16 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance(
case TEMPLATE_BUBBLE:
xTemplate.set( new BubbleChartTypeTemplate( m_xContext, aServiceSpecifier ));
break;
-
+#if HAVE_FEATURE_OPENGL
case TEMPLATE_GL3DBAR:
xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, aServiceSpecifier));
break;
case TEMPLATE_GL3DBAR_ROUNDED_RECTANGLE:
xTemplate.set(new GL3DBarChartTypeTemplate(m_xContext, aServiceSpecifier));
break;
-
+#else
+ default: break;
+#endif
// case TEMPLATE_SURFACE:
// case TEMPLATE_ADDIN:
// break;