1 files changed, 6 insertions, 9 deletions
diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
index 73945d783d3a..b61390ec42ea 100644
--- a/chart2/Library_chartcore.mk
+++ b/chart2/Library_chartcore.mk
@@ -30,12 +30,6 @@ $(eval $(call gb_Library_use_externals,chartcore,\
 	libxml2 \
 ))
 
-ifeq ($(DISABLE_GUI),)
-$(eval $(call gb_Library_use_externals,chartcore,\
-    epoxy \
-))
-endif
-
 $(eval $(call gb_Library_use_custom_headers,chartcore,\
 	officecfg/registry \
 ))
@@ -61,9 +55,10 @@ $(eval $(call gb_Library_use_libraries,chartcore,\
     ucbhelper \
     utl \
     vcl \
+    docmodel \
 ))
 
-$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore))
+$(eval $(call gb_Library_set_componentfile,chartcore,chart2/source/chartcore,services))
 
 # view pieces ...
 $(eval $(call gb_Library_add_exception_objects,chartcore,\
@@ -92,7 +87,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     chart2/source/view/charttypes/BubbleChart \
     chart2/source/view/charttypes/CandleStickChart \
     chart2/source/view/charttypes/CategoryPositionHelper \
-    chart2/source/view/charttypes/ConfigAccess \
     chart2/source/view/charttypes/NetChart \
     chart2/source/view/charttypes/PieChart \
     chart2/source/view/charttypes/Splines \
@@ -102,13 +96,16 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     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 \
@@ -132,6 +129,7 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     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 \
@@ -228,7 +226,6 @@ $(eval $(call gb_Library_add_exception_objects,chartcore,\
     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 \