summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorMichael Meeks <michael.meeks@suse.com>2012-08-03 17:39:56 +0100
committerMichael Meeks <michael.meeks@suse.com>2012-08-06 10:33:46 +0100
commitd10065ea3a45ef27f2d29ee75c3a51b1fd253431 (patch)
tree74f8b72e8bb0f2dd5fe9a961290f0e8628e6f53c /chart2
parentb2fd8230172641edbd2a4f67e214c44ce740b4b2 (diff)
merge pointlessly fragmented chart2 libraries, leaving controller split.
Diffstat (limited to 'chart2')
-rw-r--r--chart2/Library_chartcontroller.mk3
-rw-r--r--chart2/Library_chartcore.mk230
-rw-r--r--chart2/Library_chartmodel.mk115
-rw-r--r--chart2/Library_charttools.mk127
-rw-r--r--chart2/Library_chartview.mk115
-rw-r--r--chart2/Module_chart2.mk4
6 files changed, 232 insertions, 362 deletions
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index b42c0e8f328e..bd1837956130 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -45,8 +45,7 @@ $(eval $(call gb_Library_use_sdk_api,chartcontroller))
$(eval $(call gb_Library_use_libraries,chartcontroller,\
basegfx \
- charttools \
- chartview \
+ chartcore \
comphelper \
cppu \
cppuhelper \
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
new file mode 100644
index 000000000000..c34bdb1640fd
--- /dev/null
+++ b/chart2/Library_chartcore.mk
@@ -0,0 +1,230 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# 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/.
+#
+
+$(eval $(call gb_Library_Library,chartcore))
+
+$(eval $(call gb_Library_set_include,chartcore,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/source/model/inc \
+ -I$(SRCDIR)/chart2/source/view/inc \
+ -I$(SRCDIR)/chart2/source/inc \
+))
+
+# not ideal - we should use a single core define ideally
+$(eval $(call gb_Library_add_defs,chartcore,\
+ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+))
+
+$(eval $(call gb_Library_use_sdk_api,chartcore))
+
+$(eval $(call gb_Library_use_libraries,chartcore,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ fwe \
+ i18nisolang1 \
+ sal \
+ sfx \
+ svl \
+ svt \
+ svxcore \
+ tl \
+ ucbhelper \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+# 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 \
+ chart2/source/view/axes/MinimumAndMaximumSupplier \
+ chart2/source/view/axes/ScaleAutomatism \
+ chart2/source/view/axes/Tickmarks \
+ chart2/source/view/axes/Tickmarks_Dates \
+ chart2/source/view/axes/Tickmarks_Equidistant \
+ chart2/source/view/axes/VAxisBase \
+ chart2/source/view/axes/VAxisOrGridBase \
+ chart2/source/view/axes/VAxisProperties \
+ chart2/source/view/axes/VCartesianAxis \
+ chart2/source/view/axes/VCartesianCoordinateSystem \
+ chart2/source/view/axes/VCartesianGrid \
+ chart2/source/view/axes/VCoordinateSystem \
+ chart2/source/view/axes/VPolarAngleAxis \
+ chart2/source/view/axes/VPolarAxis \
+ chart2/source/view/axes/VPolarCoordinateSystem \
+ chart2/source/view/axes/VPolarGrid \
+ chart2/source/view/axes/VPolarRadiusAxis \
+ chart2/source/view/charttypes/AreaChart \
+ chart2/source/view/charttypes/BarChart \
+ chart2/source/view/charttypes/BarPositionHelper \
+ chart2/source/view/charttypes/BubbleChart \
+ chart2/source/view/charttypes/CandleStickChart \
+ chart2/source/view/charttypes/CategoryPositionHelper \
+ chart2/source/view/charttypes/PieChart \
+ chart2/source/view/charttypes/Splines \
+ chart2/source/view/charttypes/VSeriesPlotter \
+ chart2/source/view/diagram/VDiagram \
+ chart2/source/view/main/ChartItemPool \
+ chart2/source/view/main/ChartView \
+ chart2/source/view/main/Clipping \
+ chart2/source/view/main/DataPointSymbolSupplier \
+ chart2/source/view/main/DrawModelWrapper \
+ chart2/source/view/main/LabelPositionHelper \
+ chart2/source/view/main/Linear3DTransformation \
+ chart2/source/view/main/PlotterBase \
+ chart2/source/view/main/PlottingPositionHelper \
+ chart2/source/view/main/PolarLabelPositionHelper \
+ chart2/source/view/main/PropertyMapper \
+ chart2/source/view/main/_serviceregistration_view \
+ chart2/source/view/main/ShapeFactory \
+ chart2/source/view/main/Stripe \
+ chart2/source/view/main/VDataSeries \
+ chart2/source/view/main/VLegend \
+ chart2/source/view/main/VLegendSymbolFactory \
+ chart2/source/view/main/VLineProperties \
+ chart2/source/view/main/VPolarTransformation \
+ chart2/source/view/main/VTitle \
+))
+
+# 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 \
+ chart2/source/model/main/BaseCoordinateSystem \
+ chart2/source/model/main/CartesianCoordinateSystem \
+ chart2/source/model/main/ChartModel \
+ chart2/source/model/main/ChartModel_Persistence \
+ chart2/source/model/main/DataPoint \
+ chart2/source/model/main/DataPointProperties \
+ chart2/source/model/main/DataSeries \
+ chart2/source/model/main/DataSeriesProperties \
+ chart2/source/model/main/Diagram \
+ chart2/source/model/main/FormattedString \
+ chart2/source/model/main/GridProperties \
+ chart2/source/model/main/Legend \
+ chart2/source/model/main/PageBackground \
+ chart2/source/model/main/PolarCoordinateSystem \
+ chart2/source/model/main/_serviceregistration_model \
+ chart2/source/model/main/StockBar \
+ chart2/source/model/main/Title \
+ chart2/source/model/main/UndoManager \
+ chart2/source/model/main/Wall \
+ chart2/source/model/template/AreaChartType \
+ chart2/source/model/template/AreaChartTypeTemplate \
+ chart2/source/model/template/BarChartType \
+ chart2/source/model/template/BarChartTypeTemplate \
+ chart2/source/model/template/BubbleChartType \
+ chart2/source/model/template/BubbleChartTypeTemplate \
+ chart2/source/model/template/BubbleDataInterpreter \
+ chart2/source/model/template/CandleStickChartType \
+ chart2/source/model/template/ChartType \
+ chart2/source/model/template/ChartTypeManager \
+ chart2/source/model/template/ChartTypeTemplate \
+ chart2/source/model/template/ColumnChartType \
+ chart2/source/model/template/ColumnLineChartTypeTemplate \
+ chart2/source/model/template/ColumnLineDataInterpreter \
+ chart2/source/model/template/DataInterpreter \
+ chart2/source/model/template/FilledNetChartType \
+ chart2/source/model/template/LineChartType \
+ chart2/source/model/template/LineChartTypeTemplate \
+ chart2/source/model/template/NetChartType \
+ chart2/source/model/template/NetChartTypeTemplate \
+ chart2/source/model/template/PieChartType \
+ chart2/source/model/template/PieChartTypeTemplate \
+ chart2/source/model/template/ScatterChartType \
+ chart2/source/model/template/ScatterChartTypeTemplate \
+ chart2/source/model/template/_serviceregistration_charttypes \
+ chart2/source/model/template/StockChartTypeTemplate \
+ chart2/source/model/template/StockDataInterpreter \
+ chart2/source/model/template/XYDataInterpreter \
+))
+
+# 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 \
+ chart2/source/tools/CachedDataSequence \
+ chart2/source/tools/CharacterProperties \
+ chart2/source/tools/ChartDebugTrace \
+ chart2/source/tools/ChartModelHelper \
+ chart2/source/tools/ChartTypeHelper \
+ chart2/source/tools/ChartViewHelper \
+ chart2/source/tools/ColorPerPointHelper \
+ chart2/source/tools/CommonConverters \
+ chart2/source/tools/ConfigColorScheme \
+ chart2/source/tools/ControllerLockGuard \
+ chart2/source/tools/DataSeriesHelper \
+ chart2/source/tools/DataSource \
+ chart2/source/tools/DataSourceHelper \
+ chart2/source/tools/DiagramHelper \
+ chart2/source/tools/ErrorBar \
+ chart2/source/tools/ExplicitCategoriesProvider \
+ chart2/source/tools/ExponentialRegressionCurveCalculator \
+ chart2/source/tools/FillProperties \
+ chart2/source/tools/FormattedStringHelper \
+ chart2/source/tools/ImplOPropertySet \
+ chart2/source/tools/InternalData \
+ chart2/source/tools/InternalDataProvider \
+ chart2/source/tools/LabeledDataSequence \
+ chart2/source/tools/LegendHelper \
+ chart2/source/tools/LifeTime \
+ chart2/source/tools/LinearRegressionCurveCalculator \
+ chart2/source/tools/LineProperties \
+ chart2/source/tools/LogarithmicRegressionCurveCalculator \
+ chart2/source/tools/MeanValueRegressionCurveCalculator \
+ chart2/source/tools/MediaDescriptorHelper \
+ chart2/source/tools/ModifyListenerCallBack \
+ chart2/source/tools/ModifyListenerHelper \
+ chart2/source/tools/MutexContainer \
+ chart2/source/tools/NameContainer \
+ chart2/source/tools/NumberFormatterWrapper \
+ chart2/source/tools/ObjectIdentifier \
+ chart2/source/tools/OPropertySet \
+ chart2/source/tools/PotentialRegressionCurveCalculator \
+ chart2/source/tools/PropertyHelper \
+ chart2/source/tools/RangeHighlighter \
+ chart2/source/tools/ReferenceSizeProvider \
+ chart2/source/tools/RegressionCurveCalculator \
+ chart2/source/tools/RegressionCurveHelper \
+ chart2/source/tools/RegressionCurveModel \
+ chart2/source/tools/RegressionEquation \
+ chart2/source/tools/RelativePositionHelper \
+ chart2/source/tools/RelativeSizeHelper \
+ chart2/source/tools/ResId \
+ chart2/source/tools/ResourceManager \
+ chart2/source/tools/Scaling \
+ chart2/source/tools/SceneProperties \
+ chart2/source/tools/_serviceregistration_tools \
+ chart2/source/tools/StatisticsHelper \
+ chart2/source/tools/ThreeDHelper \
+ chart2/source/tools/TitleHelper \
+ chart2/source/tools/TrueGuard \
+ chart2/source/tools/UncachedDataSequence \
+ chart2/source/tools/UserDefinedProperties \
+ chart2/source/tools/WeakListenerAdapter \
+ chart2/source/tools/WrappedDefaultProperty \
+ chart2/source/tools/WrappedDirectStateProperty \
+ chart2/source/tools/WrappedIgnoreProperty \
+ chart2/source/tools/WrappedProperty \
+ chart2/source/tools/WrappedPropertySet \
+ chart2/source/tools/XMLRangeHelper \
+))
+
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartmodel.mk b/chart2/Library_chartmodel.mk
deleted file mode 100644
index b4213242df97..000000000000
--- a/chart2/Library_chartmodel.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,chartmodel))
-
-$(eval $(call gb_Library_set_include,chartmodel,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/model/inc \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_use_sdk_api,chartmodel))
-
-# TODO: is this still necessary?
-# (from chart2/source/model/template/makefile.mk)
-# # i26518 the gcc-3.0.4 requires to enhance the template-depth
-# # this seems to be a compiler issue, so we recommend not to use 3.0.x anymore
-# .IF "$(COM)"=="GCC"
-# CFLAGS+=-ftemplate-depth-128
-# .ENDIF
-
-$(eval $(call gb_Library_use_libraries,chartmodel,\
- charttools \
- comphelper \
- cppu \
- cppuhelper \
- fwe \
- sal \
- svl \
- svt \
- ucbhelper \
- utl \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
-
-$(eval $(call gb_Library_add_exception_objects,chartmodel,\
- chart2/source/model/filter/XMLFilter \
- chart2/source/model/main/Axis \
- chart2/source/model/main/BaseCoordinateSystem \
- chart2/source/model/main/CartesianCoordinateSystem \
- chart2/source/model/main/ChartModel \
- chart2/source/model/main/ChartModel_Persistence \
- chart2/source/model/main/DataPoint \
- chart2/source/model/main/DataPointProperties \
- chart2/source/model/main/DataSeries \
- chart2/source/model/main/DataSeriesProperties \
- chart2/source/model/main/Diagram \
- chart2/source/model/main/FormattedString \
- chart2/source/model/main/GridProperties \
- chart2/source/model/main/Legend \
- chart2/source/model/main/PageBackground \
- chart2/source/model/main/PolarCoordinateSystem \
- chart2/source/model/main/_serviceregistration_model \
- chart2/source/model/main/StockBar \
- chart2/source/model/main/Title \
- chart2/source/model/main/UndoManager \
- chart2/source/model/main/Wall \
- chart2/source/model/template/AreaChartType \
- chart2/source/model/template/AreaChartTypeTemplate \
- chart2/source/model/template/BarChartType \
- chart2/source/model/template/BarChartTypeTemplate \
- chart2/source/model/template/BubbleChartType \
- chart2/source/model/template/BubbleChartTypeTemplate \
- chart2/source/model/template/BubbleDataInterpreter \
- chart2/source/model/template/CandleStickChartType \
- chart2/source/model/template/ChartType \
- chart2/source/model/template/ChartTypeManager \
- chart2/source/model/template/ChartTypeTemplate \
- chart2/source/model/template/ColumnChartType \
- chart2/source/model/template/ColumnLineChartTypeTemplate \
- chart2/source/model/template/ColumnLineDataInterpreter \
- chart2/source/model/template/DataInterpreter \
- chart2/source/model/template/FilledNetChartType \
- chart2/source/model/template/LineChartType \
- chart2/source/model/template/LineChartTypeTemplate \
- chart2/source/model/template/NetChartType \
- chart2/source/model/template/NetChartTypeTemplate \
- chart2/source/model/template/PieChartType \
- chart2/source/model/template/PieChartTypeTemplate \
- chart2/source/model/template/ScatterChartType \
- chart2/source/model/template/ScatterChartTypeTemplate \
- chart2/source/model/template/_serviceregistration_charttypes \
- chart2/source/model/template/StockChartTypeTemplate \
- chart2/source/model/template/StockDataInterpreter \
- chart2/source/model/template/XYDataInterpreter \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_charttools.mk b/chart2/Library_charttools.mk
deleted file mode 100644
index 2e4eb6b6336f..000000000000
--- a/chart2/Library_charttools.mk
+++ /dev/null
@@ -1,127 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,charttools))
-
-$(eval $(call gb_Library_set_include,charttools,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_add_defs,charttools,\
- -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
-))
-
-$(eval $(call gb_Library_use_sdk_api,charttools))
-
-$(eval $(call gb_Library_use_libraries,charttools,\
- basegfx \
- comphelper \
- cppu \
- cppuhelper \
- i18nisolang1 \
- sal \
- svl \
- tl \
- utl \
- vcl \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
-
-$(eval $(call gb_Library_add_exception_objects,charttools,\
- chart2/source/tools/AxisHelper \
- chart2/source/tools/BaseGFXHelper \
- chart2/source/tools/CachedDataSequence \
- chart2/source/tools/CharacterProperties \
- chart2/source/tools/ChartDebugTrace \
- chart2/source/tools/ChartModelHelper \
- chart2/source/tools/ChartTypeHelper \
- chart2/source/tools/ChartViewHelper \
- chart2/source/tools/ColorPerPointHelper \
- chart2/source/tools/CommonConverters \
- chart2/source/tools/ConfigColorScheme \
- chart2/source/tools/ControllerLockGuard \
- chart2/source/tools/DataSeriesHelper \
- chart2/source/tools/DataSource \
- chart2/source/tools/DataSourceHelper \
- chart2/source/tools/DiagramHelper \
- chart2/source/tools/ErrorBar \
- chart2/source/tools/ExplicitCategoriesProvider \
- chart2/source/tools/ExponentialRegressionCurveCalculator \
- chart2/source/tools/FillProperties \
- chart2/source/tools/FormattedStringHelper \
- chart2/source/tools/ImplOPropertySet \
- chart2/source/tools/InternalData \
- chart2/source/tools/InternalDataProvider \
- chart2/source/tools/LabeledDataSequence \
- chart2/source/tools/LegendHelper \
- chart2/source/tools/LifeTime \
- chart2/source/tools/LinearRegressionCurveCalculator \
- chart2/source/tools/LineProperties \
- chart2/source/tools/LogarithmicRegressionCurveCalculator \
- chart2/source/tools/MeanValueRegressionCurveCalculator \
- chart2/source/tools/MediaDescriptorHelper \
- chart2/source/tools/ModifyListenerCallBack \
- chart2/source/tools/ModifyListenerHelper \
- chart2/source/tools/MutexContainer \
- chart2/source/tools/NameContainer \
- chart2/source/tools/NumberFormatterWrapper \
- chart2/source/tools/ObjectIdentifier \
- chart2/source/tools/OPropertySet \
- chart2/source/tools/PotentialRegressionCurveCalculator \
- chart2/source/tools/PropertyHelper \
- chart2/source/tools/RangeHighlighter \
- chart2/source/tools/ReferenceSizeProvider \
- chart2/source/tools/RegressionCurveCalculator \
- chart2/source/tools/RegressionCurveHelper \
- chart2/source/tools/RegressionCurveModel \
- chart2/source/tools/RegressionEquation \
- chart2/source/tools/RelativePositionHelper \
- chart2/source/tools/RelativeSizeHelper \
- chart2/source/tools/ResId \
- chart2/source/tools/ResourceManager \
- chart2/source/tools/Scaling \
- chart2/source/tools/SceneProperties \
- chart2/source/tools/_serviceregistration_tools \
- chart2/source/tools/StatisticsHelper \
- chart2/source/tools/ThreeDHelper \
- chart2/source/tools/TitleHelper \
- chart2/source/tools/TrueGuard \
- chart2/source/tools/UncachedDataSequence \
- chart2/source/tools/UserDefinedProperties \
- chart2/source/tools/WeakListenerAdapter \
- chart2/source/tools/WrappedDefaultProperty \
- chart2/source/tools/WrappedDirectStateProperty \
- chart2/source/tools/WrappedIgnoreProperty \
- chart2/source/tools/WrappedProperty \
- chart2/source/tools/WrappedPropertySet \
- chart2/source/tools/XMLRangeHelper \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Library_chartview.mk b/chart2/Library_chartview.mk
deleted file mode 100644
index 83ea331fc385..000000000000
--- a/chart2/Library_chartview.mk
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
-# (initial developer)
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-
-$(eval $(call gb_Library_Library,chartview))
-
-$(eval $(call gb_Library_set_include,chartview,\
- $$(INCLUDE) \
- -I$(SRCDIR)/chart2/source/view/inc \
- -I$(SRCDIR)/chart2/source/inc \
-))
-
-$(eval $(call gb_Library_add_defs,chartview,\
- -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
-))
-
-$(eval $(call gb_Library_use_sdk_api,chartview))
-
-$(eval $(call gb_Library_use_libraries,chartview,\
- basegfx \
- charttools \
- comphelper \
- cppu \
- cppuhelper \
- editeng \
- sal \
- sfx \
- svl \
- svt \
- svxcore \
- tl \
- utl \
- vcl \
- drawinglayer \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_set_componentfile,chartview,chart2/source/view/chartview))
-
-$(eval $(call gb_Library_add_exception_objects,chartview,\
- chart2/source/view/axes/DateHelper \
- chart2/source/view/axes/DateScaling \
- chart2/source/view/axes/MinimumAndMaximumSupplier \
- chart2/source/view/axes/ScaleAutomatism \
- chart2/source/view/axes/Tickmarks \
- chart2/source/view/axes/Tickmarks_Dates \
- chart2/source/view/axes/Tickmarks_Equidistant \
- chart2/source/view/axes/VAxisBase \
- chart2/source/view/axes/VAxisOrGridBase \
- chart2/source/view/axes/VAxisProperties \
- chart2/source/view/axes/VCartesianAxis \
- chart2/source/view/axes/VCartesianCoordinateSystem \
- chart2/source/view/axes/VCartesianGrid \
- chart2/source/view/axes/VCoordinateSystem \
- chart2/source/view/axes/VPolarAngleAxis \
- chart2/source/view/axes/VPolarAxis \
- chart2/source/view/axes/VPolarCoordinateSystem \
- chart2/source/view/axes/VPolarGrid \
- chart2/source/view/axes/VPolarRadiusAxis \
- chart2/source/view/charttypes/AreaChart \
- chart2/source/view/charttypes/BarChart \
- chart2/source/view/charttypes/BarPositionHelper \
- chart2/source/view/charttypes/BubbleChart \
- chart2/source/view/charttypes/CandleStickChart \
- chart2/source/view/charttypes/CategoryPositionHelper \
- chart2/source/view/charttypes/PieChart \
- chart2/source/view/charttypes/Splines \
- chart2/source/view/charttypes/VSeriesPlotter \
- chart2/source/view/diagram/VDiagram \
- chart2/source/view/main/ChartItemPool \
- chart2/source/view/main/ChartView \
- chart2/source/view/main/Clipping \
- chart2/source/view/main/DataPointSymbolSupplier \
- chart2/source/view/main/DrawModelWrapper \
- chart2/source/view/main/LabelPositionHelper \
- chart2/source/view/main/Linear3DTransformation \
- chart2/source/view/main/PlotterBase \
- chart2/source/view/main/PlottingPositionHelper \
- chart2/source/view/main/PolarLabelPositionHelper \
- chart2/source/view/main/PropertyMapper \
- chart2/source/view/main/_serviceregistration_view \
- chart2/source/view/main/ShapeFactory \
- chart2/source/view/main/Stripe \
- chart2/source/view/main/VDataSeries \
- chart2/source/view/main/VLegend \
- chart2/source/view/main/VLegendSymbolFactory \
- chart2/source/view/main/VLineProperties \
- chart2/source/view/main/VPolarTransformation \
- chart2/source/view/main/VTitle \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/chart2/Module_chart2.mk b/chart2/Module_chart2.mk
index b8b2a4f6e0b9..19a7dbc866de 100644
--- a/chart2/Module_chart2.mk
+++ b/chart2/Module_chart2.mk
@@ -31,9 +31,7 @@ $(eval $(call gb_Module_Module,chart2))
$(eval $(call gb_Module_add_targets,chart2,\
AllLangResTarget_chartcontroller \
Library_chartcontroller \
- Library_chartmodel \
- Library_charttools \
- Library_chartview \
+ Library_chartcore \
Package_uiconfig \
))