chart2/Library_chartcore.mk | 5
chart2/source/chartcore.component | 205 ++++++++++++++++
chart2/source/model/chartmodel.component | 141 -----------
chart2/source/model/main/_serviceregistration_model.cxx | 17 +
chart2/source/tools/charttools.component | 83 ------
chart2/source/view/chartview.component | 25 -
postprocess/packcomponents/makefile.mk | 4
solenv/gbuild/Library.mk | 3
8 files changed, 227 insertions(+), 256 deletions(-)
New commits:
commit 515ceca5153d67ea602ab8c4fb339a7b42e9063e
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 6 13:10:58 2012 +0200
chart2: merge component files for new chartcore library
Change-Id: Id7cc969d854a98e9bd32fd396eb82ae92a06ba80
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index c34bdb1..fe63ec8 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/chartcore.component
b/chart2/source/chartcore.component
new file mode 100644
index 0000000..68ddc0d
--- /dev/null
+++ b/chart2/source/chartcore.component
@@ -0,0 +1,205 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed
+ * with this work for additional information regarding copyright
+ * ownership. The ASF licenses this file to you under the Apache
+ * License, Version 2.0 (the "License"); you may not use this file
+ * except in compliance with the License. You may obtain a copy of
+ * the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ -->
+
+<component loader="com.sun.star.loader.SharedLibrary" prefix="chartcore"
+ xmlns="http://openoffice.org/2010/uno-components";>
+ <implementation name="com.sun.star.chart2.ExponentialScaling">
+ <service name="com.sun.star.chart2.ExponentialScaling"/>
+ </implementation>
+ <implementation name="com.sun.star.chart2.LinearScaling">
+ <service name="com.sun.star.chart2.LinearScaling"/>
+ </implementation>
+ <implementation name="com.sun.star.chart2.LogarithmicScaling">
+ <service name="com.sun.star.chart2.LogarithmicScaling"/>
+ </implementation>
+ <implementation name="com.sun.star.chart2.PowerScaling">
+ <service name="com.sun.star.chart2.PowerScaling"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.CachedDataSequence">
+ <service name="com.sun.star.chart2.data.DataSequence"/>
+ <service name="com.sun.star.chart2.data.NumericalDataSequence"/>
+ <service name="com.sun.star.chart2.data.TextualDataSequence"/>
+ <service name="com.sun.star.comp.chart.CachedDataSequence"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.DataSource">
+ <service name="com.sun.star.chart2.data.DataSource"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.InternalDataProvider">
+ <service name="com.sun.star.chart2.data.DataProvider"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.ConfigDefaultColorScheme">
+ <service name="com.sun.star.chart2.ColorScheme"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.ErrorBar">
+ <service name="com.sun.star.chart2.ErrorBar"/>
+ <service name="com.sun.star.comp.chart2.ErrorBar"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.ExponentialRegressionCurve">
+ <service name="com.sun.star.chart2.ExponentialRegressionCurve"/>
+ <service name="com.sun.star.chart2.RegressionCurve"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.LabeledDataSequence">
+ <service name="com.sun.star.chart2.data.LabeledDataSequence"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.LinearRegressionCurve">
+ <service name="com.sun.star.chart2.LinearRegressionCurve"/>
+ <service name="com.sun.star.chart2.RegressionCurve"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.LogarithmicRegressionCurve">
+ <service name="com.sun.star.chart2.LogarithmicRegressionCurve"/>
+ <service name="com.sun.star.chart2.RegressionCurve"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.MeanValueRegressionCurve">
+ <service name="com.sun.star.chart2.MeanValueRegressionCurve"/>
+ <service name="com.sun.star.chart2.RegressionCurve"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.PotentialRegressionCurve">
+ <service name="com.sun.star.chart2.PotentialRegressionCurve"/>
+ <service name="com.sun.star.chart2.RegressionCurve"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.RegressionEquation">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.RegressionEquation"/>
+ <service name="com.sun.star.drawing.FillProperties"/>
+ <service name="com.sun.star.drawing.LineProperties"/>
+ <service name="com.sun.star.style.CharacterProperties"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.AreaChartType">
+ <service name="com.sun.star.chart2.AreaChartType"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.BarChartType">
+ <service name="com.sun.star.chart2.BarChartType"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.BubbleChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.BubbleChartType"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.CandleStickChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.CandleStickChartType"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.ChartTypeManager">
+ <service name="com.sun.star.chart2.ChartTypeManager"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.ColumnChartType">
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.ColumnChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.DataSeries">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.DataPointProperties"/>
+ <service name="com.sun.star.chart2.DataSeries"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.FilledNetChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.FilledNetChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.FormattedString">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.FormattedString"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.LineChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.LineChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.NetChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.NetChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.PieChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.PieChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart.ScatterChartType">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.ChartType"/>
+ <service name="com.sun.star.chart2.ScatterChartType"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.Axis">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.Axis"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem2d">
+ <service name="com.sun.star.chart2.CartesianCoordinateSystem2d"/>
+ <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem3d">
+ <service name="com.sun.star.chart2.CartesianCoordinateSystem3d"/>
+ <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.ChartModel">
+ <service name="com.sun.star.chart.ChartDocument"/>
+ <service name="com.sun.star.chart2.ChartDocument"/>
+ <service name="com.sun.star.document.OfficeDocument"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.Diagram">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.Diagram"/>
+ <service name="com.sun.star.layout.LayoutElement"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.GridProperties">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.GridProperties"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.Legend">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.Legend"/>
+ <service name="com.sun.star.drawing.FillProperties"/>
+ <service name="com.sun.star.drawing.LineProperties"/>
+ <service name="com.sun.star.layout.LayoutElement"/>
+ <service name="com.sun.star.style.CharacterProperties"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.PageBackground">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.PageBackground"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem2d">
+ <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
+ <service name="com.sun.star.chart2.PolarCoordinateSystem2d"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem3d">
+ <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
+ <service name="com.sun.star.chart2.PolarCoordinateSystem3d"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.Title">
+ <service name="com.sun.star.beans.PropertySet"/>
+ <service name="com.sun.star.chart2.Title"/>
+ <service name="com.sun.star.layout.LayoutElement"/>
+ <service name="com.sun.star.style.ParagraphProperties"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.XMLFilter">
+ <service name="com.sun.star.document.ExportFilter"/>
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.report.XMLFilter">
+ <service name="com.sun.star.document.ExportFilter"/>
+ <service name="com.sun.star.document.ImportFilter"/>
+ </implementation>
+ <implementation name="com.sun.star.comp.chart2.ChartView">
+ <service name="com.sun.star.chart2.ChartView"/>
+ </implementation>
+</component>
diff --git a/chart2/source/model/chartmodel.component
b/chart2/source/model/chartmodel.component
deleted file mode 100644
index 224d878..0000000
--- a/chart2/source/model/chartmodel.component
+++ /dev/null
@@ -1,141 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="chartmodel"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.chart.AreaChartType">
- <service name="com.sun.star.chart2.AreaChartType"/>
- <service name="com.sun.star.chart2.ChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.BarChartType">
- <service name="com.sun.star.chart2.BarChartType"/>
- <service name="com.sun.star.chart2.ChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.BubbleChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.BubbleChartType"/>
- <service name="com.sun.star.chart2.ChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.CandleStickChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.CandleStickChartType"/>
- <service name="com.sun.star.chart2.ChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.ChartTypeManager">
- <service name="com.sun.star.chart2.ChartTypeManager"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.ColumnChartType">
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.ColumnChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.DataSeries">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.DataPointProperties"/>
- <service name="com.sun.star.chart2.DataSeries"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.FilledNetChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.FilledNetChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.FormattedString">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.FormattedString"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.LineChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.LineChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.NetChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.NetChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.PieChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.PieChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.ScatterChartType">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.ChartType"/>
- <service name="com.sun.star.chart2.ScatterChartType"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.Axis">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.Axis"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem2d">
- <service name="com.sun.star.chart2.CartesianCoordinateSystem2d"/>
- <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.CartesianCoordinateSystem3d">
- <service name="com.sun.star.chart2.CartesianCoordinateSystem3d"/>
- <service name="com.sun.star.chart2.CoordinateSystems.Cartesian"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.ChartModel">
- <service name="com.sun.star.chart.ChartDocument"/>
- <service name="com.sun.star.chart2.ChartDocument"/>
- <service name="com.sun.star.document.OfficeDocument"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.Diagram">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.Diagram"/>
- <service name="com.sun.star.layout.LayoutElement"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.GridProperties">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.GridProperties"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.Legend">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.Legend"/>
- <service name="com.sun.star.drawing.FillProperties"/>
- <service name="com.sun.star.drawing.LineProperties"/>
- <service name="com.sun.star.layout.LayoutElement"/>
- <service name="com.sun.star.style.CharacterProperties"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.PageBackground">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.PageBackground"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem2d">
- <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
- <service name="com.sun.star.chart2.PolarCoordinateSystem2d"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.PolarCoordinateSystem3d">
- <service name="com.sun.star.chart2.CoordinateSystems.Polar"/>
- <service name="com.sun.star.chart2.PolarCoordinateSystem3d"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.Title">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.Title"/>
- <service name="com.sun.star.layout.LayoutElement"/>
- <service name="com.sun.star.style.ParagraphProperties"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.XMLFilter">
- <service name="com.sun.star.document.ExportFilter"/>
- <service name="com.sun.star.document.ImportFilter"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.report.XMLFilter">
- <service name="com.sun.star.document.ExportFilter"/>
- <service name="com.sun.star.document.ImportFilter"/>
- </implementation>
-</component>
diff --git a/chart2/source/model/main/_serviceregistration_model.cxx
b/chart2/source/model/main/_serviceregistration_model.cxx
index 6afec1e..2139c81 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 ae07412..0000000
--- a/chart2/source/tools/charttools.component
+++ /dev/null
@@ -1,83 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="charttools"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.chart2.ExponentialScaling">
- <service name="com.sun.star.chart2.ExponentialScaling"/>
- </implementation>
- <implementation name="com.sun.star.chart2.LinearScaling">
- <service name="com.sun.star.chart2.LinearScaling"/>
- </implementation>
- <implementation name="com.sun.star.chart2.LogarithmicScaling">
- <service name="com.sun.star.chart2.LogarithmicScaling"/>
- </implementation>
- <implementation name="com.sun.star.chart2.PowerScaling">
- <service name="com.sun.star.chart2.PowerScaling"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.CachedDataSequence">
- <service name="com.sun.star.chart2.data.DataSequence"/>
- <service name="com.sun.star.chart2.data.NumericalDataSequence"/>
- <service name="com.sun.star.chart2.data.TextualDataSequence"/>
- <service name="com.sun.star.comp.chart.CachedDataSequence"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.DataSource">
- <service name="com.sun.star.chart2.data.DataSource"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart.InternalDataProvider">
- <service name="com.sun.star.chart2.data.DataProvider"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.ConfigDefaultColorScheme">
- <service name="com.sun.star.chart2.ColorScheme"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.ErrorBar">
- <service name="com.sun.star.chart2.ErrorBar"/>
- <service name="com.sun.star.comp.chart2.ErrorBar"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.ExponentialRegressionCurve">
- <service name="com.sun.star.chart2.ExponentialRegressionCurve"/>
- <service name="com.sun.star.chart2.RegressionCurve"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.LabeledDataSequence">
- <service name="com.sun.star.chart2.data.LabeledDataSequence"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.LinearRegressionCurve">
- <service name="com.sun.star.chart2.LinearRegressionCurve"/>
- <service name="com.sun.star.chart2.RegressionCurve"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.LogarithmicRegressionCurve">
- <service name="com.sun.star.chart2.LogarithmicRegressionCurve"/>
- <service name="com.sun.star.chart2.RegressionCurve"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.MeanValueRegressionCurve">
- <service name="com.sun.star.chart2.MeanValueRegressionCurve"/>
- <service name="com.sun.star.chart2.RegressionCurve"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.PotentialRegressionCurve">
- <service name="com.sun.star.chart2.PotentialRegressionCurve"/>
- <service name="com.sun.star.chart2.RegressionCurve"/>
- </implementation>
- <implementation name="com.sun.star.comp.chart2.RegressionEquation">
- <service name="com.sun.star.beans.PropertySet"/>
- <service name="com.sun.star.chart2.RegressionEquation"/>
- <service name="com.sun.star.drawing.FillProperties"/>
- <service name="com.sun.star.drawing.LineProperties"/>
- <service name="com.sun.star.style.CharacterProperties"/>
- </implementation>
-</component>
diff --git a/chart2/source/view/chartview.component
b/chart2/source/view/chartview.component
deleted file mode 100644
index 53bf92d..0000000
--- a/chart2/source/view/chartview.component
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- -->
-
-<component loader="com.sun.star.loader.SharedLibrary" prefix="chartview"
- xmlns="http://openoffice.org/2010/uno-components";>
- <implementation name="com.sun.star.comp.chart2.ChartView">
- <service name="com.sun.star.chart2.ChartView"/>
- </implementation>
-</component>
diff --git a/postprocess/packcomponents/makefile.mk
b/postprocess/packcomponents/makefile.mk
index e1497aa..92139ec 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 \
commit 62e62350c79f4d13a0d015670a6876f76bc15753
Author: Michael Stahl <mst...@redhat.com>
Date: Mon Aug 6 12:46:30 2012 +0200
gbuild: add a check for duplicate component files
Change-Id: I9549d9e4e083744b4bb39eac622c59586c1efbe3
diff --git a/solenv/gbuild/Library.mk b/solenv/gbuild/Library.mk
index 157be8c..b9ea45e 100644
--- a/solenv/gbuild/Library.mk
+++ b/solenv/gbuild/Library.mk
@@ -108,6 +108,9 @@ endef
# But the component target also must be delivered, so a new phony target
# gb_Library__get_final_target has been invented for that purpose...
define gb_Library_set_componentfile
+$(call gb_Library_get_target,$(gb_Library__get_name)) : \
+ COMPONENT := $$(if $$(COMPONENT),\
+ $$(call gb_Output_error,$(1) already has a component file
$$(COMPONENT)))$(2)
$(call gb_ComponentTarget_ComponentTarget,$(2),\
$(call gb_Library__get_componentprefix,$(gb_Library__get_name)),\
$(call gb_Library_get_runtime_filename,$(gb_Library__get_name)))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
