Repository.mk | 3 RepositoryModule_host.mk | 2 bin/check-elf-dynamic-objects | 2 bin/update_pch | 3 chart2/CppunitTest_chart2_dump.mk | 3 chart2/CppunitTest_chart2_geometry.mk | 3 chart2/CppunitTest_chart2_pivot_chart_test.mk | 3 chart2/CppunitTest_chart2_trendcalculators.mk | 3 chart2/CppunitTest_chart2_xshape.mk | 3 chart2/Library_chart2.mk | 222 ++++++++++++++- chart2/Library_chartcore.mk | 251 ----------------- chart2/Module_chart2.mk | 3 chart2/import_setup.mk | 3 chart2/inc/pch/precompiled_chart2.cxx | 2 chart2/inc/pch/precompiled_chart2.hxx | 135 +++++++-- chart2/inc/pch/precompiled_chartcontroller.cxx | 12 chart2/inc/pch/precompiled_chartcore.hxx | 303 --------------------- chart2/source/chart2.component | 31 ++ chart2/source/controller/chartcontroller.component | 53 --- sc/CppunitTest_sc_cache_test.mk | 3 sc/CppunitTest_sc_cond_format_merge.mk | 3 sc/CppunitTest_sc_dataprovider.mk | 3 sc/CppunitTest_sc_filters_test.mk | 3 sc/CppunitTest_sc_mark_test.mk | 3 sd/import_setup.mk | 3 solenv/bin/native-code.py | 3 solenv/gbuild/extensions/pre_MergedLibsList.mk | 3 vcl/commonfuzzer.mk | 3 28 files changed, 378 insertions(+), 689 deletions(-)
New commits: commit e09f212f91033471f1527337fa183e4cb19a8d0b Author: Noel Grandin <[email protected]> AuthorDate: Sat Mar 29 09:21:16 2025 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Sat Mar 29 18:53:26 2025 +0100 merge chartcore and chartcontroller libraries there is no good reason to keep these separate Change-Id: Ib484dbd5d331b0d1a117f5fc2e331123c4e70d82 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/183478 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/Repository.mk b/Repository.mk index 9240fda70a99..9543dcd4746c 100644 --- a/Repository.mk +++ b/Repository.mk @@ -397,8 +397,7 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo, \ ) \ basegfx \ bib \ - chartcore \ - chartcontroller \ + chart2 \ $(call gb_Helper_optional,OPENCL,clew) \ $(if $(filter $(OS),WNT),,cmdmail) \ configmgr \ diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ca1fb8b2093a..8d23ee960f68 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -233,7 +233,7 @@ $(eval $(call repositorymodule_serialize,\ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ cui) \ $(if $(MERGELIBS), merged, \ - chartcontroller chartcore oox svx svxcore xo sfx fwk svt vcl) \ + chart2 oox svx svxcore xo sfx fwk svt vcl) \ )) endif endif # !$(DISABLE_DYNLOADING) diff --git a/bin/check-elf-dynamic-objects b/bin/check-elf-dynamic-objects index df79608fc6c8..3992a23d46d1 100755 --- a/bin/check-elf-dynamic-objects +++ b/bin/check-elf-dynamic-objects @@ -171,7 +171,7 @@ local file="$1" */oosplash|*/gengal.bin) allowlist="${allowlist} ${x11allowlist}" ;; - */libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so) + */libvclplug_genlo.so|*/libchart2lo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so) allowlist="${allowlist} ${x11allowlist} ${openglallowlist}" ;; */libvcllo.so) diff --git a/bin/update_pch b/bin/update_pch index fcac5b0e4711..9a50a1782c01 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -47,8 +47,7 @@ DEFAULTS = \ 'basctl.basctl' : ( 3, EXCLUDE, INCLUDE, EXCLUDE), # 11.9 'basegfx.basegfx' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 3.8 'basic.sb' : ( 2, EXCLUDE, EXCLUDE, INCLUDE), # 10.7 - 'chart2.chartcontroller' : ( 6, EXCLUDE, INCLUDE, INCLUDE), # 18.4 - 'chart2.chartcore' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 22.5 + 'chart2.chart2' : ( 3, EXCLUDE, EXCLUDE, INCLUDE), # 18.4 'comphelper.comphelper' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 7.6 'configmgr.configmgr' : ( 6, EXCLUDE, INCLUDE, INCLUDE), # 6.0 'connectivity.ado' : ( 2, EXCLUDE, EXCLUDE, EXCLUDE), # 6.4 diff --git a/chart2/CppunitTest_chart2_dump.mk b/chart2/CppunitTest_chart2_dump.mk index cc14424bc4c2..c4ca069c12eb 100644 --- a/chart2/CppunitTest_chart2_dump.mk +++ b/chart2/CppunitTest_chart2_dump.mk @@ -73,8 +73,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_dump)) $(eval $(call gb_CppunitTest_use_components,chart2_dump,\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ embeddedobj/util/embobj \ diff --git a/chart2/CppunitTest_chart2_geometry.mk b/chart2/CppunitTest_chart2_geometry.mk index a594b25894e2..314838571790 100644 --- a/chart2/CppunitTest_chart2_geometry.mk +++ b/chart2/CppunitTest_chart2_geometry.mk @@ -72,8 +72,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_geometry)) $(eval $(call gb_CppunitTest_use_components,chart2_geometry,\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/chart2/CppunitTest_chart2_pivot_chart_test.mk b/chart2/CppunitTest_chart2_pivot_chart_test.mk index 885b8eda6448..1c4beda696cb 100644 --- a/chart2/CppunitTest_chart2_pivot_chart_test.mk +++ b/chart2/CppunitTest_chart2_pivot_chart_test.mk @@ -71,8 +71,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_pivot_chart_test)) $(eval $(call gb_CppunitTest_use_components,chart2_pivot_chart_test,\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/chart2/CppunitTest_chart2_trendcalculators.mk b/chart2/CppunitTest_chart2_trendcalculators.mk index c6b3dc0a328a..354c5a73d97a 100644 --- a/chart2/CppunitTest_chart2_trendcalculators.mk +++ b/chart2/CppunitTest_chart2_trendcalculators.mk @@ -72,8 +72,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_trendcalculators)) $(eval $(call gb_CppunitTest_use_components,chart2_trendcalculators,\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ embeddedobj/util/embobj \ diff --git a/chart2/CppunitTest_chart2_xshape.mk b/chart2/CppunitTest_chart2_xshape.mk index eabc54b26ea2..3cbd65d1e73b 100644 --- a/chart2/CppunitTest_chart2_xshape.mk +++ b/chart2/CppunitTest_chart2_xshape.mk @@ -73,8 +73,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_xshape)) $(eval $(call gb_CppunitTest_use_components,chart2_xshape,\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ embeddedobj/util/embobj \ diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chart2.mk similarity index 51% rename from chart2/Library_chartcontroller.mk rename to chart2/Library_chart2.mk index b2d05298c237..fb5fcec449f5 100644 --- a/chart2/Library_chartcontroller.mk +++ b/chart2/Library_chart2.mk @@ -7,34 +7,46 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Library_Library,chartcontroller)) +$(eval $(call gb_Library_Library,chart2)) -$(eval $(call gb_Library_set_include,chartcontroller,\ +$(eval $(call gb_Library_set_include,chart2,\ $$(INCLUDE) \ -I$(SRCDIR)/chart2/source/controller/inc \ + -I$(SRCDIR)/chart2/source/model/inc \ + -I$(SRCDIR)/chart2/source/view/inc \ -I$(SRCDIR)/chart2/source/inc \ -I$(SRCDIR)/chart2/inc \ )) -$(eval $(call gb_Library_set_precompiled_header,chartcontroller,chart2/inc/pch/precompiled_chartcontroller)) +# not ideal - we should use a single core define ideally +$(eval $(call gb_Library_add_defs,chart2,\ + -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \ + -DOOO_DLLIMPLEMENTATION_CHARTVIEW \ +)) + +$(eval $(call gb_Library_set_precompiled_header,chart2,chart2/inc/pch/precompiled_chart2)) -$(eval $(call gb_Library_use_external,chartcontroller,boost_headers)) +$(eval $(call gb_Library_use_externals,chart2,\ + boost_headers \ + libxml2 \ +)) -$(eval $(call gb_Library_use_sdk_api,chartcontroller)) -$(eval $(call gb_Library_use_custom_headers,chartcontroller,\ +$(eval $(call gb_Library_use_sdk_api,chart2)) + +$(eval $(call gb_Library_use_custom_headers,chart2,\ officecfg/registry \ )) -$(eval $(call gb_Library_use_libraries,chartcontroller,\ +$(eval $(call gb_Library_use_libraries,chart2,\ basegfx \ - chartcore \ comphelper \ cppu \ cppuhelper \ drawinglayer \ docmodel \ editeng \ + fwk \ sal \ salhelper \ i18nlangtag \ @@ -51,10 +63,10 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\ vcl \ )) -$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller,services)) +$(eval $(call gb_Library_set_componentfile,chart2,chart2/source/chart2,services)) ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE) -$(eval $(call gb_Library_add_exception_objects,chartcontroller,\ +$(eval $(call gb_Library_add_exception_objects,chart2,\ chart2/source/controller/accessibility/AccessibleBase \ chart2/source/controller/accessibility/AccessibleChartElement \ chart2/source/controller/accessibility/AccessibleChartShape \ @@ -65,7 +77,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ )) endif -$(eval $(call gb_Library_add_exception_objects,chartcontroller,\ +$(eval $(call gb_Library_add_exception_objects,chart2,\ chart2/source/controller/chartapiwrapper/AreaWrapper \ chart2/source/controller/chartapiwrapper/AxisWrapper \ chart2/source/controller/chartapiwrapper/Chart2ModelContact \ @@ -210,4 +222,192 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\ chart2/source/controller/uitest/uiobject \ )) +# view pieces ... +$(eval $(call gb_Library_add_exception_objects,chart2,\ + chart2/source/controller/dialogs/DataBrowserModel \ + chart2/source/controller/dialogs/DialogModel \ + chart2/source/controller/dialogs/RangeSelectionHelper \ + chart2/source/controller/dialogs/RangeSelectionListener \ + chart2/source/controller/dialogs/TimerTriggeredControllerLock \ + 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/HistogramChart \ + chart2/source/view/charttypes/NetChart \ + 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/DataTableView \ + chart2/source/view/main/DrawModelWrapper \ + chart2/source/view/main/ExplicitValueProvider \ + 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/SeriesPlotterContainer \ + 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 \ + chart2/source/view/main/VButton \ +)) + +# model pieces ... +$(eval $(call gb_Library_add_exception_objects,chart2,\ + 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/DataTable \ + 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/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/HistogramChartType \ + chart2/source/model/template/HistogramChartTypeTemplate \ + chart2/source/model/template/HistogramDataInterpreter \ + chart2/source/model/template/HistogramCalculator \ + 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/StockChartTypeTemplate \ + chart2/source/model/template/StockDataInterpreter \ + chart2/source/model/template/XYDataInterpreter \ +)) + +# tools pieces +$(eval $(call gb_Library_add_exception_objects,chart2,\ + chart2/source/tools/AxisHelper \ + chart2/source/tools/BaseGFXHelper \ + chart2/source/tools/CachedDataSequence \ + chart2/source/tools/CharacterProperties \ + 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/HistogramDataSequence \ + 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/LinePropertiesHelper \ + chart2/source/tools/LogarithmicRegressionCurveCalculator \ + chart2/source/tools/MeanValueRegressionCurveCalculator \ + chart2/source/tools/MediaDescriptorHelper \ + chart2/source/tools/ModifyListenerCallBack \ + chart2/source/tools/ModifyListenerHelper \ + chart2/source/tools/MovingAverageRegressionCurveCalculator \ + chart2/source/tools/NameContainer \ + chart2/source/tools/NumberFormatterWrapper \ + chart2/source/tools/ObjectIdentifier \ + chart2/source/tools/OPropertySet \ + chart2/source/tools/PolynomialRegressionCurveCalculator \ + chart2/source/tools/PopupRequest \ + 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/Scaling \ + chart2/source/tools/SceneProperties \ + chart2/source/tools/StatisticsHelper \ + chart2/source/tools/ThreeDHelper \ + chart2/source/tools/TitleHelper \ + 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_chartcore.mk b/chart2/Library_chartcore.mk deleted file mode 100644 index a30539056058..000000000000 --- a/chart2/Library_chartcore.mk +++ /dev/null @@ -1,251 +0,0 @@ -# -*- 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 \ - -I$(SRCDIR)/chart2/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_set_precompiled_header,chartcore,chart2/inc/pch/precompiled_chartcore)) - -$(eval $(call gb_Library_use_externals,chartcore,\ - boost_headers \ - libxml2 \ -)) - -$(eval $(call gb_Library_use_custom_headers,chartcore,\ - officecfg/registry \ -)) - -$(eval $(call gb_Library_use_sdk_api,chartcore)) - -$(eval $(call gb_Library_use_libraries,chartcore,\ - basegfx \ - comphelper \ - cppu \ - cppuhelper \ - drawinglayer \ - editeng \ - fwk \ - i18nlangtag \ - sal \ - salhelper \ - sfx \ - svl \ - svt \ - svxcore \ - tl \ - ucbhelper \ - utl \ - vcl \ - docmodel \ -)) - -$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore,services)) - -# view pieces ... -$(eval $(call gb_Library_add_exception_objects,chartcore,\ - chart2/source/controller/dialogs/DataBrowserModel \ - chart2/source/controller/dialogs/DialogModel \ - chart2/source/controller/dialogs/RangeSelectionHelper \ - chart2/source/controller/dialogs/RangeSelectionListener \ - chart2/source/controller/dialogs/TimerTriggeredControllerLock \ - 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/HistogramChart \ - chart2/source/view/charttypes/NetChart \ - 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/DataTableView \ - chart2/source/view/main/DrawModelWrapper \ - chart2/source/view/main/ExplicitValueProvider \ - 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/SeriesPlotterContainer \ - 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 \ - chart2/source/view/main/VButton \ -)) - -# model pieces ... -$(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/DataTable \ - 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/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/HistogramChartType \ - chart2/source/model/template/HistogramChartTypeTemplate \ - chart2/source/model/template/HistogramDataInterpreter \ - chart2/source/model/template/HistogramCalculator \ - 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/StockChartTypeTemplate \ - chart2/source/model/template/StockDataInterpreter \ - chart2/source/model/template/XYDataInterpreter \ -)) - -# tools pieces -$(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/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/HistogramDataSequence \ - 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/LinePropertiesHelper \ - chart2/source/tools/LogarithmicRegressionCurveCalculator \ - chart2/source/tools/MeanValueRegressionCurveCalculator \ - chart2/source/tools/MediaDescriptorHelper \ - chart2/source/tools/ModifyListenerCallBack \ - chart2/source/tools/ModifyListenerHelper \ - chart2/source/tools/MovingAverageRegressionCurveCalculator \ - chart2/source/tools/NameContainer \ - chart2/source/tools/NumberFormatterWrapper \ - chart2/source/tools/ObjectIdentifier \ - chart2/source/tools/OPropertySet \ - chart2/source/tools/PolynomialRegressionCurveCalculator \ - chart2/source/tools/PopupRequest \ - 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/Scaling \ - chart2/source/tools/SceneProperties \ - chart2/source/tools/StatisticsHelper \ - chart2/source/tools/ThreeDHelper \ - chart2/source/tools/TitleHelper \ - 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/Module_chart2.mk b/chart2/Module_chart2.mk index 5f7fd5aee961..e0aa69e3b097 100644 --- a/chart2/Module_chart2.mk +++ b/chart2/Module_chart2.mk @@ -13,8 +13,7 @@ include $(SRCDIR)/chart2/export_setup.mk $(eval $(call gb_Module_Module,chart2)) $(eval $(call gb_Module_add_targets,chart2,\ - Library_chartcontroller \ - Library_chartcore \ + Library_chart2 \ UIConfig_chart2 \ )) diff --git a/chart2/import_setup.mk b/chart2/import_setup.mk index 0fbbe131941f..67318bca045d 100644 --- a/chart2/import_setup.mk +++ b/chart2/import_setup.mk @@ -76,8 +76,7 @@ $(eval $(call gb_CppunitTest_use_vcl,chart2_import$(1))) $(eval $(call gb_CppunitTest_use_components,chart2_import$(1),\ basic/util/sb \ animations/source/animcore/animcore \ - chart2/source/controller/chartcontroller \ - chart2/source/chartcore \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/chart2/inc/pch/precompiled_chartcore.cxx b/chart2/inc/pch/precompiled_chart2.cxx similarity index 91% rename from chart2/inc/pch/precompiled_chartcore.cxx rename to chart2/inc/pch/precompiled_chart2.cxx index 10d8b365b864..545316ea4903 100644 --- a/chart2/inc/pch/precompiled_chartcore.cxx +++ b/chart2/inc/pch/precompiled_chart2.cxx @@ -7,6 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "precompiled_chartcore.hxx" +#include "precompiled_chart2.hxx" /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/inc/pch/precompiled_chartcontroller.hxx b/chart2/inc/pch/precompiled_chart2.hxx similarity index 77% rename from chart2/inc/pch/precompiled_chartcontroller.hxx rename to chart2/inc/pch/precompiled_chart2.hxx index 77745b05373c..64dd101a2167 100644 --- a/chart2/inc/pch/precompiled_chartcontroller.hxx +++ b/chart2/inc/pch/precompiled_chart2.hxx @@ -13,19 +13,22 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2023-07-19 09:20:36 using: - ./bin/update_pch chart2 chartcontroller --cutoff=6 --exclude:system --include:module --include:local + Generated on 2025-03-29 13:43:14 using: + ./bin/update_pch chart2 chart2 --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./chart2/inc/pch/precompiled_chartcontroller.hxx "make chart2.build" --find-conflicts + ./bin/update_pch_bisect ./chart2/inc/pch/precompiled_chart2.hxx "make chart2.build" --find-conflicts */ #include <sal/config.h> #if PCH_LEVEL >= 1 #include <algorithm> #include <array> +#include <atomic> #include <cassert> #include <cmath> +#include <compare> +#include <concepts> #include <cstddef> #include <cstdlib> #include <cstring> @@ -52,6 +55,7 @@ #include <string.h> #include <string> #include <string_view> +#include <tuple> #include <type_traits> #include <typeinfo> #include <unordered_map> @@ -62,6 +66,7 @@ #include <boost/property_tree/ptree_fwd.hpp> #endif // PCH_LEVEL >= 1 #if PCH_LEVEL >= 2 +#include <osl/conditn.hxx> #include <osl/diagnose.h> #include <osl/diagnose.hxx> #include <osl/doublecheckedlocking.h> @@ -85,10 +90,10 @@ #include <rtl/stringutils.hxx> #include <rtl/textcvt.h> #include <rtl/textenc.h> -#include <rtl/ustrbuf.h> #include <rtl/ustrbuf.hxx> #include <rtl/ustring.h> #include <rtl/ustring.hxx> +#include <rtl/uuid.h> #include <sal/backtrace.hxx> #include <sal/detail/log.h> #include <sal/log.hxx> @@ -153,6 +158,7 @@ #include <vcl/toolboxid.hxx> #include <vcl/uitest/factory.hxx> #include <vcl/vclenum.hxx> +#include <vcl/vclevent.hxx> #include <vcl/vclptr.hxx> #include <vcl/vclreferencebase.hxx> #include <vcl/vectorgraphicdata.hxx> @@ -167,26 +173,29 @@ #include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -#include <basegfx/matrix/hommatrixtemplate.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2ipoint.hxx> #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> +#include <basegfx/polygon/b3dpolypolygon.hxx> #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drectangle.hxx> +#include <basegfx/range/b2irange.hxx> #include <basegfx/range/b3drange.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> #include <basegfx/tuple/Tuple3D.hxx> #include <basegfx/tuple/b2dtuple.hxx> +#include <basegfx/tuple/b2i64tuple.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/bgradient.hxx> #include <basegfx/utils/common.hxx> +#include <basegfx/utils/systemdependentdata.hxx> #include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> @@ -197,11 +206,14 @@ #include <chartview/DrawModelWrapper.hxx> #include <chartview/ExplicitValueProvider.hxx> #include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient2.hpp> +#include <com/sun/star/awt/FontDescriptor.hpp> +#include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/GradientStyle.hpp> #include <com/sun/star/awt/Key.hpp> #include <com/sun/star/awt/KeyGroup.hpp> +#include <com/sun/star/awt/Point.hpp> #include <com/sun/star/awt/Size.hpp> +#include <com/sun/star/beans/Pair.hpp> #include <com/sun/star/beans/Property.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> @@ -215,24 +227,54 @@ #include <com/sun/star/beans/XPropertySetOption.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp> +#include <com/sun/star/chart/ChartAxisPosition.hpp> +#include <com/sun/star/chart/ChartDataRowSource.hpp> +#include <com/sun/star/chart/ChartLegendExpansion.hpp> +#include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> +#include <com/sun/star/chart/MissingValueTreatment.hpp> +#include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/AxisType.hpp> +#include <com/sun/star/chart2/DataPointGeometry3D.hpp> +#include <com/sun/star/chart2/DataPointLabel.hpp> +#include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> +#include <com/sun/star/chart2/RelativeSize.hpp> +#include <com/sun/star/chart2/StackingDirection.hpp> +#include <com/sun/star/chart2/Symbol.hpp> +#include <com/sun/star/chart2/XAxis.hpp> +#include <com/sun/star/chart2/XRegressionCurveCalculator.hpp> +#include <com/sun/star/container/XChild.hpp> +#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNamed.hpp> +#include <com/sun/star/document/XActionLockable.hpp> #include <com/sun/star/drawing/DashStyle.hpp> +#include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/HatchStyle.hpp> #include <com/sun/star/drawing/LineCap.hpp> +#include <com/sun/star/drawing/LineJoint.hpp> +#include <com/sun/star/drawing/LineStyle.hpp> +#include <com/sun/star/drawing/PolygonKind.hpp> #include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> +#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> +#include <com/sun/star/drawing/TextVerticalAdjust.hpp> +#include <com/sun/star/drawing/XConnectorShape.hpp> +#include <com/sun/star/drawing/XControlShape.hpp> +#include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> +#include <com/sun/star/drawing/XGluePointsSupplier.hpp> +#include <com/sun/star/drawing/XShape.hpp> +#include <com/sun/star/drawing/XShapeGroup.hpp> +#include <com/sun/star/drawing/XShapes.hpp> +#include <com/sun/star/drawing/XShapes2.hpp> #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/form/FormComponentType.hpp> #include <com/sun/star/frame/XFrame.hpp> +#include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel3.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/graphic/XPrimitive2D.hpp> #include <com/sun/star/i18n/CharacterIteratorMode.hpp> #include <com/sun/star/i18n/ForbiddenCharacters.hpp> @@ -242,20 +284,28 @@ #include <com/sun/star/i18n/WordType.hpp> #include <com/sun/star/i18n/reservedWords.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/style/LineSpacing.hpp> #include <com/sun/star/style/NumberingType.hpp> +#include <com/sun/star/style/TabStop.hpp> #include <com/sun/star/style/XStyle.hpp> +#include <com/sun/star/style/XStyleSupplier.hpp> +#include <com/sun/star/text/XTextAppend.hpp> +#include <com/sun/star/text/XTextContent.hpp> +#include <com/sun/star/text/XTextCopy.hpp> +#include <com/sun/star/text/XTextCursor.hpp> +#include <com/sun/star/text/XTextRange.hpp> +#include <com/sun/star/text/XTextRangeCompare.hpp> +#include <com/sun/star/text/XTextRangeMover.hpp> #include <com/sun/star/text/textfield/Type.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> @@ -268,18 +318,19 @@ #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> #include <com/sun/star/uno/XAggregation.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> #include <com/sun/star/uno/genfunc.h> #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/XAccounting.hpp> -#include <com/sun/star/util/XModifyBroadcaster.hpp> -#include <com/sun/star/util/XModifyListener.hpp> +#include <com/sun/star/util/XCloneable.hpp> +#include <com/sun/star/util/XComplexColor.hpp> #include <com/sun/star/util/XUpdatable.hpp> +#include <com/sun/star/view/XSelectionChangeListener.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/broadcasthelper.hxx> #include <comphelper/compbase.hxx> @@ -290,10 +341,14 @@ #include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/multicontainer2.hxx> +#include <comphelper/multiinterfacecontainer4.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/propagg.hxx> #include <comphelper/proparrhlp.hxx> +#include <comphelper/property.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/propertycontainerhelper.hxx> +#include <comphelper/propertysetinfo.hxx> #include <comphelper/propstate.hxx> #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> @@ -304,12 +359,12 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/cppuhelperdllapi.h> #include <cppuhelper/implbase.hxx> +#include <cppuhelper/implbase12.hxx> #include <cppuhelper/implbase_ex.hxx> #include <cppuhelper/implbase_ex_post.hxx> #include <cppuhelper/implbase_ex_pre.hxx> #include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/weakagg.hxx> @@ -324,8 +379,10 @@ #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> #include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <editeng/colritem.hxx> +#include <editeng/EPaM.hxx> +#include <editeng/ESelection.hxx> #include <editeng/editdata.hxx> +#include <editeng/editeng.hxx> #include <editeng/editengdllapi.h> #include <editeng/editobj.hxx> #include <editeng/editstat.hxx> @@ -335,21 +392,27 @@ #include <editeng/flditem.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/macros.hxx> +#include <editeng/memberids.h> #include <editeng/outliner.hxx> #include <editeng/outlobj.hxx> #include <editeng/overflowingtxt.hxx> #include <editeng/paragraphdata.hxx> #include <editeng/svxenum.hxx> #include <editeng/svxfont.hxx> +#include <editeng/unoedsrc.hxx> +#include <editeng/unoipset.hxx> +#include <editeng/unotext.hxx> #include <i18nlangtag/i18nlangtagdllapi.h> #include <i18nlangtag/lang.h> #include <i18nlangtag/languagetag.hxx> +#include <o3tl/concepts.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/deleter.hxx> #include <o3tl/enumarray.hxx> #include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> +#include <o3tl/string_view.hxx> #include <o3tl/strong_int.hxx> #include <o3tl/typed_flags_set.hxx> #include <o3tl/underlyingenumvalue.hxx> @@ -366,11 +429,14 @@ #include <svl/SfxBroadcaster.hxx> #include <svl/eitem.hxx> #include <svl/hint.hxx> +#include <svl/ilstitem.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> +#include <svl/itemprop.hxx> #include <svl/itemset.hxx> #include <svl/languageoptions.hxx> #include <svl/lstner.hxx> +#include <svl/numformat.hxx> #include <svl/poolitem.hxx> #include <svl/setitem.hxx> #include <svl/stritem.hxx> @@ -402,6 +468,7 @@ #include <svx/svddrag.hxx> #include <svx/svdedtv.hxx> #include <svx/svdedxv.hxx> +#include <svx/svdgeodata.hxx> #include <svx/svdglev.hxx> #include <svx/svdglue.hxx> #include <svx/svdhdl.hxx> @@ -415,6 +482,7 @@ #include <svx/svdobjkind.hxx> #include <svx/svdoedge.hxx> #include <svx/svdotext.hxx> +#include <svx/svdpage.hxx> #include <svx/svdpntv.hxx> #include <svx/svdpoev.hxx> #include <svx/svdsnpv.hxx> @@ -424,12 +492,14 @@ #include <svx/svdtypes.hxx> #include <svx/svdundo.hxx> #include <svx/svxdllapi.h> +#include <svx/unoshape.hxx> #include <svx/xdash.hxx> #include <svx/xdef.hxx> #include <svx/xhatch.hxx> #include <svx/xit.hxx> #include <svx/xpoly.hxx> #include <svx/xtable.hxx> +#include <tools/UniqueID.hxx> #include <tools/color.hxx> #include <tools/date.hxx> #include <tools/datetime.hxx> @@ -458,18 +528,19 @@ #include <uno/sequence2.h> #include <unotools/eventlisteneradapter.hxx> #include <unotools/fontdefs.hxx> -#include <unotools/localedatawrapper.hxx> #include <unotools/options.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> -#include <unotools/tempfile.hxx> #include <unotools/unotoolsdllapi.h> #include <unotools/weakref.hxx> #endif // PCH_LEVEL >= 3 #if PCH_LEVEL >= 4 #include <Axis.hxx> #include <AxisHelper.hxx> +#include <AxisIndexDefines.hxx> #include <BaseCoordinateSystem.hxx> +#include <BaseGFXHelper.hxx> +#include <CharacterProperties.hxx> #include <CharacterPropertyItemConverter.hxx> #include <ChartController.hxx> #include <ChartModel.hxx> @@ -480,35 +551,59 @@ #include <ChartTypeTemplate.hxx> #include <ChartView.hxx> #include <ChartWindow.hxx> +#include <Clipping.hxx> +#include <CloneHelper.hxx> #include <CommonConverters.hxx> #include <ControllerLockGuard.hxx> #include <DataSeries.hxx> #include <DataSeriesHelper.hxx> +#include <DataSeriesProperties.hxx> +#include <DataSource.hxx> #include <DataSourceHelper.hxx> +#include <DateHelper.hxx> #include <Diagram.hxx> #include <DiagramHelper.hxx> #include <DrawViewWrapper.hxx> +#include <ExplicitCategoriesProvider.hxx> #include <FastPropertyIdRanges.hxx> #include <FillProperties.hxx> #include <GraphicPropertyItemConverter.hxx> +#include <GridProperties.hxx> #include <ItemConverter.hxx> #include <ItemPropertyMap.hxx> +#include <LabelPositionHelper.hxx> +#include <LabeledDataSequence.hxx> #include <Legend.hxx> #include <LegendHelper.hxx> #include <LinePropertiesHelper.hxx> +#include <ModifyListenerHelper.hxx> +#include <NumberFormatterWrapper.hxx> +#include <OPropertySet.hxx> #include <ObjectIdentifier.hxx> #include <ObjectNameProvider.hxx> +#include <PlottingPositionHelper.hxx> +#include <PropertyHelper.hxx> +#include <PropertyMapper.hxx> +#include <ReferenceSizeProvider.hxx> +#include <RegressionCalculationHelper.hxx> +#include <RegressionCurveCalculator.hxx> #include <RegressionCurveHelper.hxx> #include <RegressionCurveModel.hxx> +#include <RelativePositionHelper.hxx> +#include <RelativeSizeHelper.hxx> #include <ResId.hxx> +#include <ShapeFactory.hxx> #include <StatisticsHelper.hxx> #include <ThreeDHelper.hxx> #include <TitleHelper.hxx> #include <UserDefinedProperties.hxx> +#include <VLineProperties.hxx> #include <ViewElementListProvider.hxx> #include <WrappedProperty.hxx> #include <charttoolsdllapi.hxx> +#include <defines.hxx> #include <servicenames.hxx> +#include <servicenames_charttypes.hxx> #include <unonames.hxx> #endif // PCH_LEVEL >= 4 diff --git a/chart2/inc/pch/precompiled_chartcontroller.cxx b/chart2/inc/pch/precompiled_chartcontroller.cxx deleted file mode 100644 index 44d47c4a423d..000000000000 --- a/chart2/inc/pch/precompiled_chartcontroller.cxx +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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/. - */ - -#include "precompiled_chartcontroller.hxx" - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/inc/pch/precompiled_chartcore.hxx b/chart2/inc/pch/precompiled_chartcore.hxx deleted file mode 100644 index 9e7d56b2f7eb..000000000000 --- a/chart2/inc/pch/precompiled_chartcore.hxx +++ /dev/null @@ -1,303 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * 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 has been autogenerated by update_pch.sh. It is possible to edit it - manually (such as when an include file has been moved/renamed/removed). All such - manual changes will be rewritten by the next run of update_pch.sh (which presumably - also fixes all possible problems, so it's usually better to use it). - - Generated on 2023-07-19 09:21:03 using: - ./bin/update_pch chart2 chartcore --cutoff=3 --exclude:system --exclude:module --include:local - - If after updating build fails, use the following command to locate conflicting headers: - ./bin/update_pch_bisect ./chart2/inc/pch/precompiled_chartcore.hxx "make chart2.build" --find-conflicts -*/ - -#include <sal/config.h> -#if PCH_LEVEL >= 1 -#include <algorithm> -#include <cassert> -#include <cmath> -#include <cstddef> -#include <cstdlib> -#include <functional> -#include <iterator> -#include <limits> -#include <map> -#include <memory> -#include <mutex> -#include <new> -#include <optional> -#include <ostream> -#include <set> -#include <span> -#include <string_view> -#include <type_traits> -#include <unordered_map> -#include <utility> -#include <vector> -#include <boost/property_tree/ptree_fwd.hpp> -#endif // PCH_LEVEL >= 1 -#if PCH_LEVEL >= 2 -#include <osl/conditn.hxx> -#include <osl/diagnose.h> -#include <osl/mutex.hxx> -#include <rtl/alloc.h> -#include <rtl/character.hxx> -#include <rtl/instance.hxx> -#include <rtl/locale.h> -#include <rtl/math.h> -#include <rtl/math.hxx> -#include <rtl/ref.hxx> -#include <rtl/strbuf.hxx> -#include <rtl/string.hxx> -#include <rtl/stringconcat.hxx> -#include <rtl/stringutils.hxx> -#include <rtl/textenc.h> -#include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> -#include <rtl/ustring.hxx> -#include <rtl/uuid.h> -#include <sal/log.hxx> -#include <sal/macros.h> -#include <sal/types.h> -#include <vcl/dllapi.h> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> -#endif // PCH_LEVEL >= 2 -#if PCH_LEVEL >= 3 -#include <basegfx/basegfxdllapi.h> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/point/b2ipoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/range/b2drange.hxx> -#include <basegfx/tuple/b2dtuple.hxx> -#include <basegfx/tuple/b2ituple.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <basegfx/vector/b2enums.hxx> -#include <basegfx/vector/b2ivector.hxx> -#include <chartview/DrawModelWrapper.hxx> -#include <com/sun/star/awt/Point.hpp> -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> -#include <com/sun/star/beans/XMultiPropertyStates.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XPropertySetOption.hpp> -#include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/chart/ChartAxisPosition.hpp> -#include <com/sun/star/chart/ChartDataRowSource.hpp> -#include <com/sun/star/chart/ChartLegendExpansion.hpp> -#include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart/MissingValueTreatment.hpp> -#include <com/sun/star/chart/TimeUnit.hpp> -#include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/chart2/CurveStyle.hpp> -#include <com/sun/star/chart2/DataPointGeometry3D.hpp> -#include <com/sun/star/chart2/DataPointLabel.hpp> -#include <com/sun/star/chart2/LegendPosition.hpp> -#include <com/sun/star/chart2/MovingAverageType.hpp> -#include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/RelativeSize.hpp> -#include <com/sun/star/chart2/StackingDirection.hpp> -#include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/SymbolStyle.hpp> -#include <com/sun/star/chart2/XDataSeries.hpp> -#include <com/sun/star/chart2/XFormattedString2.hpp> -#include <com/sun/star/chart2/data/XDataSequence.hpp> -#include <com/sun/star/chart2/data/XDataSource.hpp> -#include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> -#include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> -#include <com/sun/star/chart2/data/XTextualDataSequence.hpp> -#include <com/sun/star/container/NoSuchElementException.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/drawing/BitmapMode.hpp> -#include <com/sun/star/drawing/DoubleSequence.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/HomogenMatrix.hpp> -#include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/LineDash.hpp> -#include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/Position3D.hpp> -#include <com/sun/star/drawing/RectanglePoint.hpp> -#include <com/sun/star/drawing/ShadeMode.hpp> -#include <com/sun/star/drawing/TextHorizontalAdjust.hpp> -#include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/text/WritingMode2.hpp> -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Type.h> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/util/CloseVetoException.hpp> -#include <com/sun/star/util/XCloneable.hpp> -#include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/view/XSelectionSupplier.hpp> -#include <comphelper/comphelperdllapi.h> -#include <comphelper/diagnose_ex.hxx> -#include <comphelper/errcode.hxx> -#include <comphelper/interfacecontainer4.hxx> -#include <comphelper/processfactory.hxx> -#include <comphelper/property.hxx> -#include <comphelper/scopeguard.hxx> -#include <comphelper/sequence.hxx> -#include <comphelper/servicehelper.hxx> -#include <comphelper/uno3.hxx> -#include <cppu/cppudllapi.h> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/interfacecontainer.h> -#include <cppuhelper/propshlp.hxx> -#include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/weakref.hxx> -#include <editeng/editengdllapi.h> -#include <editeng/unoprnms.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> -#include <libxml/xmlwriter.h> -#include <o3tl/cow_wrapper.hxx> -#include <o3tl/safeint.hxx> -#include <o3tl/string_view.hxx> -#include <o3tl/typed_flags_set.hxx> -#include <officecfg/Office/Compatibility.hxx> -#include <salhelper/simplereferenceobject.hxx> -#include <svl/cintitem.hxx> -#include <svl/eitem.hxx> -#include <svl/intitem.hxx> -#include <svl/numformat.hxx> -#include <svl/poolitem.hxx> -#include <svl/svldllapi.h> -#include <svl/typedwhich.hxx> -#include <svx/svdpage.hxx> -#include <svx/svxdllapi.h> -#include <svx/unoshape.hxx> -#include <tools/UnitConversion.hxx> -#include <tools/color.hxx> -#include <tools/gen.hxx> -#include <tools/helpers.hxx> -#include <tools/lineend.hxx> -#include <tools/link.hxx> -#include <tools/long.hxx> -#include <tools/ref.hxx> -#include <tools/stream.hxx> -#include <tools/toolsdllapi.h> -#include <unotools/options.hxx> -#include <unotools/unotoolsdllapi.h> -#endif // PCH_LEVEL >= 3 -#if PCH_LEVEL >= 4 -#include <Axis.hxx> -#include <AxisHelper.hxx> -#include <AxisIndexDefines.hxx> -#include <BaseCoordinateSystem.hxx> -#include <BaseGFXHelper.hxx> -#include <CartesianCoordinateSystem.hxx> -#include <CharacterProperties.hxx> -#include <ChartModel.hxx> -#include <ChartModelHelper.hxx> -#include <ChartType.hxx> -#include <ChartTypeHelper.hxx> -#include <ChartTypeManager.hxx> -#include <ChartTypeTemplate.hxx> -#include <ChartView.hxx> -#include <ChartViewHelper.hxx> -#include <Clipping.hxx> -#include <CloneHelper.hxx> -#include <CommonConverters.hxx> -#include <CommonFunctors.hxx> -#include <ControllerLockGuard.hxx> -#include <DataSeries.hxx> -#include <DataSeriesHelper.hxx> -#include <DataSeriesProperties.hxx> -#include <DataSource.hxx> -#include <DataSourceHelper.hxx> -#include <DataTable.hxx> -#include <DateHelper.hxx> -#include <Diagram.hxx> -#include <DiagramHelper.hxx> -#include <ExplicitCategoriesProvider.hxx> -#include <FillProperties.hxx> -#include <FormattedString.hxx> -#include <GridProperties.hxx> -#include <InternalDataProvider.hxx> -#include <LabelPositionHelper.hxx> -#include <LabeledDataSequence.hxx> -#include <Legend.hxx> -#include <LinePropertiesHelper.hxx> -#include <MediaDescriptorHelper.hxx> -#include <ModifyListenerHelper.hxx> -#include <NumberFormatterWrapper.hxx> -#include <ObjectIdentifier.hxx> -#include <PlottingPositionHelper.hxx> -#include <PolarCoordinateSystem.hxx> -#include <PolarLabelPositionHelper.hxx> -#include <PropertyHelper.hxx> -#include <PropertyMapper.hxx> -#include <RangeHighlighter.hxx> -#include <ReferenceSizeProvider.hxx> -#include <RegressionCalculationHelper.hxx> -#include <RegressionCurveCalculator.hxx> -#include <RegressionCurveHelper.hxx> -#include <RegressionCurveModel.hxx> -#include <RelativePositionHelper.hxx> -#include <RelativeSizeHelper.hxx> -#include <ResId.hxx> -#include <ScaleAutomatism.hxx> -#include <ShapeFactory.hxx> -#include <SpecialCharacters.hxx> -#include <Stripe.hxx> -#include <ThreeDHelper.hxx> -#include <Title.hxx> -#include <TitleHelper.hxx> -#include <UserDefinedProperties.hxx> -#include <VLineProperties.hxx> -#include <VSeriesPlotter.hxx> -#include <ViewDefines.hxx> -#include <WrappedProperty.hxx> -#include <charttoolsdllapi.hxx> -#include <defines.hxx> -#include <servicenames.hxx> -#include <servicenames_charttypes.hxx> -#include <servicenames_coosystems.hxx> -#include <unonames.hxx> -#endif // PCH_LEVEL >= 4 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/chart2/source/chartcore.component b/chart2/source/chart2.component similarity index 89% rename from chart2/source/chartcore.component rename to chart2/source/chart2.component index 9527f52cf432..9ec6602562cd 100644 --- a/chart2/source/chartcore.component +++ b/chart2/source/chart2.component @@ -268,4 +268,35 @@ constructor="com_sun_star_comp_chart2_ChartView_get_implementation"> <service name="com.sun.star.chart2.ChartView"/> </implementation> + <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController" + constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper" + constructor="com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation"> + <service name="com.sun.star.beans.PropertySet"/> + <service name="com.sun.star.chart.ChartDocument"/> + <service name="com.sun.star.chart2.ChartDocumentWrapper"/> + <service name="com.sun.star.xml.UserDefinedAttributesSupplier"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartFrameLoader" + constructor="com_sun_star_comp_chart2_ChartFrameLoader_get_implementation"> + <service name="com.sun.star.frame.SynchronousFrameLoader"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.ChartTypeDialog" + constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation"> + <service name="com.sun.star.chart2.ChartTypeDialog"/> + </implementation> + <implementation name="com.sun.star.comp.chart2.WizardDialog" + constructor="com_sun_star_comp_chart2_WizardDialog_get_implementation"> + <service name="com.sun.star.chart2.WizardDialog"/> + </implementation> + <implementation name="org.libreoffice.comp.chart2.sidebar.ChartPanelFactory" + constructor="org_libreoffice_comp_chart2_sidebar_ChartPanelFactory"> + <service name="com.sun.star.ui.UIElementFactory"/> + </implementation> + <implementation name="org.libreoffice.chart2.Chart2ToolboxController" + constructor="org_libreoffice_chart2_Chart2ToolboxController"> + <service name="com.sun.star.frame.ToolbarController"/> + </implementation> </component> diff --git a/chart2/source/controller/chartcontroller.component b/chart2/source/controller/chartcontroller.component deleted file mode 100644 index ef8e748242e8..000000000000 --- a/chart2/source/controller/chartcontroller.component +++ /dev/null @@ -1,53 +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" environment="@CPPU_ENV@" - xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="com.sun.star.comp.chart.ElementSelectorToolbarController" - constructor="com_sun_star_comp_chart_ElementSelectorToolbarController_get_implementation"> - <service name="com.sun.star.frame.ToolbarController"/> - </implementation> - <implementation name="com.sun.star.comp.chart2.ChartDocumentWrapper" - constructor="com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation"> - <service name="com.sun.star.beans.PropertySet"/> - <service name="com.sun.star.chart.ChartDocument"/> - <service name="com.sun.star.chart2.ChartDocumentWrapper"/> - <service name="com.sun.star.xml.UserDefinedAttributesSupplier"/> - </implementation> - <implementation name="com.sun.star.comp.chart2.ChartFrameLoader" - constructor="com_sun_star_comp_chart2_ChartFrameLoader_get_implementation"> - <service name="com.sun.star.frame.SynchronousFrameLoader"/> - </implementation> - <implementation name="com.sun.star.comp.chart2.ChartTypeDialog" - constructor="com_sun_star_comp_chart2_ChartTypeDialog_get_implementation"> - <service name="com.sun.star.chart2.ChartTypeDialog"/> - </implementation> - <implementation name="com.sun.star.comp.chart2.WizardDialog" - constructor="com_sun_star_comp_chart2_WizardDialog_get_implementation"> - <service name="com.sun.star.chart2.WizardDialog"/> - </implementation> - <implementation name="org.libreoffice.comp.chart2.sidebar.ChartPanelFactory" - constructor="org_libreoffice_comp_chart2_sidebar_ChartPanelFactory"> - <service name="com.sun.star.ui.UIElementFactory"/> - </implementation> - <implementation name="org.libreoffice.chart2.Chart2ToolboxController" - constructor="org_libreoffice_chart2_Chart2ToolboxController"> - <service name="com.sun.star.frame.ToolbarController"/> - </implementation> -</component> diff --git a/sc/CppunitTest_sc_cache_test.mk b/sc/CppunitTest_sc_cache_test.mk index 9eeadcc6dd26..625c3035f140 100644 --- a/sc/CppunitTest_sc_cache_test.mk +++ b/sc/CppunitTest_sc_cache_test.mk @@ -78,8 +78,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_cache_test)) $(eval $(call gb_CppunitTest_use_components,sc_cache_test,\ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_cond_format_merge.mk b/sc/CppunitTest_sc_cond_format_merge.mk index c588e44580ff..03b40956288e 100644 --- a/sc/CppunitTest_sc_cond_format_merge.mk +++ b/sc/CppunitTest_sc_cond_format_merge.mk @@ -74,8 +74,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_cond_format_merge)) $(eval $(call gb_CppunitTest_use_components,sc_cond_format_merge,\ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sc/CppunitTest_sc_dataprovider.mk b/sc/CppunitTest_sc_dataprovider.mk index f0f61bd278c0..e952eb5632b8 100644 --- a/sc/CppunitTest_sc_dataprovider.mk +++ b/sc/CppunitTest_sc_dataprovider.mk @@ -82,8 +82,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_dataprovider)) $(eval $(call gb_CppunitTest_use_components,sc_dataprovider,\ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/cpool/dbpool2 \ diff --git a/sc/CppunitTest_sc_filters_test.mk b/sc/CppunitTest_sc_filters_test.mk index 3dae5136e1e3..98940da5691f 100644 --- a/sc/CppunitTest_sc_filters_test.mk +++ b/sc/CppunitTest_sc_filters_test.mk @@ -78,8 +78,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_filters_test)) $(eval $(call gb_CppunitTest_use_components,sc_filters_test,\ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ connectivity/source/manager/sdbc2 \ diff --git a/sc/CppunitTest_sc_mark_test.mk b/sc/CppunitTest_sc_mark_test.mk index 60686043fd4b..a81c4e0b8a85 100644 --- a/sc/CppunitTest_sc_mark_test.mk +++ b/sc/CppunitTest_sc_mark_test.mk @@ -78,8 +78,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sc_mark_test)) $(eval $(call gb_CppunitTest_use_components,sc_mark_test,\ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/sd/import_setup.mk b/sd/import_setup.mk index f4788040d3fa..662ceec2d579 100644 --- a/sd/import_setup.mk +++ b/sd/import_setup.mk @@ -73,8 +73,7 @@ $(eval $(call gb_CppunitTest_use_vcl,sd_import_tests$(1))) $(eval $(call gb_CppunitTest_use_components,sd_import_tests$(1),\ animations/source/animcore/animcore \ basic/util/sb \ - chart2/source/chartcore \ - chart2/source/controller/chartcontroller \ + chart2/source/chart2 \ comphelper/util/comphelp \ configmgr/source/configmgr \ dbaccess/util/dba \ diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py index 993c1ed88d2a..d9f57f2b2c49 100755 --- a/solenv/bin/native-code.py +++ b/solenv/bin/native-code.py @@ -40,7 +40,7 @@ core_constructor_list = [ # canvas/source/vcl/vclcanvas.component "com_sun_star_comp_rendering_Canvas_VCL_get_implementation", "com_sun_star_comp_rendering_SpriteCanvas_VCL_get_implementation", -# chart2/source/chartcore.component +# chart2/source/chart2.component "com_sun_star_chart2_ExponentialScaling_get_implementation", "com_sun_star_chart2_LinearScaling_get_implementation", "com_sun_star_chart2_LogarithmicScaling_get_implementation", @@ -86,7 +86,6 @@ core_constructor_list = [ "com_sun_star_comp_chart2_RegressionEquation_get_implementation", "com_sun_star_comp_chart2_Title_get_implementation", "com_sun_star_comp_chart2_XMLFilter_get_implementation", -# chart2/source/controller/chartcontroller.component "com_sun_star_comp_chart2_ChartDocumentWrapper_get_implementation", "com_sun_star_comp_chart2_ChartFrameLoader_get_implementation", "com_sun_star_comp_chart2_WizardDialog_get_implementation", diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index abee422656d5..6e0439af7d82 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -18,8 +18,7 @@ gb_MERGE_LIBRARY_LIST := \ basegfx \ canvasfactory \ canvastools \ - chartcontroller \ - chartcore \ + chart2 \ comphelper \ configmgr \ cppcanvas \ diff --git a/vcl/commonfuzzer.mk b/vcl/commonfuzzer.mk index fe625a1bc88a..00505766c49f 100644 --- a/vcl/commonfuzzer.mk +++ b/vcl/commonfuzzer.mk @@ -113,8 +113,7 @@ fuzzer_core_libraries = \ xmlscript \ xo \ xstor \ - chartcontroller \ - chartcore \ + chart2 \ sm \ oox \ proxyfac \
