diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index c34bdb1640fd..fe63ec80c010 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -45,8 +45,9 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
$(gb_STDLIBS) \
))
+$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
+
# view pieces ...
-$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/view/chartview))
$(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/view/axes/DateHelper \
chart2/source/view/axes/DateScaling \
@@ -100,7 +101,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
))
# model pieces ...
-$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/model/chartmodel))
$(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/model/filter/XMLFilter \
chart2/source/model/main/Axis \
@@ -154,7 +154,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
))
# tools pieces
-$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/tools/charttools))
$(eval $(call gb_Library_add_exception_objects,chartcore,\
chart2/source/tools/AxisHelper \
chart2/source/tools/BaseGFXHelper \
diff --git a/chart2/source/model/chartmodel.component b/chart2/source/chartcore.component
similarity index 67%
rename from chart2/source/model/chartmodel.component
rename to chart2/source/chartcore.component
index 224d87813b97..68ddc0d83cff 100644
--- a/chart2/source/model/chartmodel.component
+++ b/chart2/source/chartcore.component
@@ -17,8 +17,69 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -138,4 +199,7 @@
+
+
+
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;
}
diff --git a/chart2/source/tools/charttools.component b/chart2/source/tools/charttools.component
deleted file mode 100644
index ae0741226da9..000000000000
--- a/chart2/source/tools/charttools.component
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/chart2/source/view/chartview.component b/chart2/source/view/chartview.component
deleted file mode 100644
index 53bf92d2e2fe..000000000000
--- a/chart2/source/view/chartview.component
+++ /dev/null
@@ -1,25 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/postprocess/packcomponents/makefile.mk b/postprocess/packcomponents/makefile.mk
index e1497aadebc1..92139ec25a13 100644
--- a/postprocess/packcomponents/makefile.mk
+++ b/postprocess/packcomponents/makefile.mk
@@ -35,9 +35,7 @@ my_components = \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
component/chart2/source/controller/chartcontroller \
- component/chart2/source/model/chartmodel \
- component/chart2/source/tools/charttools \
- component/chart2/source/view/chartview \
+ component/chart2/source/chartcore \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
component/canvas/source/vcl/vclcanvas \