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

Caolán McNamara caolanm at redhat.com
Sat Dec 17 16:07:31 UTC 2016


 chart2/source/view/main/AbstractShapeFactory.cxx |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit e3077960cdc6c12eb2f5f940393e0fe3052f53a5
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Dec 17 15:59:19 2016 +0000

    fix !HAVE_FEATURE_UI build
    
    Change-Id: I5df340811b98c87f8b64fbaca469e2cd4535b81f

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index d190671..c514345 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -44,6 +44,8 @@
 #include "OpenglShapeFactory.hxx"
 #include "ShapeFactory.hxx"
 
+#include <config_features.h>
+
 using namespace com::sun::star;
 
 namespace chart {
@@ -83,9 +85,10 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::R
 {
     static AbstractShapeFactory* pShapeFactory = nullptr;
 
-    if(pShapeFactory)
+    if (pShapeFactory)
         return pShapeFactory;
 
+#if HAVE_FEATURE_UI
     if(getenv("CHART_DUMMY_FACTORY") && !Application::IsHeadlessModeEnabled())
     {
 #ifndef DISABLE_DYNLOADING
@@ -107,8 +110,9 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::R
         pShapeFactory->m_xShapeFactory = xFactory;
 #endif
     }
+#endif
 
-    if(!pShapeFactory)
+    if (!pShapeFactory)
         pShapeFactory = new ShapeFactory(xFactory);
 
     return pShapeFactory;


More information about the Libreoffice-commits mailing list