diff options
Diffstat (limited to 'chart2/source/view/main/AbstractShapeFactory.cxx')
-rw-r--r-- | chart2/source/view/main/AbstractShapeFactory.cxx | 60 |
1 files changed, 0 insertions, 60 deletions
diff --git a/chart2/source/view/main/AbstractShapeFactory.cxx b/chart2/source/view/main/AbstractShapeFactory.cxx index 58b3a9695e6b..df2516ab82f2 100644 --- a/chart2/source/view/main/AbstractShapeFactory.cxx +++ b/chart2/source/view/main/AbstractShapeFactory.cxx @@ -45,7 +45,6 @@ #include <osl/module.hxx> -#include <OpenglShapeFactory.hxx> #include <ShapeFactory.hxx> #include <config_features.h> @@ -54,41 +53,6 @@ using namespace com::sun::star; namespace chart { -namespace { - -typedef opengl::OpenglShapeFactory* (*getOpenglShapeFactory_)(void); - -#if HAVE_FEATURE_UI - -#ifndef DISABLE_DYNLOADING - -void thisModule() {} - -osl::Module* getOpenGLModule() -{ - static osl::Module aModule; - if (aModule.is()) - // Already loaded. - return &aModule; - - OUString aLibName(SVLIBRARY("chartopengl")); - bool bLoaded = aModule.loadRelative(&thisModule, aLibName); - if (!bLoaded) - bLoaded = aModule.load(aLibName); - - return bLoaded ? &aModule : nullptr; -} - -#endif - -#endif - -} - -#ifdef DISABLE_DYNLOADING -extern "C" opengl::OpenglShapeFactory* getOpenglShapeFactory(); -#endif - AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::Reference< lang::XMultiServiceFactory>& xFactory) { static AbstractShapeFactory* pShapeFactory = nullptr; @@ -96,30 +60,6 @@ AbstractShapeFactory* AbstractShapeFactory::getOrCreateShapeFactory(const uno::R if (pShapeFactory) return pShapeFactory; -#if HAVE_FEATURE_UI - if(getenv("CHART_DUMMY_FACTORY") && !Application::IsHeadlessModeEnabled()) - { -#ifndef DISABLE_DYNLOADING - osl::Module* pModule = getOpenGLModule(); - if(pModule) - { - oslGenericFunction fn = pModule->getFunctionSymbol("getOpenglShapeFactory"); - if(fn) - { - - pShapeFactory = reinterpret_cast<getOpenglShapeFactory_>(fn)(); - pShapeFactory->m_xShapeFactory = xFactory; - } - } -#elif defined(IOS) || defined(ANDROID) // Library_chartopengl is not portable enough yet - pShapeFactory = NULL; -#else - pShapeFactory = getOpenglShapeFactory(); - pShapeFactory->m_xShapeFactory = xFactory; -#endif - } -#endif - if (!pShapeFactory) pShapeFactory = new ShapeFactory(xFactory); |