mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chart2: merge component files for new chartcore library

Browse Source 
Change-Id: Id7cc969d854a98e9bd32fd396eb82ae92a06ba80
This commit is contained in:
Michael Stahl
2012-08-06 13:10:58 +02:00
parent 62e62350c7
commit 515ceca515
6 changed files with 84 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
chart2/Library_chartcore.mk
View File

@@ -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 \

66
chart2/source/model/chartmodel.component → chart2/source/chartcore.component
View File

@@ -17,8 +17,69 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
-->
<component loader="com.sun.star.loader.SharedLibrary" prefix="chartmodel"
<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"/>
@@ -138,4 +199,7 @@
<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>

17
chart2/source/model/main/_serviceregistration_model.cxx
View File

@@ -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;
}

83
chart2/source/tools/charttools.component
View File

@@ -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>

25
chart2/source/view/chartview.component
View File

@@ -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>

4
postprocess/packcomponents/makefile.mk
View File

@@ -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 \