merge pointlessly fragmented chart2 libraries, leaving controller split.

Repository.mk

@@ -245,9 +245,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
     basegfx \
     calc \
     chartcontroller \
-    chartmodel \
-    charttools \
-    chartview \
+    chartcore \
     cppcanvas \
     ctl \
     cui \

android/Bootstrap/Makefile.shared

@@ -51,3 +51,9 @@ uninstall:
 clean: properties
 	$(ANT) clean
 	rm -rf assets $(SODEST) $(OBJLOCAL)
+
+# If you reinstall an app several times, even if you uninstall it
+# between, disk space seems to leak that won't get recycled until you
+# stop and start...
+stop-start-cycle:
+	$(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10

android/experimental/LibreOffice4Android/Makefile

@@ -21,14 +21,21 @@ copy-stuff:
 #
 	for F in $(strip \
 		   analysislo \
+		   avmedialo \
 		   basebmplo \
 		   basegfxlo \
 		   bootstrap.uno \
+		   canvastoolslo \
+		   chartcontrollerlo \
+		   chartcorelo \
 		   comphelpgcc3 \
+		   cppcanvaslo \
 		   ctllo \
 		   datelo \
 		   dbaxmllo \
 		   dbtoolslo \
+		   drawinglayerlo \
+		   embobj \
 		   evtattlo \
 		   expwrap.uno \
 		   fastsax.uno \
@@ -39,6 +46,7 @@ copy-stuff:
 		   fsstorage.uno \
 		   gcc3_uno \
 		   hwplo \
+		   hyphenlo \
 		   i18nisolang1gcc3 \
 		   i18npool.uno \
 		   i18nutilgcc3 \
@@ -53,9 +61,13 @@ copy-stuff:
 		   jvmaccessgcc3 \
 		   jvmfwk \
 		   libotouchlo \
+		   lnglo \
+		   lnthlo \
 		   lo-bootstrap \
 		   localebe1.uno \
 		   localedata_en \
+		   localedata_es \
+		   localedata_euro \
 		   localedata_others \
 		   lwpftlo \
 		   mergedlo \
@@ -66,17 +78,21 @@ copy-stuff:
 		   reg \
 		   saxlo \
 		   sclo \
+		   sclo \
 		   scdlo \
 		   scfiltlo \
+		   sdlo \
 		   sddlo \
 		   smdlo \
 		   sotlo \
+		   spelllo \
 		   stocservices.uno \
 		   store \
 		   svgfilterlo \
 		   svllo \
 		   swdlo \
 		   swlo \
+		   swdlo \
 		   t602filterlo \
 		   textinstream.uno \
 		   tllo \
@@ -99,6 +115,7 @@ copy-stuff:
 		   xmlfdlo \
 		   xmlreader \
 		   xmlsecurity \
+		   xoflo \
 		   xslt \
 		   xstor \
 		  ); do \

android/qa/desktop/Makefile

@@ -168,9 +168,7 @@ copy-stuff: buildrcs
 		  scfiltlo \
 		  \
 		  chartcontrollerlo \
-		  chartviewlo \
-		  chartmodello \
-		  charttoolslo \
+		  chartcorelo \
 		  ); do \
 	    $(call COPYSO,$(OUTDIR)/lib/lib$${F}.so); \
 	done
@@ -230,11 +228,3 @@ run:
 	$(ANDROID_SDK_HOME)/platform-tools/adb push cmdline $(APP_DATA_PATH)/cmdline
 	$(ANDROID_SDK_HOME)/platform-tools/adb shell am start -n $(APP_PACKAGE)/$(BOOTSTRAP) -e lo-main-delay 20 -e lo-main-indirect-cmdline "$(APP_DATA_PATH)/cmdline"
 # add -e lo-strace yes # if you want that
-
-# If you reinstall an app several times, even if you uninstall it
-# between, disk space seems to leak that won't get recycled until you
-# stop and start...
-stop-start-cycle:
-	$(ANDROID_SDK_HOME)/platform-tools/adb shell stop && $(ANDROID_SDK_HOME)/platform-tools/adb shell start && sleep 10
-
-

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 \

