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

[Tor Lillqvist]

 chart2/source/view/main/AbstractShapeFactory.cxx |   15 +++++++++++++++
 1 file changed, 15 insertions(+)

New commits:
commit 31c20d6b13754e46e3afc91005ddcc10ff160763
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 29 09:49:36 2014 +0200

    No chartopengl library built for iOS or Android yet
    
    Change-Id: I28a5eac3bbb85b608d60a1404c21150dafe36a6e

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index 7bf3958..c9b625e 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -101,6 +101,8 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
                 pShapeFactory->setShapeFactory(xFactory);
             }
         }
+#elif defined(IOS) || defined(ANDROID) // Library_chartopengl is not portable enough yet
+        pShapeFactory = NULL;
 #else
         pShapeFactory = getOpenglShapeFactory();
         pShapeFactory->setShapeFactory(xFactory);
commit d71dc6f13765c5e799abf954934c1600332dee81
Author: Tor Lillqvist <tml at collabora.com>
Date:   Wed Jan 29 09:44:57 2014 +0200

    Adapt for the DISABLE_DYNLOADING case
    
    Change-Id: Ifd9ae240277a89162a2a821789b0d41204c1a490

diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx
index feb3d69..7bf3958 100644
--- a/chart2/source/view/main/AbstractShapeFactory.cxx
+++ b/chart2/source/view/main/AbstractShapeFactory.cxx
@@ -53,6 +53,8 @@ namespace {
 
 typedef opengl::OpenglShapeFactory* (*__getOpenglShapeFactory)(void);
 
+#ifndef DISABLE_DYNLOADING
+
 static void SAL_CALL thisModule() {}
 
 osl::Module* getOpenGLModule()
@@ -70,8 +72,14 @@ osl::Module* getOpenGLModule()
     return bLoaded ? &aModule : NULL;
 }
 
+#endif
+
 }
 
+#ifdef DISABLE_DYNLOADING
+extern "C" opengl::OpenglShapeFactory* getOpenglShapeFactory();
+#endif
+
 AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Reference< lang::XMultiServiceFactory> xFactory)
 {
     static AbstractShapeFactory* pShapeFactory = NULL;
@@ -81,6 +89,7 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
 
     if(getenv("CHART_DUMMY_FACTORY") && !Application::IsHeadlessModeEnabled())
     {
+#ifndef DISABLE_DYNLOADING
         osl::Module* pModule = getOpenGLModule();
         if(pModule)
         {
@@ -92,6 +101,10 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(uno::Referen
                 pShapeFactory->setShapeFactory(xFactory);
             }
         }
+#else
+        pShapeFactory = getOpenglShapeFactory();
+        pShapeFactory->setShapeFactory(xFactory);
+#endif
     }