chart2: merge component files for new chartcore library

Change-Id: Id7cc969d854a98e9bd32fd396eb82ae92a06ba80

1 files changed, 16 insertions, 1 deletions

diff --git a/chart2/source/model/main/_serviceregistration_model.cxx b/chart2/source/model/main/_serviceregistration_model.cxx
index 6afec1ec19f2..2139c81c42d3 100644
--- a/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/chart2/source/model/main/_serviceregistration_model.cxx
@@ -174,7 +174,11 @@ static struct ::cppu::ImplementationEntry g_entries_chart2_model[] =
 // component exports
 extern "C"
 {
-SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartmodel_component_getFactory(
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartview_component_getFactory(
+    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL charttools_component_getFactory(
+    const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey );
+SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartcore_component_getFactory(
     const sal_Char * pImplName, void * pServiceManager, void * pRegistryKey )
 {
     void * pResult = ::cppu::component_getFactoryHelper(
@@ -184,6 +188,17 @@ SAL_DLLPUBLIC_EXPORT void * SAL_CALL chartmodel_component_getFactory(
         pResult = ::cppu::component_getFactoryHelper(
             pImplName, pServiceManager, pRegistryKey,
             ChartTypeEntriesForServiceRegistration::getImplementationEntries() );
+    if (!pResult)
+    {
+        pResult = charttools_component_getFactory(
+            pImplName, pServiceManager, pRegistryKey);
+    }
+
+    if (!pResult)
+    {
+        pResult = chartview_component_getFactory(
+            pImplName, pServiceManager, pRegistryKey);
+    }
 
     return pResult;
 }