chart2/Library_charttools.mk → chart2/Library_chartcore.mk

 # -*- 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/
+# This file is part of the LibreOffice project.
 #
-# 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.
+# 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/.
 #
-# 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_Library,chartcore))
 
-$(eval $(call gb_Library_set_include,charttools,\
+$(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 \
 ))
 
-$(eval $(call gb_Library_add_defs,charttools,\
+# 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,charttools))
+$(eval $(call gb_Library_use_sdk_api,chartcore))
 
-$(eval $(call gb_Library_use_libraries,charttools,\
+$(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) \
 ))
 
-$(eval $(call gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
+# 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 \
+))
 
-$(eval $(call gb_Library_add_exception_objects,charttools,\
+# 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 \
@@ -124,4 +225,6 @@ $(eval $(call gb_Library_add_exception_objects,charttools,\
     chart2/source/tools/XMLRangeHelper \
 ))
 
+
+
 # vim: set noet sw=4 ts=4:

chart2/Library_chartmodel.mk

-# -*- 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:

chart2/Library_chartview.mk

-# -*- 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:

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

ios/qa/sc/Makefile

@@ -71,7 +71,7 @@ stuff:
 	cp $(OUTDIR)/bin/udkapi.rdb $(OUTDIR)/bin/types.rdb $(OUTDIR)/xml/ure/services.rdb $(APPDIR)
 #
 # a bunch of .component files
-	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/tools/charttools chart2/source/model/chartmodel comphelper/util/comphelp eventattacher/source/evtatt fileaccess/source/fileacc filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \
+	for F in framework/util/fwk i18npool/util/i18npool sfx2/util/sfx ucb/source/core/ucb1 ucb/source/ucp/file/ucpfile1 unoxml/source/service/unoxml configmgr/source/configmgr basic/util/sb chart2/source/controller/chartcontroller chart2/source/tools/chartcore comphelper/util/comphelp eventattacher/source/evtatt fileaccess/source/fileacc filter/source/config/cache/filterconfig1 oox/util/oox package/source/xstor/xstor package/util/package2 sax/source/expatwrap/expwrap sax/source/fastparser/fastsax sc/util/sc sc/util/scfilt scaddins/source/analysis/analysis scaddins/source/datefunc/date sot/util/sot svl/util/svl toolkit/util/tk ucb/source/ucp/tdoc/ucptdoc1 unotools/util/utl unoxml/source/rdf/unordf; do \
 		mkdir -p $(APPDIR)/ComponentTarget/`dirname $$F`; \
 	        cp $(WORKDIR)/ComponentTarget/$$F.component $(APPDIR)/ComponentTarget/$$F.component; \
 	done

scp2/source/ooo/file_library_ooo.scp

@@ -107,9 +107,7 @@ File gid_File_Lib_Ldapbe2
 End
 
 STD_LIB_FILE(gid_File_Lib_Chartcontroller, chartcontroller)
-STD_LIB_FILE(gid_File_Lib_Chartmodel, chartmodel)
-STD_LIB_FILE(gid_File_Lib_Charttools, charttools)
-STD_LIB_FILE(gid_File_Lib_Chartview, chartview)
+STD_LIB_FILE(gid_File_Lib_Chartcore, chartcore)
 
 
 #if defined _MSC_VER

scp2/source/ooo/module_hidden_ooo.scp

@@ -198,10 +198,8 @@ Module gid_Module_Root_Files_4
 	gid_File_Filter_Itg,
 	gid_File_Filter_Iti,
 	gid_File_Lib_Bib,
-	gid_File_Lib_Chartmodel,
-	gid_File_Lib_Chartview,
+	gid_File_Lib_Chartcore,
 	gid_File_Lib_Chartcontroller,
-	gid_File_Lib_Charttools,
 	gid_File_Lib_Ctl,
 	gid_File_Lib_Cui,
     gid_File_Lib_Sdbt,