You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by da...@apache.org on 2026/08/02 02:26:48 UTC
(openoffice) branch trunk updated (079530e0cc -> f116fde0f6)
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
from 079530e0cc Win64 bridge backport (#492)
new 48f8cc8f69 In ImplPreparePolyDraw(), nCurrPoints and nCurrPoint should be sal_uInt32, just like pPoints points to, which they are assigned from or related to. Commit 30f18d3fb8fe7eacd8ee5f353bc7c60bfbf18ac5 didn't fix all the uses of the pointer size change it made.
new 1e5d8e72b5 wParam is already a UINT_PTR, an integer type, so no need to cast it.
new 29ca9883b9 Add "version" as a library on Windows, and link to it so we can find functions like VerQueryValueW() on Win64.
new 25912db745 Use the right entrypoint name for X86-64.
new 14a9b8c1d9 Only build the StarBasic "DLL manager" on x86 Win32, instead of any Windows system that isn't AMD64. It only supports x86 Win32 and never supported anything else; there were discussions on bugs 112064 and 126277 about other platforms, but development never got completed and merged.
new 448dc86220 Change the return type of Get10ThSec() to clock_t, so it works regardless of the size of the integer type.
new 07bf101f83 Early, incomplete attempt to port connectivity to gbuild.
new 5db65c3a88 Fix a path to FileSystemRuntimeException.
new d50e6300ed Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
new 89e8f0e82d Preliminary, incomplete port of charts2 to gbuild.
new f1c404e081 Use the gbuild paths to connectivity components.
new 93fbba6999 Remove unused files.
new 431aafefb5 Add gbuild targets for Configuration (*.xcs, *.xcu).
new ef5605361a Convert officecfg module to gbuild.
new 4dc45a5a3e The gb_Deliver_add_deliverable function takes 3 parameters now.
new 323ac1e9a6 Update the list of .xcs/.xcu files since the build file was written.
new 861c48608f Implement JAR sealing and RegistrationClassName in Ant. Port the Java modules in connectivity to build with Ant. Add hsqldb as an Ant external. Add the Configuration files in connectivity to gbuild. Connectivity configuration postprocess packaging w/o zip files. Fixes to naming, paths in postpostprocess. AllLangResTarget for chart2.
new 9e90d1d104 Add the empty prj/d.lst file for officecfg that was accidentally left out.
new 0a9d806e68 We cannot use $(SRCDIR)/solenv/src/component.map as a version map file yet, because it doesn't export RTTI and exception typeinfos.
new 70996efe05 Fix supported platforms for the ADABAS connectivity driver. Fix configuration packaging for several Windows and Mac connectivity drivers.
new f116fde0f6 In postprocess/packcomponents, fix supported platforms for the ADABAS connectivity driver, and fix the path to the ADO component.
The 21 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
main/Module_ooo.mk | 1 +
main/Repository.mk | 18 +-
main/RepositoryFixes.mk | 8 +
main/basic/source/runtime/dllmgr.cxx | 2 +-
main/chart2/AllLangResTarget_chartcontroller.mk | 200 +++++++++
main/chart2/Library_chartcontroller.mk | 214 ++++++++++
main/chart2/Library_chartmodel.mk | 113 ++++++
main/chart2/Library_charttools.mk | 138 +++++++
main/chart2/Library_chartview.mk | 120 ++++++
.../DataAccess/makefile.mk => chart2/Makefile} | 29 +-
.../makefile.mk => chart2/Module_chart2.mk} | 31 +-
main/chart2/Package_uiconfig.mk | 35 ++
.../inc/pch/precompiled_chartcontroller.cxx} | 11 +-
.../chart2/inc/pch/precompiled_chartcontroller.hxx | 271 +++++++++++++
.../inc/pch/precompiled_chartmodel.cxx} | 11 +-
main/chart2/inc/pch/precompiled_chartmodel.hxx | 271 +++++++++++++
.../inc/pch/precompiled_charttools.cxx} | 11 +-
main/chart2/inc/pch/precompiled_charttools.hxx | 271 +++++++++++++
.../inc/pch/precompiled_chartview.cxx} | 11 +-
main/chart2/inc/pch/precompiled_chartview.hxx | 271 +++++++++++++
main/chart2/prj/build.lst | 28 +-
main/chart2/prj/d.lst | 27 --
.../org/openoffice/ucb => chart2/prj}/makefile.mk | 38 +-
.../accessibility/AccStatisticsObject.cxx | 2 +-
.../controller/accessibility/AccessibleBase.cxx | 2 +-
.../accessibility/AccessibleChartElement.cxx | 2 +-
.../accessibility/AccessibleChartShape.cxx | 2 +-
.../accessibility/AccessibleChartView.cxx | 2 +-
.../accessibility/AccessibleTextHelper.cxx | 2 +-
.../accessibility/AccessibleViewForwarder.cxx | 2 +-
.../accessibility/ChartElementFactory.cxx | 2 +-
.../controller/chartapiwrapper/AreaWrapper.cxx | 2 +-
.../controller/chartapiwrapper/AxisWrapper.cxx | 2 +-
.../chartapiwrapper/Chart2ModelContact.cxx | 2 +-
.../chartapiwrapper/ChartDataWrapper.cxx | 2 +-
.../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +-
.../chartapiwrapper/DataSeriesPointWrapper.cxx | 2 +-
.../controller/chartapiwrapper/DiagramWrapper.cxx | 2 +-
.../controller/chartapiwrapper/GridWrapper.cxx | 2 +-
.../controller/chartapiwrapper/LegendWrapper.cxx | 2 +-
.../chartapiwrapper/MinMaxLineWrapper.cxx | 2 +-
.../controller/chartapiwrapper/TitleWrapper.cxx | 2 +-
.../chartapiwrapper/UpDownBarWrapper.cxx | 2 +-
.../chartapiwrapper/WallFloorWrapper.cxx | 2 +-
.../chartapiwrapper/WrappedAddInProperty.cxx | 2 +-
.../WrappedAutomaticPositionProperties.cxx | 2 +-
.../WrappedAxisAndGridExistenceProperties.cxx | 2 +-
.../WrappedCharacterHeightProperty.cxx | 2 +-
.../WrappedDataCaptionProperties.cxx | 2 +-
.../chartapiwrapper/WrappedGapwidthProperty.cxx | 2 +-
.../WrappedNumberFormatProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleTextProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSceneProperty.cxx | 2 +-
.../WrappedSeriesAreaOrLineProperty.cxx | 2 +-
.../chartapiwrapper/WrappedSplineProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStatisticProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStockProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSymbolProperties.cxx | 2 +-
.../WrappedTextRotationProperty.cxx | 2 +-
.../source/controller/dialogs/ChangingResource.cxx | 2 +-
.../dialogs/ChartTypeDialogController.cxx | 2 +-
.../source/controller/dialogs/DataBrowser.cxx | 2 +-
.../source/controller/dialogs/DataBrowserModel.cxx | 2 +-
.../source/controller/dialogs/DialogModel.cxx | 2 +-
.../controller/dialogs/ObjectNameProvider.cxx | 2 +-
.../chart2/source/controller/dialogs/RangeEdit.cxx | 2 +-
.../controller/dialogs/RangeSelectionButton.cxx | 2 +-
.../controller/dialogs/RangeSelectionHelper.cxx | 2 +-
.../controller/dialogs/RangeSelectionListener.cxx | 2 +-
.../controller/dialogs/TextDirectionListBox.cxx | 2 +-
.../dialogs/TimerTriggeredControllerLock.cxx | 2 +-
.../source/controller/dialogs/TitleDialogData.cxx | 2 +-
.../source/controller/dialogs/dlg_ChartType.cxx | 2 +-
.../controller/dialogs/dlg_ChartType_UNO.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +-
.../source/controller/dialogs/dlg_DataEditor.cxx | 2 +-
.../source/controller/dialogs/dlg_DataSource.cxx | 2 +-
.../controller/dialogs/dlg_InsertAxis_Grid.cxx | 2 +-
.../controller/dialogs/dlg_InsertDataLabel.cxx | 2 +-
.../controller/dialogs/dlg_InsertErrorBars.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertLegend.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertTitle.cxx | 2 +-
.../controller/dialogs/dlg_InsertTrendline.cxx | 2 +-
.../source/controller/dialogs/dlg_NumberFormat.cxx | 2 +-
.../controller/dialogs/dlg_ObjectProperties.cxx | 2 +-
.../source/controller/dialogs/dlg_ShapeFont.cxx | 2 +-
.../controller/dialogs/dlg_ShapeParagraph.cxx | 2 +-
.../source/controller/dialogs/dlg_View3D.cxx | 2 +-
.../source/controller/dialogs/res_BarGeometry.cxx | 2 +-
.../source/controller/dialogs/res_DataLabel.cxx | 2 +-
.../source/controller/dialogs/res_ErrorBar.cxx | 2 +-
.../controller/dialogs/res_LegendPosition.cxx | 2 +-
.../controller/dialogs/res_TextSeparator.cxx | 2 +-
.../source/controller/dialogs/res_Titles.cxx | 2 +-
.../source/controller/dialogs/res_Trendline.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneAppearance.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneGeometry.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneIllumination.cxx | 2 +-
.../source/controller/dialogs/tp_AxisLabel.cxx | 2 +-
.../source/controller/dialogs/tp_AxisPositions.cxx | 2 +-
.../source/controller/dialogs/tp_ChartType.cxx | 2 +-
.../source/controller/dialogs/tp_DataLabel.cxx | 2 +-
.../source/controller/dialogs/tp_DataSource.cxx | 2 +-
.../controller/dialogs/tp_DataSourceControls.cxx | 2 +-
.../source/controller/dialogs/tp_ErrorBars.cxx | 2 +-
.../controller/dialogs/tp_LegendPosition.cxx | 2 +-
.../source/controller/dialogs/tp_Location.cxx | 2 +-
.../source/controller/dialogs/tp_PointGeometry.cxx | 2 +-
.../source/controller/dialogs/tp_PolarOptions.cxx | 2 +-
.../source/controller/dialogs/tp_RangeChooser.cxx | 2 +-
main/chart2/source/controller/dialogs/tp_Scale.cxx | 2 +-
.../source/controller/dialogs/tp_SeriesToAxis.cxx | 2 +-
.../source/controller/dialogs/tp_TitleRotation.cxx | 2 +-
.../source/controller/dialogs/tp_Trendline.cxx | 2 +-
.../dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +-
.../controller/drawinglayer/DrawViewWrapper.cxx | 2 +-
.../drawinglayer/ViewElementListProvider.cxx | 2 +-
.../itemsetwrapper/AxisItemConverter.cxx | 2 +-
.../CharacterPropertyItemConverter.cxx | 2 +-
.../itemsetwrapper/DataPointItemConverter.cxx | 2 +-
.../itemsetwrapper/ErrorBarItemConverter.cxx | 2 +-
.../GraphicPropertyItemConverter.cxx | 2 +-
.../controller/itemsetwrapper/ItemConverter.cxx | 2 +-
.../itemsetwrapper/LegendItemConverter.cxx | 2 +-
.../itemsetwrapper/MultipleChartConverters.cxx | 2 +-
.../itemsetwrapper/MultipleItemConverter.cxx | 2 +-
.../RegressionCurveItemConverter.cxx | 2 +-
.../RegressionEquationItemConverter.cxx | 2 +-
.../itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 +-
.../itemsetwrapper/StatisticsItemConverter.cxx | 2 +-
.../itemsetwrapper/TitleItemConverter.cxx | 2 +-
.../source/controller/main/ChartController.cxx | 2 +-
.../controller/main/ChartController_EditData.cxx | 2 +-
.../controller/main/ChartController_Insert.cxx | 2 +-
.../controller/main/ChartController_Position.cxx | 2 +-
.../controller/main/ChartController_Properties.cxx | 2 +-
.../controller/main/ChartController_TextEdit.cxx | 2 +-
.../controller/main/ChartController_Tools.cxx | 2 +-
.../controller/main/ChartController_Window.cxx | 2 +-
.../controller/main/ChartDropTargetHelper.cxx | 2 +-
.../source/controller/main/ChartFrameloader.cxx | 2 +-
.../source/controller/main/ChartModelClone.cxx | 2 +-
.../source/controller/main/ChartTransferable.cxx | 2 +-
main/chart2/source/controller/main/ChartWindow.cxx | 2 +-
.../source/controller/main/CommandDispatch.cxx | 2 +-
.../controller/main/CommandDispatchContainer.cxx | 2 +-
.../source/controller/main/ConfigurationAccess.cxx | 2 +-
.../controller/main/ControllerCommandDispatch.cxx | 2 +-
.../source/controller/main/DragMethod_Base.cxx | 2 +-
.../controller/main/DragMethod_PieSegment.cxx | 2 +-
.../controller/main/DragMethod_RotateDiagram.cxx | 2 +-
.../source/controller/main/DrawCommandDispatch.cxx | 2 +-
.../source/controller/main/ElementSelector.cxx | 2 +-
.../controller/main/FeatureCommandDispatchBase.cxx | 2 +-
.../source/controller/main/ObjectHierarchy.cxx | 2 +-
.../controller/main/PositionAndSizeHelper.cxx | 2 +-
.../source/controller/main/SelectionHelper.cxx | 2 +-
.../source/controller/main/ShapeController.cxx | 2 +-
.../controller/main/ShapeToolbarController.cxx | 2 +-
.../controller/main/StatusBarCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoActions.cxx | 2 +-
.../source/controller/main/UndoCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoGuard.cxx | 2 +-
.../main/_serviceregistration_controller.cxx | 2 +-
main/chart2/source/model/filter/XMLFilter.cxx | 2 +-
main/chart2/source/model/main/Axis.cxx | 2 +-
.../source/model/main/BaseCoordinateSystem.cxx | 2 +-
.../model/main/CartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/ChartModel.cxx | 2 +-
.../source/model/main/ChartModel_Persistence.cxx | 2 +-
main/chart2/source/model/main/DataPoint.cxx | 2 +-
.../source/model/main/DataPointProperties.cxx | 2 +-
main/chart2/source/model/main/DataSeries.cxx | 2 +-
.../source/model/main/DataSeriesProperties.cxx | 2 +-
main/chart2/source/model/main/Diagram.cxx | 2 +-
main/chart2/source/model/main/FormattedString.cxx | 2 +-
main/chart2/source/model/main/GridProperties.cxx | 2 +-
main/chart2/source/model/main/LayoutContainer.cxx | 2 +-
main/chart2/source/model/main/Legend.cxx | 2 +-
main/chart2/source/model/main/PageBackground.cxx | 2 +-
.../source/model/main/PolarCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/StockBar.cxx | 2 +-
main/chart2/source/model/main/Title.cxx | 2 +-
main/chart2/source/model/main/UndoManager.cxx | 2 +-
main/chart2/source/model/main/Wall.cxx | 2 +-
.../model/main/_serviceregistration_model.cxx | 2 +-
.../chart2/source/model/template/AreaChartType.cxx | 2 +-
.../model/template/AreaChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/BarChartType.cxx | 2 +-
.../source/model/template/BarChartTypeTemplate.cxx | 2 +-
.../source/model/template/BubbleChartType.cxx | 2 +-
.../model/template/BubbleChartTypeTemplate.cxx | 2 +-
.../model/template/BubbleDataInterpreter.cxx | 2 +-
.../source/model/template/CandleStickChartType.cxx | 2 +-
main/chart2/source/model/template/ChartType.cxx | 2 +-
.../source/model/template/ChartTypeManager.cxx | 2 +-
.../source/model/template/ChartTypeTemplate.cxx | 2 +-
.../source/model/template/ColumnChartType.cxx | 2 +-
.../model/template/ColumnLineChartTypeTemplate.cxx | 2 +-
.../model/template/ColumnLineDataInterpreter.cxx | 2 +-
.../source/model/template/DataInterpreter.cxx | 2 +-
.../source/model/template/FilledNetChartType.cxx | 2 +-
.../chart2/source/model/template/LineChartType.cxx | 2 +-
.../model/template/LineChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/NetChartType.cxx | 2 +-
.../source/model/template/NetChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/PieChartType.cxx | 2 +-
.../source/model/template/PieChartTypeTemplate.cxx | 2 +-
.../source/model/template/ScatterChartType.cxx | 2 +-
.../model/template/ScatterChartTypeTemplate.cxx | 2 +-
.../model/template/StockChartTypeTemplate.cxx | 2 +-
.../source/model/template/StockDataInterpreter.cxx | 2 +-
.../source/model/template/XYDataInterpreter.cxx | 2 +-
.../template/_serviceregistration_charttypes.cxx | 2 +-
main/chart2/source/tools/AxisHelper.cxx | 2 +-
main/chart2/source/tools/BaseGFXHelper.cxx | 2 +-
main/chart2/source/tools/CachedDataSequence.cxx | 2 +-
main/chart2/source/tools/CharacterProperties.cxx | 2 +-
main/chart2/source/tools/ChartDebugTrace.cxx | 2 +-
main/chart2/source/tools/ChartModelHelper.cxx | 2 +-
main/chart2/source/tools/ChartTypeHelper.cxx | 2 +-
main/chart2/source/tools/ChartViewHelper.cxx | 2 +-
main/chart2/source/tools/ColorPerPointHelper.cxx | 2 +-
main/chart2/source/tools/CommonConverters.cxx | 2 +-
main/chart2/source/tools/ConfigColorScheme.cxx | 2 +-
main/chart2/source/tools/ControllerLockGuard.cxx | 2 +-
main/chart2/source/tools/DataSeriesHelper.cxx | 2 +-
main/chart2/source/tools/DataSource.cxx | 2 +-
main/chart2/source/tools/DataSourceHelper.cxx | 2 +-
main/chart2/source/tools/DiagramHelper.cxx | 2 +-
main/chart2/source/tools/ErrorBar.cxx | 2 +-
.../source/tools/ExplicitCategoriesProvider.cxx | 2 +-
.../tools/ExponentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/FillProperties.cxx | 2 +-
main/chart2/source/tools/FormattedStringHelper.cxx | 2 +-
main/chart2/source/tools/ImplOPropertySet.cxx | 2 +-
main/chart2/source/tools/InternalData.cxx | 2 +-
main/chart2/source/tools/InternalDataProvider.cxx | 2 +-
main/chart2/source/tools/LabeledDataSequence.cxx | 2 +-
main/chart2/source/tools/LegendHelper.cxx | 2 +-
main/chart2/source/tools/LifeTime.cxx | 2 +-
main/chart2/source/tools/LineProperties.cxx | 2 +-
.../tools/LinearRegressionCurveCalculator.cxx | 2 +-
.../tools/LogarithmicRegressionCurveCalculator.cxx | 2 +-
.../tools/MeanValueRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/MediaDescriptorHelper.cxx | 2 +-
.../chart2/source/tools/ModifyListenerCallBack.cxx | 2 +-
main/chart2/source/tools/ModifyListenerHelper.cxx | 2 +-
main/chart2/source/tools/MutexContainer.cxx | 2 +-
main/chart2/source/tools/NameContainer.cxx | 2 +-
main/chart2/source/tools/NamedFillProperties.cxx | 2 +-
main/chart2/source/tools/NamedLineProperties.cxx | 2 +-
main/chart2/source/tools/NamedProperties.cxx | 2 +-
.../chart2/source/tools/NumberFormatterWrapper.cxx | 2 +-
main/chart2/source/tools/OPropertySet.cxx | 2 +-
main/chart2/source/tools/ObjectIdentifier.cxx | 2 +-
.../tools/PotentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/PropertyHelper.cxx | 2 +-
main/chart2/source/tools/RangeHighlighter.cxx | 2 +-
main/chart2/source/tools/ReferenceSizeProvider.cxx | 2 +-
.../source/tools/RegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/RegressionCurveHelper.cxx | 2 +-
main/chart2/source/tools/RegressionCurveModel.cxx | 2 +-
main/chart2/source/tools/RegressionEquation.cxx | 2 +-
.../chart2/source/tools/RelativePositionHelper.cxx | 2 +-
main/chart2/source/tools/RelativeSizeHelper.cxx | 2 +-
main/chart2/source/tools/ResId.cxx | 2 +-
main/chart2/source/tools/RessourceManager.cxx | 2 +-
main/chart2/source/tools/Scaling.cxx | 2 +-
main/chart2/source/tools/SceneProperties.cxx | 2 +-
main/chart2/source/tools/StatisticsHelper.cxx | 2 +-
main/chart2/source/tools/ThreeDHelper.cxx | 2 +-
main/chart2/source/tools/TitleHelper.cxx | 2 +-
main/chart2/source/tools/TrueGuard.cxx | 2 +-
main/chart2/source/tools/UncachedDataSequence.cxx | 2 +-
main/chart2/source/tools/UserDefinedProperties.cxx | 2 +-
main/chart2/source/tools/WeakListenerAdapter.cxx | 2 +-
.../chart2/source/tools/WrappedDefaultProperty.cxx | 2 +-
.../source/tools/WrappedDirectStateProperty.cxx | 2 +-
main/chart2/source/tools/WrappedIgnoreProperty.cxx | 2 +-
main/chart2/source/tools/WrappedProperty.cxx | 2 +-
main/chart2/source/tools/WrappedPropertySet.cxx | 2 +-
main/chart2/source/tools/XMLRangeHelper.cxx | 2 +-
.../source/tools/_serviceregistration_tools.cxx | 2 +-
main/chart2/source/view/axes/DateHelper.cxx | 2 +-
main/chart2/source/view/axes/DateScaling.cxx | 2 +-
.../source/view/axes/MinimumAndMaximumSupplier.cxx | 2 +-
main/chart2/source/view/axes/ScaleAutomatism.cxx | 2 +-
main/chart2/source/view/axes/TickmarkHelper.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks_Dates.cxx | 2 +-
.../source/view/axes/Tickmarks_Equidistant.cxx | 2 +-
main/chart2/source/view/axes/VAxisBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisOrGridBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisProperties.cxx | 2 +-
main/chart2/source/view/axes/VCartesianAxis.cxx | 2 +-
.../view/axes/VCartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VCartesianGrid.cxx | 2 +-
main/chart2/source/view/axes/VCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarAngleAxis.cxx | 2 +-
main/chart2/source/view/axes/VPolarAxis.cxx | 2 +-
.../source/view/axes/VPolarCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarGrid.cxx | 2 +-
main/chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 +-
main/chart2/source/view/charttypes/AreaChart.cxx | 2 +-
main/chart2/source/view/charttypes/BarChart.cxx | 2 +-
.../source/view/charttypes/BarPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/BubbleChart.cxx | 2 +-
.../source/view/charttypes/CandleStickChart.cxx | 2 +-
.../view/charttypes/CategoryPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/PieChart.cxx | 2 +-
main/chart2/source/view/charttypes/Splines.cxx | 2 +-
.../source/view/charttypes/VSeriesPlotter.cxx | 2 +-
main/chart2/source/view/diagram/VDiagram.cxx | 2 +-
main/chart2/source/view/main/ChartItemPool.cxx | 2 +-
main/chart2/source/view/main/ChartView.cxx | 2 +-
main/chart2/source/view/main/Clipping.cxx | 2 +-
.../source/view/main/DataPointSymbolSupplier.cxx | 2 +-
main/chart2/source/view/main/DrawModelWrapper.cxx | 2 +-
.../source/view/main/LabelPositionHelper.cxx | 2 +-
.../source/view/main/Linear3DTransformation.cxx | 2 +-
main/chart2/source/view/main/PlotterBase.cxx | 2 +-
.../source/view/main/PlottingPositionHelper.cxx | 2 +-
.../source/view/main/PolarLabelPositionHelper.cxx | 2 +-
main/chart2/source/view/main/PropertyMapper.cxx | 2 +-
main/chart2/source/view/main/ShapeFactory.cxx | 2 +-
main/chart2/source/view/main/Stripe.cxx | 2 +-
main/chart2/source/view/main/VDataSeries.cxx | 2 +-
main/chart2/source/view/main/VLegend.cxx | 2 +-
.../source/view/main/VLegendSymbolFactory.cxx | 2 +-
main/chart2/source/view/main/VLineProperties.cxx | 2 +-
.../source/view/main/VPolarTransformation.cxx | 2 +-
main/chart2/source/view/main/VTitle.cxx | 2 +-
.../source/view/main/_serviceregistration_view.cxx | 2 +-
.../AllLangResTarget_cnr.mk} | 36 +-
.../AllLangResTarget_hsqldb.mk} | 37 +-
.../AllLangResTarget_sdbcl.mk} | 39 +-
.../AllLangResTarget_sdberr.mk} | 39 +-
.../{java/dbtools/makefile.mk => Ant_dbtools.mk} | 25 +-
.../Ant_sdbc_hsqldb.mk} | 11 +-
.../sdbc_hsqldb/makefile.mk => Ant_sdbc_jdbc.mk} | 15 +-
.../Ant_sdbc_postgresql.mk} | 24 +-
main/connectivity/Configuration_connectivity.mk | 68 ++++
main/connectivity/Library_adabas.mk | 89 ++++
main/connectivity/Library_ado.mk | 95 +++++
main/connectivity/Library_calc.mk | 73 ++++
main/connectivity/Library_dbase.mk | 108 +++++
main/connectivity/Library_dbpool2.mk | 62 +++
main/connectivity/Library_dbtools.mk | 184 +++++++++
main/connectivity/Library_evoab2.mk | 89 ++++
main/connectivity/Library_file.mk | 86 ++++
main/connectivity/Library_flat.mk | 73 ++++
main/connectivity/Library_hsqldb.mk | 87 ++++
.../makefile.mk => connectivity/Library_macab1.mk} | 73 ++--
main/connectivity/Library_macabdrv1.mk | 78 ++++
main/connectivity/Library_mysql.mk | 66 +++
main/connectivity/Library_odbc.mk | 65 +++
main/connectivity/Library_odbcbase.mk | 74 ++++
.../makefile.mk => connectivity/Library_sdbc2.mk} | 51 ++-
.../registry/makefile.mk => connectivity/Makefile} | 31 +-
main/connectivity/Module_connectivity.mk | 73 ++++
.../makefile.mk => Package_generated_inc.mk} | 24 +-
main/connectivity/Package_inc.mk | 78 ++++
...led_connectivity.cxx => precompiled_adabas.cxx} | 3 +-
...led_connectivity.hxx => precompiled_adabas.hxx} | 0
...mpiled_connectivity.cxx => precompiled_ado.cxx} | 11 +-
...mpiled_connectivity.hxx => precompiled_ado.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_calc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_calc.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_dbase.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_dbase.hxx} | 10 +-
...ed_connectivity.cxx => precompiled_dbpool2.cxx} | 11 +-
...ed_connectivity.hxx => precompiled_dbpool2.hxx} | 10 +-
...ed_connectivity.cxx => precompiled_dbtools.cxx} | 11 +-
...ed_connectivity.hxx => precompiled_dbtools.hxx} | 10 +-
...led_connectivity.cxx => precompiled_evoab2.cxx} | 11 +-
...led_connectivity.hxx => precompiled_evoab2.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_file.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_file.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_flat.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_flat.hxx} | 10 +-
...led_connectivity.cxx => precompiled_hsqldb.cxx} | 11 +-
...led_connectivity.hxx => precompiled_hsqldb.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_jdbc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_jdbc.hxx} | 10 +-
...led_connectivity.cxx => precompiled_macab1.cxx} | 11 +-
...led_connectivity.hxx => precompiled_macab1.hxx} | 10 +-
..._connectivity.cxx => precompiled_macabdrv1.cxx} | 11 +-
..._connectivity.hxx => precompiled_macabdrv1.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_mysql.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_mysql.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_odbc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_odbc.hxx} | 10 +-
...d_connectivity.cxx => precompiled_odbcbase.cxx} | 11 +-
...d_connectivity.hxx => precompiled_odbcbase.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_sdbc2.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_sdbc2.hxx} | 10 +-
main/connectivity/java/dbtools/build.xml | 234 +----------
.../comp/sdbc/dbtools/comphelper/CompHelper.java | 0
.../comp/sdbc/dbtools/comphelper/EventLogger.java | 0
.../sdbc/dbtools/comphelper/OArrayEnumeration.java | 0
.../dbtools/comphelper/OEnumerationByIndex.java | 0
.../dbtools/comphelper/OEnumerationByName.java | 0
.../dbtools/comphelper/OfficeResourceBundle.java | 0
.../comp/sdbc/dbtools/comphelper/PropertySet.java | 0
.../dbtools/comphelper/PropertySetAdapter.java | 0
.../comphelper/ResourceBasedEventLogger.java | 0
.../comp/sdbc/dbtools/sdbcx/OCatalog.java | 0
.../comp/sdbc/dbtools/sdbcx/OColumn.java | 0
.../comp/sdbc/dbtools/sdbcx/OColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/ODescriptor.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java | 0
.../comp/sdbc/dbtools/sdbcx/OIndexColumn.java | 0
.../sdbc/dbtools/sdbcx/OIndexColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OIndexContainer.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OKey.java | 0
.../comp/sdbc/dbtools/sdbcx/OKeyColumn.java | 0
.../sdbc/dbtools/sdbcx/OKeyColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OKeyContainer.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OTable.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OView.java | 0
.../comp/sdbc/dbtools/sdbcx/SqlTableHelper.java | 0
.../sdbcx/descriptors/SdbcxColumnDescriptor.java | 0
.../SdbcxColumnDescriptorContainer.java | 0
.../descriptors/SdbcxDescriptorContainer.java | 0
.../descriptors/SdbcxIndexColumnDescriptor.java | 0
.../SdbcxIndexColumnDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxIndexDescriptor.java | 0
.../descriptors/SdbcxIndexDescriptorContainer.java | 0
.../descriptors/SdbcxKeyColumnDescriptor.java | 0
.../SdbcxKeyColumnDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxKeyDescriptor.java | 0
.../descriptors/SdbcxKeyDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxTableDescriptor.java | 0
.../sdbcx/descriptors/SdbcxViewDescriptor.java | 0
.../comp/sdbc/dbtools/util/AutoRetrievingBase.java | 0
.../comp/sdbc/dbtools/util/ComposeRule.java | 0
.../comp/sdbc/dbtools/util/CustomColumn.java | 0
.../comp/sdbc/dbtools/util/CustomResultSet.java | 0
.../sdbc/dbtools/util/CustomResultSetMetaData.java | 0
.../comp/sdbc/dbtools/util/DBTypeConversion.java | 0
.../dbtools/util/DatabaseMetaDataResultSet.java | 0
.../openoffice/comp/sdbc/dbtools/util/DbTools.java | 0
.../sdbc/dbtools/util/ISQLStatementHelper.java | 0
.../sdbc/dbtools/util/MapToXNameAccessAdapter.java | 0
.../dbtools/util/MapToXNameContainerAdapter.java | 0
.../comp/sdbc/dbtools/util/ORowSetValue.java | 0
.../openoffice/comp/sdbc/dbtools/util/Osl.java | 0
.../comp/sdbc/dbtools/util/PropertyIds.java | 0
.../comp/sdbc/dbtools/util/Resources.java | 0
.../comp/sdbc/dbtools/util/SharedResources.java | 0
.../comp/sdbc/dbtools/util/StandardSQLState.java | 0
main/connectivity/java/sdbc_hsqldb/build.xml | 215 +---------
.../sdbcx/comp/hsqldb/NativeInputStreamHelper.java | 0
.../star/sdbcx/comp/hsqldb/NativeLibraries.java | 0
.../comp/hsqldb/NativeOutputStreamHelper.java | 0
.../sdbcx/comp/hsqldb/NativeStorageAccess.java | 0
.../sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 0
.../star/sdbcx/comp/hsqldb/StorageFileAccess.java | 0
.../comp/hsqldb/StorageNativeInputStream.java | 0
.../comp/hsqldb/StorageNativeOutputStream.java | 0
.../org/hsqldb/lib/FileSystemRuntimeException.java | 0
main/connectivity/java/sdbc_jdbc/build.xml | 237 +----------
.../com/sun/star/comp/sdbc/BoundedInputStream.java | 0
.../java}/com/sun/star/comp/sdbc/ClassMap.java | 0
.../com/sun/star/comp/sdbc/ConnectionLog.java | 0
.../star/comp/sdbc/ContextClassLoaderScope.java | 0
.../java}/com/sun/star/comp/sdbc/JDBCDriver.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLArray.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLBlob.java | 0
.../star/comp/sdbc/JavaSQLCallableStatement.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLClob.java | 0
.../com/sun/star/comp/sdbc/JavaSQLConnection.java | 0
.../star/comp/sdbc/JavaSQLDatabaseMetaData.java | 0
.../star/comp/sdbc/JavaSQLPreparedStatement.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLRef.java | 0
.../com/sun/star/comp/sdbc/JavaSQLResultSet.java | 0
.../star/comp/sdbc/JavaSQLResultSetMetaData.java | 0
.../com/sun/star/comp/sdbc/JavaSQLStatement.java | 0
.../sun/star/comp/sdbc/JavaSQLStatementBase.java | 0
.../com/sun/star/comp/sdbc/ReaderInputStream.java | 0
.../java}/com/sun/star/comp/sdbc/Tools.java | 0
.../sdbc/classloading/ClassLoaderAndClass.java | 0
.../sun/star/comp/sdbc/classloading/ClassMap.java | 0
main/connectivity/java/sdbc_postgresql/build.xml | 227 +----------
.../sdbcx/comp/postgresql/PostgresqlCatalog.java | 0
.../comp/postgresql/PostgresqlConnection.java | 0
.../PostgresqlDatabaseMetaDataResultSet.java | 0
.../postgresql/PostgresqlDatabaseMetadata.java | 0
.../sdbcx/comp/postgresql/PostgresqlDriver.java | 0
.../postgresql/PostgresqlPreparedStatement.java | 0
.../sdbcx/comp/postgresql/PostgresqlResultSet.java | 0
.../postgresql/PostgresqlResultSetMetaData.java | 0
.../sdbcx/comp/postgresql/PostgresqlStatement.java | 0
.../sdbcx/comp/postgresql/PostgresqlTable.java | 0
.../sdbcx/comp/postgresql/PostgresqlTables.java | 0
.../sdbcx/comp/postgresql/PostgresqlViews.java | 0
main/connectivity/prj/build.lst | 30 +-
main/connectivity/prj/d.lst | 52 ---
.../connectivity/{java/dbtools => prj}/makefile.mk | 34 +-
.../org/openoffice/Office/DataAccess/adabas.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/adabas.xcu | 0
.../org/openoffice/Office/DataAccess/ado.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/ado.xcu | 0
.../org/openoffice/Office/DataAccess/calc.xcs | 70 ++++
.../org/openoffice/Office/DataAccess/calc.xcu} | 40 +-
.../org/openoffice/Office/DataAccess/dbase.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/dbase.xcu | 0
.../org/openoffice/Office/DataAccess/evoab2.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/evoab2.xcu | 0
.../org/openoffice/Office/DataAccess/flat.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/flat.xcu | 0
.../org/openoffice/Office/DataAccess/hsqldb.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/hsqldb.xcu | 0
.../org/openoffice/Office/DataAccess/jdbc.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/jdbc.xcu | 0
.../org/openoffice/Office/DataAccess/macab.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/macab.xcu | 0
.../org/openoffice/Office/DataAccess/mysql.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/mysql.xcu | 0
.../org/openoffice/Office/DataAccess/odbc.xcs | 70 ++++
.../org/openoffice/Office/DataAccess}/odbc.xcu | 0
.../org/openoffice/Office/DataAccess/sdbc_jdbc.xcs | 70 ++++
.../openoffice/Office/DataAccess}/sdbc_jdbc.xcu | 0
.../Office/DataAccess/sdbc_postgresql.xcs | 70 ++++
.../Office/DataAccess}/sdbc_postgresql.xcu | 0
.../source/commontools/AutoRetrievingBase.cxx | 2 +-
.../connectivity/source/commontools/BlobHelper.cxx | 2 +-
.../source/commontools/CommonTools.cxx | 2 +-
.../source/commontools/ConnectionWrapper.cxx | 2 +-
.../source/commontools/DateConversion.cxx | 2 +-
.../commontools/FDatabaseMetaDataResultSet.cxx | 2 +-
.../FDatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/commontools/FValue.cxx | 2 +-
.../source/commontools/ParamterSubstitution.cxx | 2 +-
.../source/commontools/RowFunctionParser.cxx | 2 +-
.../source/commontools/TColumnsHelper.cxx | 2 +-
.../source/commontools/TConnection.cxx | 2 +-
.../source/commontools/TDatabaseMetaDataBase.cxx | 2 +-
main/connectivity/source/commontools/TIndex.cxx | 2 +-
.../source/commontools/TIndexColumns.cxx | 2 +-
main/connectivity/source/commontools/TIndexes.cxx | 2 +-
main/connectivity/source/commontools/TKey.cxx | 2 +-
.../source/commontools/TKeyColumns.cxx | 2 +-
main/connectivity/source/commontools/TKeys.cxx | 2 +-
.../source/commontools/TPrivilegesResultSet.cxx | 2 +-
.../source/commontools/TSkipDeletedSet.cxx | 2 +-
.../connectivity/source/commontools/TSortIndex.cxx | 2 +-
.../source/commontools/TTableHelper.cxx | 2 +-
.../source/commontools/conncleanup.cxx | 2 +-
main/connectivity/source/commontools/dbcharset.cxx | 2 +-
.../source/commontools/dbconversion.cxx | 2 +-
.../source/commontools/dbexception.cxx | 2 +-
.../connectivity/source/commontools/dbmetadata.cxx | 2 +-
main/connectivity/source/commontools/dbtools.cxx | 2 +-
main/connectivity/source/commontools/dbtools2.cxx | 2 +-
.../source/commontools/filtermanager.cxx | 2 +-
.../source/commontools/formattedcolumnvalue.cxx | 2 +-
.../connectivity/source/commontools/parameters.cxx | 2 +-
.../source/commontools/paramwrapper.cxx | 2 +-
.../source/commontools/predicateinput.cxx | 2 +-
.../source/commontools/propertyids.cxx | 2 +-
main/connectivity/source/commontools/sqlerror.cxx | 2 +-
.../source/commontools/statementcomposer.cxx | 2 +-
.../source/commontools/warningscontainer.cxx | 2 +-
main/connectivity/source/cpool/ZConnectionPool.cxx | 2 +-
.../source/cpool/ZConnectionWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZDriverWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZPoolCollection.cxx | 2 +-
.../source/cpool/ZPooledConnection.cxx | 2 +-
main/connectivity/source/cpool/Zregistration.cxx | 2 +-
.../source/drivers/adabas/BCatalog.cxx | 2 +-
.../source/drivers/adabas/BColumns.cxx | 2 +-
.../source/drivers/adabas/BConnection.cxx | 2 +-
.../source/drivers/adabas/BDatabaseMetaData.cxx | 2 +-
.../connectivity/source/drivers/adabas/BDriver.cxx | 2 +-
.../source/drivers/adabas/BFunctions.cxx | 10 +-
main/connectivity/source/drivers/adabas/BGroup.cxx | 2 +-
.../connectivity/source/drivers/adabas/BGroups.cxx | 2 +-
main/connectivity/source/drivers/adabas/BIndex.cxx | 2 +-
.../source/drivers/adabas/BIndexColumns.cxx | 2 +-
.../source/drivers/adabas/BIndexes.cxx | 2 +-
main/connectivity/source/drivers/adabas/BKeys.cxx | 2 +-
.../source/drivers/adabas/BPreparedStatement.cxx | 2 +-
.../source/drivers/adabas/BResultSet.cxx | 2 +-
.../source/drivers/adabas/BResultSetMetaData.cxx | 2 +-
.../source/drivers/adabas/BStatement.cxx | 2 +-
main/connectivity/source/drivers/adabas/BTable.cxx | 2 +-
.../connectivity/source/drivers/adabas/BTables.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUser.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUsers.cxx | 2 +-
main/connectivity/source/drivers/adabas/BViews.cxx | 2 +-
.../source/drivers/adabas/Bservices.cxx | 2 +-
.../source/drivers/ado/ACallableStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ACatalog.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumn.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumns.cxx | 2 +-
.../source/drivers/ado/AConnection.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaData.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 2 +-
.../drivers/ado/ADatabaseMetaDataResultSet.cxx | 2 +-
.../ado/ADatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/drivers/ado/ADriver.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroup.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroups.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndex.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndexes.cxx | 2 +-
main/connectivity/source/drivers/ado/AKey.cxx | 2 +-
main/connectivity/source/drivers/ado/AKeys.cxx | 2 +-
.../source/drivers/ado/APreparedStatement.cxx | 2 +-
.../connectivity/source/drivers/ado/AResultSet.cxx | 2 +-
.../source/drivers/ado/AResultSetMetaData.cxx | 2 +-
.../connectivity/source/drivers/ado/AStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ATable.cxx | 2 +-
main/connectivity/source/drivers/ado/ATables.cxx | 2 +-
main/connectivity/source/drivers/ado/AUser.cxx | 2 +-
main/connectivity/source/drivers/ado/AUsers.cxx | 2 +-
main/connectivity/source/drivers/ado/AView.cxx | 2 +-
main/connectivity/source/drivers/ado/AViews.cxx | 2 +-
.../source/drivers/ado/Aolevariant.cxx | 2 +-
main/connectivity/source/drivers/ado/Aservices.cxx | 2 +-
main/connectivity/source/drivers/ado/Awrapado.cxx | 2 +-
main/connectivity/source/drivers/ado/adoimp.cxx | 2 +-
main/connectivity/source/drivers/calc/CCatalog.cxx | 2 +-
main/connectivity/source/drivers/calc/CColumns.cxx | 2 +-
.../source/drivers/calc/CConnection.cxx | 2 +-
.../source/drivers/calc/CDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/calc/CDriver.cxx | 2 +-
.../source/drivers/calc/CPreparedStatement.cxx | 2 +-
.../source/drivers/calc/CResultSet.cxx | 2 +-
.../source/drivers/calc/CStatement.cxx | 2 +-
main/connectivity/source/drivers/calc/CTable.cxx | 2 +-
main/connectivity/source/drivers/calc/CTables.cxx | 2 +-
.../connectivity/source/drivers/calc/Cservices.cxx | 2 +-
.../connectivity/source/drivers/dbase/DCatalog.cxx | 2 +-
main/connectivity/source/drivers/dbase/DCode.cxx | 2 +-
.../connectivity/source/drivers/dbase/DColumns.cxx | 2 +-
.../source/drivers/dbase/DConnection.cxx | 2 +-
.../source/drivers/dbase/DDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/dbase/DDriver.cxx | 2 +-
main/connectivity/source/drivers/dbase/DIndex.cxx | 2 +-
.../source/drivers/dbase/DIndexColumns.cxx | 2 +-
.../source/drivers/dbase/DIndexIter.cxx | 2 +-
.../connectivity/source/drivers/dbase/DIndexes.cxx | 2 +-
.../source/drivers/dbase/DNoException.cxx | 2 +-
.../source/drivers/dbase/DPreparedStatement.cxx | 2 +-
.../source/drivers/dbase/DResultSet.cxx | 2 +-
.../source/drivers/dbase/DStatement.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTable.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTables.cxx | 2 +-
.../source/drivers/dbase/Dservices.cxx | 2 +-
.../source/drivers/dbase/dindexnode.cxx | 2 +-
main/connectivity/source/drivers/evoab2/EApi.cxx | 2 +-
.../source/drivers/evoab2/NCatalog.cxx | 2 +-
.../source/drivers/evoab2/NColumns.cxx | 2 +-
.../source/drivers/evoab2/NConnection.cxx | 2 +-
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NDebug.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NDriver.cxx | 2 +-
.../source/drivers/evoab2/NPreparedStatement.cxx | 2 +-
.../source/drivers/evoab2/NResultSet.cxx | 2 +-
.../source/drivers/evoab2/NResultSetMetaData.cxx | 2 +-
.../source/drivers/evoab2/NServices.cxx | 2 +-
.../source/drivers/evoab2/NStatement.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NTable.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NTables.cxx | 2 +-
main/connectivity/source/drivers/file/FCatalog.cxx | 2 +-
main/connectivity/source/drivers/file/FColumns.cxx | 2 +-
.../source/drivers/file/FConnection.cxx | 2 +-
.../source/drivers/file/FDatabaseMetaData.cxx | 2 +-
.../source/drivers/file/FDateFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FDriver.cxx | 2 +-
.../source/drivers/file/FNoException.cxx | 2 +-
.../source/drivers/file/FNumericFunctions.cxx | 2 +-
.../source/drivers/file/FPreparedStatement.cxx | 2 +-
.../source/drivers/file/FResultSet.cxx | 2 +-
.../source/drivers/file/FResultSetMetaData.cxx | 2 +-
.../source/drivers/file/FStatement.cxx | 2 +-
.../source/drivers/file/FStringFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FTable.cxx | 2 +-
main/connectivity/source/drivers/file/FTables.cxx | 2 +-
.../connectivity/source/drivers/file/fanalyzer.cxx | 2 +-
main/connectivity/source/drivers/file/fcode.cxx | 2 +-
main/connectivity/source/drivers/file/fcomp.cxx | 2 +-
.../source/drivers/file/quotedstring.cxx | 2 +-
main/connectivity/source/drivers/flat/ECatalog.cxx | 2 +-
main/connectivity/source/drivers/flat/EColumns.cxx | 2 +-
.../source/drivers/flat/EConnection.cxx | 2 +-
.../source/drivers/flat/EDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/flat/EDriver.cxx | 2 +-
.../source/drivers/flat/EPreparedStatement.cxx | 2 +-
.../source/drivers/flat/EResultSet.cxx | 2 +-
.../source/drivers/flat/EStatement.cxx | 2 +-
main/connectivity/source/drivers/flat/ETable.cxx | 2 +-
main/connectivity/source/drivers/flat/ETables.cxx | 2 +-
.../connectivity/source/drivers/flat/Eservices.cxx | 2 +-
.../source/drivers/hsqldb/HCatalog.cxx | 2 +-
.../source/drivers/hsqldb/HColumns.cxx | 2 +-
.../source/drivers/hsqldb/HConnection.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HDriver.cxx | 2 +-
.../source/drivers/hsqldb/HStorageAccess.cxx | 2 +-
.../source/drivers/hsqldb/HStorageMap.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HTable.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HTables.cxx | 2 +-
.../source/drivers/hsqldb/HTerminateListener.cxx | 4 +-
main/connectivity/source/drivers/hsqldb/HTools.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUser.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUsers.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HView.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HViews.cxx | 2 +-
.../source/drivers/hsqldb/Hservices.cxx | 2 +-
.../source/drivers/hsqldb/StorageFileAccess.cxx | 2 +-
.../drivers/hsqldb/StorageNativeInputStream.cxx | 2 +-
.../drivers/hsqldb/StorageNativeOutputStream.cxx | 2 +-
.../source/drivers/hsqldb/accesslog.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Array.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Blob.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Boolean.cxx | 2 +-
.../source/drivers/jdbc/CallableStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Class.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Clob.cxx | 2 +-
.../source/drivers/jdbc/ConnectionLog.cxx | 2 +-
.../source/drivers/jdbc/ContextClassLoader.cxx | 2 +-
.../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Date.cxx | 2 +-
.../source/drivers/jdbc/DriverPropertyInfo.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Exception.cxx | 2 +-
.../source/drivers/jdbc/InputStream.cxx | 2 +-
.../source/drivers/jdbc/JBigDecimal.cxx | 2 +-
.../source/drivers/jdbc/JConnection.cxx | 2 +-
main/connectivity/source/drivers/jdbc/JDriver.cxx | 2 +-
.../source/drivers/jdbc/JStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Object.cxx | 2 +-
.../source/drivers/jdbc/PreparedStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Reader.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Ref.cxx | 2 +-
.../connectivity/source/drivers/jdbc/ResultSet.cxx | 2 +-
.../source/drivers/jdbc/ResultSetMetaData.cxx | 2 +-
.../source/drivers/jdbc/SQLException.cxx | 2 +-
.../source/drivers/jdbc/SQLWarning.cxx | 2 +-
main/connectivity/source/drivers/jdbc/String.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Throwable.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Timestamp.cxx | 2 +-
.../connectivity/source/drivers/jdbc/jservices.cxx | 2 +-
main/connectivity/source/drivers/jdbc/tools.cxx | 2 +-
.../source/drivers/macab/MacabAddressBook.cxx | 2 +-
.../source/drivers/macab/MacabCatalog.cxx | 2 +-
.../source/drivers/macab/MacabColumns.cxx | 2 +-
.../source/drivers/macab/MacabConnection.cxx | 2 +-
.../source/drivers/macab/MacabDatabaseMetaData.cxx | 2 +-
.../source/drivers/macab/MacabDriver.cxx | 2 +-
.../source/drivers/macab/MacabGroup.cxx | 2 +-
.../source/drivers/macab/MacabHeader.cxx | 2 +-
.../drivers/macab/MacabPreparedStatement.cxx | 2 +-
.../source/drivers/macab/MacabRecord.cxx | 2 +-
.../source/drivers/macab/MacabRecords.cxx | 2 +-
.../source/drivers/macab/MacabResultSet.cxx | 2 +-
.../drivers/macab/MacabResultSetMetaData.cxx | 2 +-
.../source/drivers/macab/MacabServices.cxx | 2 +-
.../source/drivers/macab/MacabStatement.cxx | 2 +-
.../source/drivers/macab/MacabTable.cxx | 2 +-
.../source/drivers/macab/MacabTables.cxx | 2 +-
.../source/drivers/macab/macabcondition.cxx | 2 +-
.../source/drivers/macab/macaborder.cxx | 2 +-
.../connectivity/source/drivers/mysql/YCatalog.cxx | 2 +-
.../connectivity/source/drivers/mysql/YColumns.cxx | 2 +-
main/connectivity/source/drivers/mysql/YDriver.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTable.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTables.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUser.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUsers.cxx | 2 +-
main/connectivity/source/drivers/mysql/YViews.cxx | 2 +-
.../source/drivers/mysql/Yservices.cxx | 2 +-
.../source/drivers/odbc/OFunctions.cxx | 2 +-
.../source/drivers/odbc/ORealDriver.cxx | 2 +-
.../connectivity/source/drivers/odbc/oservices.cxx | 2 +-
.../source/drivers/odbcbase/OConnection.cxx | 2 +-
.../source/drivers/odbcbase/ODatabaseMetaData.cxx | 2 +-
.../odbcbase/ODatabaseMetaDataResultSet.cxx | 2 +-
.../source/drivers/odbcbase/ODriver.cxx | 2 +-
.../source/drivers/odbcbase/OPreparedStatement.cxx | 2 +-
.../source/drivers/odbcbase/OResultSet.cxx | 2 +-
.../source/drivers/odbcbase/OResultSetMetaData.cxx | 2 +-
.../source/drivers/odbcbase/OStatement.cxx | 2 +-
.../source/drivers/odbcbase/OTools.cxx | 2 +-
.../source/inc/ParameterSubstitution.hxx | 1 -
.../connectivity/source/manager/mdrivermanager.cxx | 2 +-
main/connectivity/source/manager/mregistration.cxx | 2 +-
main/connectivity/source/parse/PColumn.cxx | 2 +-
main/connectivity/source/parse/internalnode.cxx | 2 +-
main/connectivity/source/parse/sqliterator.cxx | 2 +-
main/connectivity/source/parse/sqlnode.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlbison.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlflex.cxx | 2 +-
.../source/resource/sharedresources.cxx | 2 +-
main/connectivity/source/sdbcx/VCatalog.cxx | 2 +-
main/connectivity/source/sdbcx/VCollection.cxx | 2 +-
main/connectivity/source/sdbcx/VColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VDescriptor.cxx | 2 +-
main/connectivity/source/sdbcx/VGroup.cxx | 2 +-
main/connectivity/source/sdbcx/VIndex.cxx | 2 +-
main/connectivity/source/sdbcx/VIndexColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VKey.cxx | 2 +-
main/connectivity/source/sdbcx/VKeyColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VTable.cxx | 2 +-
main/connectivity/source/sdbcx/VUser.cxx | 2 +-
main/connectivity/source/sdbcx/VView.cxx | 2 +-
main/connectivity/source/simpledbt/charset_s.cxx | 2 +-
main/connectivity/source/simpledbt/dbtfactory.cxx | 2 +-
main/connectivity/source/simpledbt/parsenode_s.cxx | 2 +-
main/connectivity/source/simpledbt/parser_s.cxx | 2 +-
main/connectivity/source/simpledbt/refbase.cxx | 2 +-
.../source/simpledbt/staticdbtools_s.cxx | 2 +-
main/officecfg/Configuration_officecfg.mk | 271 +++++++++++++
main/officecfg/Makefile | 30 ++
main/officecfg/Module_officecfg.mk | 28 ++
main/officecfg/Package_misc.mk | 29 ++
main/officecfg/Package_tools.mk | 36 ++
main/officecfg/prj/build.lst | 17 +-
main/officecfg/prj/d.lst | 68 ----
main/officecfg/prj/makefile.mk | 32 ++
.../data/org/openoffice/Office/UI/makefile.mk | 77 ----
.../data/org/openoffice/Office/makefile.mk | 117 ------
main/officecfg/registry/schema/makefile.mk | 42 --
.../openoffice/Office/OOoImprovement/makefile.mk | 37 --
.../schema/org/openoffice/Office/UI/makefile.mk | 76 ----
.../schema/org/openoffice/Office/makefile.mk | 79 ----
.../org/openoffice/TypeDetection/makefile.mk | 41 --
.../registry/schema/org/openoffice/makefile.mk | 44 --
.../registry/schema/org/openoffice/ucb/makefile.mk | 40 --
main/postprocess/packcomponents/makefile.mk | 38 +-
main/postprocess/packregistry/makefile.mk | 35 +-
main/scripting/java/build.xml | 2 -
main/sfx2/source/bastyp/progress.cxx | 3 +-
main/sfx2/source/view/sfxbasecontroller.cxx | 6 +-
main/solenv/ant/aoo-ant.xml | 2 +
main/solenv/ant/externals.xml | 6 +
main/solenv/gbuild/Configuration.mk | 449 +++++++++++++++++++++
main/solenv/gbuild/TargetLocations.mk | 22 +
main/solenv/gbuild/gbuild.mk | 1 +
main/solenv/gbuild/platform/linux.mk | 3 +
main/solenv/gbuild/platform/macosx.mk | 3 +
main/solenv/gbuild/platform/solaris.mk | 3 +
main/solenv/gbuild/platform/windows.mk | 4 +
main/solenv/gbuild/platform/winmingw.mk | 3 +
main/vcl/Library_vcl.mk | 8 +
main/vcl/win/source/gdi/salgdi.cxx | 4 +-
main/vcl/win/source/window/salframe.cxx | 4 +-
851 files changed, 6382 insertions(+), 2788 deletions(-)
create mode 100644 main/chart2/AllLangResTarget_chartcontroller.mk
create mode 100644 main/chart2/Library_chartcontroller.mk
create mode 100644 main/chart2/Library_chartmodel.mk
create mode 100644 main/chart2/Library_charttools.mk
create mode 100644 main/chart2/Library_chartview.mk
rename main/{officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk => chart2/Makefile} (75%)
copy main/{officecfg/registry/makefile.mk => chart2/Module_chart2.mk} (76%)
create mode 100644 main/chart2/Package_uiconfig.mk
copy main/{connectivity/inc/pch/precompiled_connectivity.cxx => chart2/inc/pch/precompiled_chartcontroller.cxx} (94%)
create mode 100644 main/chart2/inc/pch/precompiled_chartcontroller.hxx
copy main/{connectivity/inc/pch/precompiled_connectivity.cxx => chart2/inc/pch/precompiled_chartmodel.cxx} (94%)
create mode 100644 main/chart2/inc/pch/precompiled_chartmodel.hxx
copy main/{connectivity/inc/pch/precompiled_connectivity.cxx => chart2/inc/pch/precompiled_charttools.cxx} (94%)
create mode 100644 main/chart2/inc/pch/precompiled_charttools.hxx
copy main/{connectivity/inc/pch/precompiled_connectivity.cxx => chart2/inc/pch/precompiled_chartview.cxx} (94%)
create mode 100644 main/chart2/inc/pch/precompiled_chartview.hxx
rename main/{officecfg/registry/data/org/openoffice/ucb => chart2/prj}/makefile.mk (70%)
copy main/{officecfg/util/makefile.mk => connectivity/AllLangResTarget_cnr.mk} (63%)
copy main/{officecfg/util/makefile.mk => connectivity/AllLangResTarget_hsqldb.mk} (57%)
copy main/{officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk => connectivity/AllLangResTarget_sdbcl.mk} (62%)
rename main/{officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk => connectivity/AllLangResTarget_sdberr.mk} (62%)
copy main/connectivity/{java/dbtools/makefile.mk => Ant_dbtools.mk} (77%)
rename main/{officecfg/util/makefile.pmk => connectivity/Ant_sdbc_hsqldb.mk} (88%)
copy main/connectivity/{java/sdbc_hsqldb/makefile.mk => Ant_sdbc_jdbc.mk} (82%)
copy main/{officecfg/registry/makefile.mk => connectivity/Ant_sdbc_postgresql.mk} (77%)
create mode 100644 main/connectivity/Configuration_connectivity.mk
create mode 100644 main/connectivity/Library_adabas.mk
create mode 100644 main/connectivity/Library_ado.mk
create mode 100644 main/connectivity/Library_calc.mk
create mode 100644 main/connectivity/Library_dbase.mk
create mode 100644 main/connectivity/Library_dbpool2.mk
create mode 100644 main/connectivity/Library_dbtools.mk
create mode 100644 main/connectivity/Library_evoab2.mk
create mode 100644 main/connectivity/Library_file.mk
create mode 100644 main/connectivity/Library_flat.mk
create mode 100644 main/connectivity/Library_hsqldb.mk
rename main/{officecfg/registry/data/org/openoffice/makefile.mk => connectivity/Library_macab1.mk} (50%)
create mode 100644 main/connectivity/Library_macabdrv1.mk
create mode 100644 main/connectivity/Library_mysql.mk
create mode 100644 main/connectivity/Library_odbc.mk
create mode 100644 main/connectivity/Library_odbcbase.mk
rename main/{officecfg/util/makefile.mk => connectivity/Library_sdbc2.mk} (55%)
rename main/{officecfg/registry/makefile.mk => connectivity/Makefile} (75%)
create mode 100644 main/connectivity/Module_connectivity.mk
rename main/connectivity/{java/sdbc_hsqldb/makefile.mk => Package_generated_inc.mk} (79%)
create mode 100644 main/connectivity/Package_inc.mk
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_adabas.cxx} (95%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_adabas.hxx} (100%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_ado.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_ado.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_calc.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_calc.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_dbase.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_dbase.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_dbpool2.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_dbpool2.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_dbtools.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_dbtools.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_evoab2.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_evoab2.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_file.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_file.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_flat.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_flat.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_hsqldb.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_hsqldb.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_jdbc.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_jdbc.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_macab1.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_macab1.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_macabdrv1.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_macabdrv1.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_mysql.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_mysql.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_odbc.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_odbc.hxx} (99%)
copy main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_odbcbase.cxx} (94%)
copy main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_odbcbase.hxx} (99%)
rename main/connectivity/inc/pch/{precompiled_connectivity.cxx => precompiled_sdbc2.cxx} (94%)
rename main/connectivity/inc/pch/{precompiled_connectivity.hxx => precompiled_sdbc2.hxx} (99%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/EventLogger.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ResourceBasedEventLogger.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/AutoRetrievingBase.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/CustomColumn.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSet.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSetMetaData.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java (100%)
rename main/connectivity/java/dbtools/src/{ => main/java}/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java (100%)
rename main/connectivity/java/sdbc_hsqldb/src/{ => main/java}/org/hsqldb/lib/FileSystemRuntimeException.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/BoundedInputStream.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/ClassMap.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/ConnectionLog.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/ContextClassLoaderScope.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JDBCDriver.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLArray.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLBlob.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLClob.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLConnection.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLRef.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLResultSet.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLStatement.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/JavaSQLStatementBase.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/ReaderInputStream.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/Tools.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/classloading/ClassLoaderAndClass.java (100%)
rename main/connectivity/java/sdbc_jdbc/src/{ => main/java}/com/sun/star/comp/sdbc/classloading/ClassMap.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlConnection.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetaDataResultSet.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlPreparedStatement.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSet.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSetMetaData.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlStatement.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java (100%)
rename main/connectivity/java/sdbc_postgresql/src/{ => main/java}/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java (100%)
rename main/connectivity/{java/dbtools => prj}/makefile.mk (71%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcs
rename main/connectivity/{source/drivers/adabas => registry/org/openoffice/Office/DataAccess}/adabas.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcs
rename main/connectivity/{source/drivers/ado => registry/org/openoffice/Office/DataAccess}/ado.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcs
copy main/connectivity/{java/sdbc_postgresql/sdbc_postgresql.xcu => registry/org/openoffice/Office/DataAccess/calc.xcu} (69%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcs
rename main/connectivity/{source/drivers/dbase => registry/org/openoffice/Office/DataAccess}/dbase.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcs
rename main/connectivity/{source/drivers/evoab2 => registry/org/openoffice/Office/DataAccess}/evoab2.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcs
rename main/connectivity/{source/drivers/flat => registry/org/openoffice/Office/DataAccess}/flat.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcs
rename main/connectivity/{source/drivers/hsqldb => registry/org/openoffice/Office/DataAccess}/hsqldb.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcs
rename main/connectivity/{source/drivers/jdbc => registry/org/openoffice/Office/DataAccess}/jdbc.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcs
rename main/connectivity/{source/drivers/macab => registry/org/openoffice/Office/DataAccess}/macab.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcs
rename main/connectivity/{source/drivers/mysql => registry/org/openoffice/Office/DataAccess}/mysql.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcs
rename main/connectivity/{source/drivers/odbc => registry/org/openoffice/Office/DataAccess}/odbc.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcs
rename main/connectivity/{java/sdbc_jdbc => registry/org/openoffice/Office/DataAccess}/sdbc_jdbc.xcu (100%)
create mode 100644 main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcs
rename main/connectivity/{java/sdbc_postgresql => registry/org/openoffice/Office/DataAccess}/sdbc_postgresql.xcu (100%)
create mode 100644 main/officecfg/Configuration_officecfg.mk
create mode 100644 main/officecfg/Makefile
create mode 100644 main/officecfg/Module_officecfg.mk
create mode 100644 main/officecfg/Package_misc.mk
create mode 100644 main/officecfg/Package_tools.mk
create mode 100644 main/officecfg/prj/makefile.mk
delete mode 100644 main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
delete mode 100644 main/officecfg/registry/data/org/openoffice/Office/makefile.mk
delete mode 100644 main/officecfg/registry/schema/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/makefile.mk
delete mode 100644 main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
create mode 100644 main/solenv/gbuild/Configuration.mk
(openoffice) 05/21: Only build the StarBasic "DLL manager" on x86 Win32, instead of any Windows system that isn't AMD64. It only supports x86 Win32 and never supported anything else; there were discussions on bugs 112064 and 126277 about other platforms, but development never got completed and merged.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 14a9b8c1d9d8a83e7aea66b019fb3c6483f0b402
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 06:36:10 2025 +0200
Only build the StarBasic "DLL manager" on x86 Win32, instead of
any Windows system that isn't AMD64. It only supports x86 Win32
and never supported anything else; there were discussions on
bugs 112064 and 126277 about other platforms, but development
never got completed and merged.
Patch by: me
---
main/basic/source/runtime/dllmgr.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/main/basic/source/runtime/dllmgr.cxx b/main/basic/source/runtime/dllmgr.cxx
index 6a3adcdc7e..3135d76fe7 100644
--- a/main/basic/source/runtime/dllmgr.cxx
+++ b/main/basic/source/runtime/dllmgr.cxx
@@ -60,7 +60,7 @@
variables accordingly.
*/
-#if defined(WNT) && !defined(_WIN64) // only 32-bit Windows: the DllMgr_call32/callFp
+#if defined(WNT) && defined(INTEL) // only 32-bit Windows: the DllMgr_call32/callFp
// trampolines (wnt.asm) are x86 stdcall only.
// x64 falls through to the not-implemented stub
// below (Basic Declare'd DLL calls unsupported on
(openoffice) 07/21: Early, incomplete attempt to port connectivity to gbuild.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 07bf101f834a97b3f151039891fd55b8274bbfc4
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 09:43:24 2025 +0200
Early, incomplete attempt to port connectivity to gbuild.
Patch by: me
---
main/Repository.mk | 12 ++
main/connectivity/AllLangResTarget_cnr.mk | 41 +++++
main/connectivity/AllLangResTarget_hsqldb.mk | 44 +++++
main/connectivity/AllLangResTarget_sdbcl.mk | 41 +++++
main/connectivity/AllLangResTarget_sdberr.mk | 41 +++++
main/connectivity/Configuration.mk | 86 ++++++++++
main/connectivity/Jar_sdbc_hsqldb.mk | 58 +++++++
main/connectivity/Library_adabas.mk | 89 ++++++++++
main/connectivity/Library_ado.mk | 95 +++++++++++
main/connectivity/Library_calc.mk | 73 ++++++++
main/connectivity/Library_dbase.mk | 108 ++++++++++++
main/connectivity/Library_dbpool2.mk | 62 +++++++
main/connectivity/Library_dbtools.mk | 184 +++++++++++++++++++++
main/connectivity/Library_evoab2.mk | 89 ++++++++++
main/connectivity/Library_file.mk | 86 ++++++++++
main/connectivity/Library_flat.mk | 73 ++++++++
main/connectivity/Library_hsqldb.mk | 87 ++++++++++
main/connectivity/Library_jdbc.mk | 91 ++++++++++
main/connectivity/Library_macab1.mk | 58 +++++++
main/connectivity/Library_macabdrv1.mk | 78 +++++++++
main/connectivity/Library_mysql.mk | 66 ++++++++
main/connectivity/Library_odbc.mk | 65 ++++++++
main/connectivity/Library_odbcbase.mk | 74 +++++++++
main/connectivity/Library_sdbc2.mk | 58 +++++++
main/connectivity/Makefile | 32 ++++
main/connectivity/Module_connectivity.mk | 72 ++++++++
main/connectivity/Package_generated_inc.mk | 26 +++
main/connectivity/Package_inc.mk | 78 +++++++++
...led_connectivity.cxx => precompiled_adabas.cxx} | 3 +-
...led_connectivity.hxx => precompiled_adabas.hxx} | 0
...mpiled_connectivity.cxx => precompiled_ado.cxx} | 11 +-
...mpiled_connectivity.hxx => precompiled_ado.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_calc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_calc.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_dbase.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_dbase.hxx} | 10 +-
...ed_connectivity.cxx => precompiled_dbpool2.cxx} | 11 +-
...ed_connectivity.hxx => precompiled_dbpool2.hxx} | 10 +-
...ed_connectivity.cxx => precompiled_dbtools.cxx} | 11 +-
...ed_connectivity.hxx => precompiled_dbtools.hxx} | 10 +-
...led_connectivity.cxx => precompiled_evoab2.cxx} | 11 +-
...led_connectivity.hxx => precompiled_evoab2.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_file.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_file.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_flat.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_flat.hxx} | 10 +-
...led_connectivity.cxx => precompiled_hsqldb.cxx} | 11 +-
...led_connectivity.hxx => precompiled_hsqldb.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_jdbc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_jdbc.hxx} | 10 +-
...led_connectivity.cxx => precompiled_macab1.cxx} | 11 +-
...led_connectivity.hxx => precompiled_macab1.hxx} | 10 +-
..._connectivity.cxx => precompiled_macabdrv1.cxx} | 11 +-
..._connectivity.hxx => precompiled_macabdrv1.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_mysql.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_mysql.hxx} | 10 +-
...piled_connectivity.cxx => precompiled_odbc.cxx} | 11 +-
...piled_connectivity.hxx => precompiled_odbc.hxx} | 10 +-
...d_connectivity.cxx => precompiled_odbcbase.cxx} | 11 +-
...d_connectivity.hxx => precompiled_odbcbase.hxx} | 10 +-
...iled_connectivity.cxx => precompiled_sdbc2.cxx} | 11 +-
...iled_connectivity.hxx => precompiled_sdbc2.hxx} | 10 +-
main/connectivity/prj/build.lst | 30 +---
main/connectivity/prj/d.lst | 52 ------
main/connectivity/prj/makefile.mk | 44 +++++
.../source/commontools/AutoRetrievingBase.cxx | 2 +-
.../connectivity/source/commontools/BlobHelper.cxx | 2 +-
.../source/commontools/CommonTools.cxx | 2 +-
.../source/commontools/ConnectionWrapper.cxx | 2 +-
.../source/commontools/DateConversion.cxx | 2 +-
.../commontools/FDatabaseMetaDataResultSet.cxx | 2 +-
.../FDatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/commontools/FValue.cxx | 2 +-
.../source/commontools/ParamterSubstitution.cxx | 2 +-
.../source/commontools/RowFunctionParser.cxx | 2 +-
.../source/commontools/TColumnsHelper.cxx | 2 +-
.../source/commontools/TConnection.cxx | 2 +-
.../source/commontools/TDatabaseMetaDataBase.cxx | 2 +-
main/connectivity/source/commontools/TIndex.cxx | 2 +-
.../source/commontools/TIndexColumns.cxx | 2 +-
main/connectivity/source/commontools/TIndexes.cxx | 2 +-
main/connectivity/source/commontools/TKey.cxx | 2 +-
.../source/commontools/TKeyColumns.cxx | 2 +-
main/connectivity/source/commontools/TKeys.cxx | 2 +-
.../source/commontools/TPrivilegesResultSet.cxx | 2 +-
.../source/commontools/TSkipDeletedSet.cxx | 2 +-
.../connectivity/source/commontools/TSortIndex.cxx | 2 +-
.../source/commontools/TTableHelper.cxx | 2 +-
.../source/commontools/conncleanup.cxx | 2 +-
main/connectivity/source/commontools/dbcharset.cxx | 2 +-
.../source/commontools/dbconversion.cxx | 2 +-
.../source/commontools/dbexception.cxx | 2 +-
.../connectivity/source/commontools/dbmetadata.cxx | 2 +-
main/connectivity/source/commontools/dbtools.cxx | 2 +-
main/connectivity/source/commontools/dbtools2.cxx | 2 +-
.../source/commontools/filtermanager.cxx | 2 +-
.../source/commontools/formattedcolumnvalue.cxx | 2 +-
.../connectivity/source/commontools/parameters.cxx | 2 +-
.../source/commontools/paramwrapper.cxx | 2 +-
.../source/commontools/predicateinput.cxx | 2 +-
.../source/commontools/propertyids.cxx | 2 +-
main/connectivity/source/commontools/sqlerror.cxx | 2 +-
.../source/commontools/statementcomposer.cxx | 2 +-
.../source/commontools/warningscontainer.cxx | 2 +-
main/connectivity/source/cpool/ZConnectionPool.cxx | 2 +-
.../source/cpool/ZConnectionWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZDriverWrapper.cxx | 2 +-
main/connectivity/source/cpool/ZPoolCollection.cxx | 2 +-
.../source/cpool/ZPooledConnection.cxx | 2 +-
main/connectivity/source/cpool/Zregistration.cxx | 2 +-
.../source/drivers/adabas/BCatalog.cxx | 2 +-
.../source/drivers/adabas/BColumns.cxx | 2 +-
.../source/drivers/adabas/BConnection.cxx | 2 +-
.../source/drivers/adabas/BDatabaseMetaData.cxx | 2 +-
.../connectivity/source/drivers/adabas/BDriver.cxx | 2 +-
.../source/drivers/adabas/BFunctions.cxx | 2 +-
main/connectivity/source/drivers/adabas/BGroup.cxx | 2 +-
.../connectivity/source/drivers/adabas/BGroups.cxx | 2 +-
main/connectivity/source/drivers/adabas/BIndex.cxx | 2 +-
.../source/drivers/adabas/BIndexColumns.cxx | 2 +-
.../source/drivers/adabas/BIndexes.cxx | 2 +-
main/connectivity/source/drivers/adabas/BKeys.cxx | 2 +-
.../source/drivers/adabas/BPreparedStatement.cxx | 2 +-
.../source/drivers/adabas/BResultSet.cxx | 2 +-
.../source/drivers/adabas/BResultSetMetaData.cxx | 2 +-
.../source/drivers/adabas/BStatement.cxx | 2 +-
main/connectivity/source/drivers/adabas/BTable.cxx | 2 +-
.../connectivity/source/drivers/adabas/BTables.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUser.cxx | 2 +-
main/connectivity/source/drivers/adabas/BUsers.cxx | 2 +-
main/connectivity/source/drivers/adabas/BViews.cxx | 2 +-
.../source/drivers/adabas/Bservices.cxx | 2 +-
.../source/drivers/ado/ACallableStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ACatalog.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumn.cxx | 2 +-
main/connectivity/source/drivers/ado/AColumns.cxx | 2 +-
.../source/drivers/ado/AConnection.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaData.cxx | 2 +-
.../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 2 +-
.../drivers/ado/ADatabaseMetaDataResultSet.cxx | 2 +-
.../ado/ADatabaseMetaDataResultSetMetaData.cxx | 2 +-
main/connectivity/source/drivers/ado/ADriver.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroup.cxx | 2 +-
main/connectivity/source/drivers/ado/AGroups.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndex.cxx | 2 +-
main/connectivity/source/drivers/ado/AIndexes.cxx | 2 +-
main/connectivity/source/drivers/ado/AKey.cxx | 2 +-
main/connectivity/source/drivers/ado/AKeys.cxx | 2 +-
.../source/drivers/ado/APreparedStatement.cxx | 2 +-
.../connectivity/source/drivers/ado/AResultSet.cxx | 2 +-
.../source/drivers/ado/AResultSetMetaData.cxx | 2 +-
.../connectivity/source/drivers/ado/AStatement.cxx | 2 +-
main/connectivity/source/drivers/ado/ATable.cxx | 2 +-
main/connectivity/source/drivers/ado/ATables.cxx | 2 +-
main/connectivity/source/drivers/ado/AUser.cxx | 2 +-
main/connectivity/source/drivers/ado/AUsers.cxx | 2 +-
main/connectivity/source/drivers/ado/AView.cxx | 2 +-
main/connectivity/source/drivers/ado/AViews.cxx | 2 +-
.../source/drivers/ado/Aolevariant.cxx | 2 +-
main/connectivity/source/drivers/ado/Aservices.cxx | 2 +-
main/connectivity/source/drivers/ado/Awrapado.cxx | 2 +-
main/connectivity/source/drivers/ado/adoimp.cxx | 2 +-
main/connectivity/source/drivers/calc/CCatalog.cxx | 2 +-
main/connectivity/source/drivers/calc/CColumns.cxx | 2 +-
.../source/drivers/calc/CConnection.cxx | 2 +-
.../source/drivers/calc/CDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/calc/CDriver.cxx | 2 +-
.../source/drivers/calc/CPreparedStatement.cxx | 2 +-
.../source/drivers/calc/CResultSet.cxx | 2 +-
.../source/drivers/calc/CStatement.cxx | 2 +-
main/connectivity/source/drivers/calc/CTable.cxx | 2 +-
main/connectivity/source/drivers/calc/CTables.cxx | 2 +-
.../connectivity/source/drivers/calc/Cservices.cxx | 2 +-
.../connectivity/source/drivers/dbase/DCatalog.cxx | 2 +-
main/connectivity/source/drivers/dbase/DCode.cxx | 2 +-
.../connectivity/source/drivers/dbase/DColumns.cxx | 2 +-
.../source/drivers/dbase/DConnection.cxx | 2 +-
.../source/drivers/dbase/DDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/dbase/DDriver.cxx | 2 +-
main/connectivity/source/drivers/dbase/DIndex.cxx | 2 +-
.../source/drivers/dbase/DIndexColumns.cxx | 2 +-
.../source/drivers/dbase/DIndexIter.cxx | 2 +-
.../connectivity/source/drivers/dbase/DIndexes.cxx | 2 +-
.../source/drivers/dbase/DNoException.cxx | 2 +-
.../source/drivers/dbase/DPreparedStatement.cxx | 2 +-
.../source/drivers/dbase/DResultSet.cxx | 2 +-
.../source/drivers/dbase/DStatement.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTable.cxx | 2 +-
main/connectivity/source/drivers/dbase/DTables.cxx | 2 +-
.../source/drivers/dbase/Dservices.cxx | 2 +-
.../source/drivers/dbase/dindexnode.cxx | 2 +-
main/connectivity/source/drivers/evoab2/EApi.cxx | 2 +-
.../source/drivers/evoab2/NCatalog.cxx | 2 +-
.../source/drivers/evoab2/NColumns.cxx | 2 +-
.../source/drivers/evoab2/NConnection.cxx | 2 +-
.../source/drivers/evoab2/NDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NDebug.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NDriver.cxx | 2 +-
.../source/drivers/evoab2/NPreparedStatement.cxx | 2 +-
.../source/drivers/evoab2/NResultSet.cxx | 2 +-
.../source/drivers/evoab2/NResultSetMetaData.cxx | 2 +-
.../source/drivers/evoab2/NServices.cxx | 2 +-
.../source/drivers/evoab2/NStatement.cxx | 2 +-
main/connectivity/source/drivers/evoab2/NTable.cxx | 2 +-
.../connectivity/source/drivers/evoab2/NTables.cxx | 2 +-
main/connectivity/source/drivers/file/FCatalog.cxx | 2 +-
main/connectivity/source/drivers/file/FColumns.cxx | 2 +-
.../source/drivers/file/FConnection.cxx | 2 +-
.../source/drivers/file/FDatabaseMetaData.cxx | 2 +-
.../source/drivers/file/FDateFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FDriver.cxx | 2 +-
.../source/drivers/file/FNoException.cxx | 2 +-
.../source/drivers/file/FNumericFunctions.cxx | 2 +-
.../source/drivers/file/FPreparedStatement.cxx | 2 +-
.../source/drivers/file/FResultSet.cxx | 2 +-
.../source/drivers/file/FResultSetMetaData.cxx | 2 +-
.../source/drivers/file/FStatement.cxx | 2 +-
.../source/drivers/file/FStringFunctions.cxx | 2 +-
main/connectivity/source/drivers/file/FTable.cxx | 2 +-
main/connectivity/source/drivers/file/FTables.cxx | 2 +-
.../connectivity/source/drivers/file/fanalyzer.cxx | 2 +-
main/connectivity/source/drivers/file/fcode.cxx | 2 +-
main/connectivity/source/drivers/file/fcomp.cxx | 2 +-
.../source/drivers/file/quotedstring.cxx | 2 +-
main/connectivity/source/drivers/flat/ECatalog.cxx | 2 +-
main/connectivity/source/drivers/flat/EColumns.cxx | 2 +-
.../source/drivers/flat/EConnection.cxx | 2 +-
.../source/drivers/flat/EDatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/flat/EDriver.cxx | 2 +-
.../source/drivers/flat/EPreparedStatement.cxx | 2 +-
.../source/drivers/flat/EResultSet.cxx | 2 +-
.../source/drivers/flat/EStatement.cxx | 2 +-
main/connectivity/source/drivers/flat/ETable.cxx | 2 +-
main/connectivity/source/drivers/flat/ETables.cxx | 2 +-
.../connectivity/source/drivers/flat/Eservices.cxx | 2 +-
.../source/drivers/hsqldb/HCatalog.cxx | 2 +-
.../source/drivers/hsqldb/HColumns.cxx | 2 +-
.../source/drivers/hsqldb/HConnection.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HDriver.cxx | 2 +-
.../source/drivers/hsqldb/HStorageAccess.cxx | 2 +-
.../source/drivers/hsqldb/HStorageMap.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HTable.cxx | 2 +-
.../connectivity/source/drivers/hsqldb/HTables.cxx | 2 +-
.../source/drivers/hsqldb/HTerminateListener.cxx | 4 +-
main/connectivity/source/drivers/hsqldb/HTools.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUser.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HUsers.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HView.cxx | 2 +-
main/connectivity/source/drivers/hsqldb/HViews.cxx | 2 +-
.../source/drivers/hsqldb/Hservices.cxx | 2 +-
.../source/drivers/hsqldb/StorageFileAccess.cxx | 2 +-
.../drivers/hsqldb/StorageNativeInputStream.cxx | 2 +-
.../drivers/hsqldb/StorageNativeOutputStream.cxx | 2 +-
.../source/drivers/hsqldb/accesslog.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Array.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Blob.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Boolean.cxx | 2 +-
.../source/drivers/jdbc/CallableStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Class.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Clob.cxx | 2 +-
.../source/drivers/jdbc/ConnectionLog.cxx | 2 +-
.../source/drivers/jdbc/ContextClassLoader.cxx | 2 +-
.../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Date.cxx | 2 +-
.../source/drivers/jdbc/DriverPropertyInfo.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Exception.cxx | 2 +-
.../source/drivers/jdbc/InputStream.cxx | 2 +-
.../source/drivers/jdbc/JBigDecimal.cxx | 2 +-
.../source/drivers/jdbc/JConnection.cxx | 2 +-
main/connectivity/source/drivers/jdbc/JDriver.cxx | 2 +-
.../source/drivers/jdbc/JStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Object.cxx | 2 +-
.../source/drivers/jdbc/PreparedStatement.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Reader.cxx | 2 +-
main/connectivity/source/drivers/jdbc/Ref.cxx | 2 +-
.../connectivity/source/drivers/jdbc/ResultSet.cxx | 2 +-
.../source/drivers/jdbc/ResultSetMetaData.cxx | 2 +-
.../source/drivers/jdbc/SQLException.cxx | 2 +-
.../source/drivers/jdbc/SQLWarning.cxx | 2 +-
main/connectivity/source/drivers/jdbc/String.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Throwable.cxx | 2 +-
.../connectivity/source/drivers/jdbc/Timestamp.cxx | 2 +-
.../connectivity/source/drivers/jdbc/jservices.cxx | 2 +-
main/connectivity/source/drivers/jdbc/tools.cxx | 2 +-
.../source/drivers/macab/MacabAddressBook.cxx | 2 +-
.../source/drivers/macab/MacabCatalog.cxx | 2 +-
.../source/drivers/macab/MacabColumns.cxx | 2 +-
.../source/drivers/macab/MacabConnection.cxx | 2 +-
.../source/drivers/macab/MacabDatabaseMetaData.cxx | 2 +-
.../source/drivers/macab/MacabDriver.cxx | 2 +-
.../source/drivers/macab/MacabGroup.cxx | 2 +-
.../source/drivers/macab/MacabHeader.cxx | 2 +-
.../drivers/macab/MacabPreparedStatement.cxx | 2 +-
.../source/drivers/macab/MacabRecord.cxx | 2 +-
.../source/drivers/macab/MacabRecords.cxx | 2 +-
.../source/drivers/macab/MacabResultSet.cxx | 2 +-
.../drivers/macab/MacabResultSetMetaData.cxx | 2 +-
.../source/drivers/macab/MacabServices.cxx | 2 +-
.../source/drivers/macab/MacabStatement.cxx | 2 +-
.../source/drivers/macab/MacabTable.cxx | 2 +-
.../source/drivers/macab/MacabTables.cxx | 2 +-
.../source/drivers/macab/macabcondition.cxx | 2 +-
.../source/drivers/macab/macaborder.cxx | 2 +-
.../connectivity/source/drivers/mysql/YCatalog.cxx | 2 +-
.../connectivity/source/drivers/mysql/YColumns.cxx | 2 +-
main/connectivity/source/drivers/mysql/YDriver.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTable.cxx | 2 +-
main/connectivity/source/drivers/mysql/YTables.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUser.cxx | 2 +-
main/connectivity/source/drivers/mysql/YUsers.cxx | 2 +-
main/connectivity/source/drivers/mysql/YViews.cxx | 2 +-
.../source/drivers/mysql/Yservices.cxx | 2 +-
.../source/drivers/odbc/OFunctions.cxx | 2 +-
.../source/drivers/odbc/ORealDriver.cxx | 2 +-
.../connectivity/source/drivers/odbc/oservices.cxx | 2 +-
.../source/drivers/odbcbase/OConnection.cxx | 2 +-
.../source/drivers/odbcbase/ODatabaseMetaData.cxx | 2 +-
.../odbcbase/ODatabaseMetaDataResultSet.cxx | 2 +-
.../source/drivers/odbcbase/ODriver.cxx | 2 +-
.../source/drivers/odbcbase/OPreparedStatement.cxx | 2 +-
.../source/drivers/odbcbase/OResultSet.cxx | 2 +-
.../source/drivers/odbcbase/OResultSetMetaData.cxx | 2 +-
.../source/drivers/odbcbase/OStatement.cxx | 2 +-
.../source/drivers/odbcbase/OTools.cxx | 2 +-
.../source/inc/ParameterSubstitution.hxx | 1 -
.../connectivity/source/manager/mdrivermanager.cxx | 2 +-
main/connectivity/source/manager/mregistration.cxx | 2 +-
main/connectivity/source/parse/PColumn.cxx | 2 +-
main/connectivity/source/parse/internalnode.cxx | 2 +-
main/connectivity/source/parse/sqliterator.cxx | 2 +-
main/connectivity/source/parse/sqlnode.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlbison.cxx | 2 +-
main/connectivity/source/parse/wrap_sqlflex.cxx | 2 +-
.../source/resource/sharedresources.cxx | 2 +-
main/connectivity/source/sdbcx/VCatalog.cxx | 2 +-
main/connectivity/source/sdbcx/VCollection.cxx | 2 +-
main/connectivity/source/sdbcx/VColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VDescriptor.cxx | 2 +-
main/connectivity/source/sdbcx/VGroup.cxx | 2 +-
main/connectivity/source/sdbcx/VIndex.cxx | 2 +-
main/connectivity/source/sdbcx/VIndexColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VKey.cxx | 2 +-
main/connectivity/source/sdbcx/VKeyColumn.cxx | 2 +-
main/connectivity/source/sdbcx/VTable.cxx | 2 +-
main/connectivity/source/sdbcx/VUser.cxx | 2 +-
main/connectivity/source/sdbcx/VView.cxx | 2 +-
main/connectivity/source/simpledbt/charset_s.cxx | 2 +-
main/connectivity/source/simpledbt/dbtfactory.cxx | 2 +-
main/connectivity/source/simpledbt/parsenode_s.cxx | 2 +-
main/connectivity/source/simpledbt/parser_s.cxx | 2 +-
main/connectivity/source/simpledbt/refbase.cxx | 2 +-
.../source/simpledbt/staticdbtools_s.cxx | 2 +-
352 files changed, 2477 insertions(+), 530 deletions(-)
diff --git a/main/Repository.mk b/main/Repository.mk
index fdcdc8596d..07da7d2dbf 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -71,6 +71,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
acc \
adabas \
adabasui \
+ ado \
agg \
analysis \
animcore \
@@ -84,6 +85,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
basebmp \
basegfx \
cached1 \
+ calc \
canvastools \
collator_data \
communi \
@@ -92,10 +94,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cui \
date \
dba \
+ dbase \
dbaxml \
dbmm \
dbui \
dbpool \
+ dbpool2 \
dbtools \
desktop_detector \
dict_ja \
@@ -107,9 +111,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
editeng \
embobj \
emboleobj \
+ evoab2 \
evtatt \
file \
fileacc \
+ flat \
fop \
for \
forui \
@@ -121,9 +127,11 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
fwl \
fwm \
guesslang \
+ hsqldb \
i18npaper \
index_data \
java_uno_accessbridge \
+ jdbc \
juh \
juhx \
lng \
@@ -131,9 +139,12 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
localedata_es \
localedata_euro \
localedata_others \
+ macab1 \
+ macabdrv1 \
mcnttype \
msfilter \
msword \
+ mysql \
odbc \
odbcbase \
oox \
@@ -151,6 +162,7 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
scfilt \
scui \
sdbc \
+ sdbc2 \
sdbt \
sfx \
simplecm \
diff --git a/main/connectivity/AllLangResTarget_cnr.mk b/main/connectivity/AllLangResTarget_cnr.mk
new file mode 100644
index 0000000000..329925b9da
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_cnr.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,cnr))
+
+$(eval $(call gb_AllLangResTarget_add_srs,cnr,connectivity/cnr))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/cnr))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/cnr,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/cnr,\
+ connectivity/source/resource/conn_shared_res.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_hsqldb.mk b/main/connectivity/AllLangResTarget_hsqldb.mk
new file mode 100644
index 0000000000..7024f40487
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_hsqldb.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,hsqldb))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,hsqldb,database))
+
+$(eval $(call gb_AllLangResTarget_add_srs,hsqldb,connectivity/hsqldb))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/hsqldb))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/hsqldb,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/hsqldb \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/hsqldb,\
+ connectivity/source/drivers/hsqldb/hsqlui.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_sdbcl.mk b/main/connectivity/AllLangResTarget_sdbcl.mk
new file mode 100644
index 0000000000..43ac462259
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_sdbcl.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdbcl))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdbcl,connectivity/sdbcl))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/sdbcl))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/sdbcl,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/sdbcl,\
+ connectivity/source/resource/conn_log_res.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/AllLangResTarget_sdberr.mk b/main/connectivity/AllLangResTarget_sdberr.mk
new file mode 100644
index 0000000000..a310446917
--- /dev/null
+++ b/main/connectivity/AllLangResTarget_sdberr.mk
@@ -0,0 +1,41 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,sdberr))
+
+$(eval $(call gb_AllLangResTarget_add_srs,sdberr,connectivity/sdberr))
+
+$(eval $(call gb_SrsTarget_SrsTarget,connectivity/sdberr))
+
+$(eval $(call gb_SrsTarget_set_include,connectivity/sdberr,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+# add src files here (complete path relative to repository root)
+$(eval $(call gb_SrsTarget_add_files,connectivity/sdberr,\
+ connectivity/source/resource/conn_error_message.src \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Configuration.mk b/main/connectivity/Configuration.mk
new file mode 100644
index 0000000000..e38d819061
--- /dev/null
+++ b/main/connectivity/Configuration.mk
@@ -0,0 +1,86 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+#########
+# Inputs:
+#########
+
+PACKAGE := org.openoffice.Office.DataAccess
+COMPONENT_CONFIG_DATA := \
+ $(SRCDIR)/source/drivers/ado/ado.xcu \
+ $(SRCDIR)/source/drivers/adabas/adabas.xcu \
+ $(SRCDIR)/source/drivers/mysql/mysql.xcu \
+ $(SRCDIR)/source/drivers/hsqldb/hsqldb.xcu \
+ $(SRCDIR)/source/drivers/macab/macab.xcu \
+ $(SRCDIR)/source/drivers/evoab2/evoab2.xcu \
+ $(SRCDIR)/source/drivers/jdbc/jdbc.xcu \
+ $(SRCDIR)/source/drivers/dbase/dbase.xcu \
+ $(SRCDIR)/source/drivers/flat/flat.xcu \
+ $(SRCDIR)/source/drivers/calc/calc.xcu \
+ $(SRCDIR)/source/drivers/odbc/odbc.xcu
+
+LOCALIZEDFILES = $(COMPONENT_CONFIG_DATA)
+XCUFILES = $(COMPONENT_CONFIG_DATA)
+
+
+
+##############################################
+# Processing and output.
+# From dmake's main/solenv/inc/tg_config.mk:
+##############################################
+
+PACKAGEDIR = $(subst .,/,$(PACKAGE))
+XSLTPACKAGEDIR = $(PACKAGEDIR)
+
+XCSROOTURL = $(WORKDIR)/CustomTarget/connectivity
+ifeq ($(GUI),WNT)
+XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
+endif
+ifeq ($(GUI),OS2)
+XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
+endif
+
+XCU_DEFAULT = $(foreach file,$(XCUFILES),\
+ $(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/$(file))
+XCU_LANG = $(foreach file,$(LOCALIZEDFILES),\
+ $(foreach lang,$(gb_AllLangResTarget_LANGS),\
+ $(WORKDIR)/CustomTarget/connectivity/registry/res/$(lang)/$(PACKAGEDIR)/$(file)))
+
+$(XCU_DEFAULT) : $(OUTPUTDIR)/xml/registry/component-update.dtd \
+ $(OUTPUTDIR)/xml/processing/data_val.xsl \
+ $(OUTPUTDIR)/xml/processing/alllang.xsl
+
+$(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
+ mkdir -p $(dir $@) && \
+ $(gb_XSLTPROC) --nonet -o $*.val \
+ --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
+ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+ --path $(OUTPUTDIR)/xml/registry \
+ $(OUTPUTDIR)/xml/processing/data_val.xsl $< && \
+ $(gb_XSLTPROC) --nonet -o $@ \
+ --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
+ --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
+ --path $(OUTPUTDIR)/xml/registry \
+ $(OUTPUTDIR)/xml/processing/alllang.xsl $< && \
+ rm $*.val
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
new file mode 100644
index 0000000000..0a48734715
--- /dev/null
+++ b/main/connectivity/Jar_sdbc_hsqldb.mk
@@ -0,0 +1,58 @@
+###############################################################
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Jar_Jar,sdbc_hsqldb,SRCDIR))
+
+ifeq ($(SYSTEM_HSQLDB),YES)
+# FIXME: not used anywhere else in AOO! Test!
+$(eval $(call gb_Jar_add_system_jars,sdbc_hsqldb,\
+ $(HSQLDB_JAR) \
+))
+else
+$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
+ $(OUTDIR)/bin/hsqldb.jar \
+))
+endif
+
+$(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com org))
+
+$(eval $(call gb_Jar_set_manifest,sdbc_hsqldb,$(SRCDIR)/connectivity/com/sun/star/sdbcx/comp/hsqldb/manifest))
+
+$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
+ hsqldb.jar \
+ .. \
+))
+
+$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream \
+ connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_adabas.mk b/main/connectivity/Library_adabas.mk
new file mode 100644
index 0000000000..af433c26d9
--- /dev/null
+++ b/main/connectivity/Library_adabas.mk
@@ -0,0 +1,89 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,adabas))
+
+$(eval $(call gb_Library_add_precompiled_header,adabas,$(SRCDIR)/connectivity/inc/pch/precompiled_adabas))
+
+$(eval $(call gb_Library_set_componentfile,adabas,connectivity/source/drivers/adabas/adabas))
+
+$(eval $(call gb_Library_set_include,adabas,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/adabas \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,adabas,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,adabas,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,adabas,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ odbcbase \
+ sal \
+ stl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,adabas,\
+ connectivity/source/drivers/adabas/BCatalog \
+ connectivity/source/drivers/adabas/BColumns \
+ connectivity/source/drivers/adabas/BConnection \
+ connectivity/source/drivers/adabas/BDatabaseMetaData \
+ connectivity/source/drivers/adabas/BDriver \
+ connectivity/source/drivers/adabas/BFunctions \
+ connectivity/source/drivers/adabas/BGroup \
+ connectivity/source/drivers/adabas/BGroups \
+ connectivity/source/drivers/adabas/BIndex \
+ connectivity/source/drivers/adabas/BIndexColumns \
+ connectivity/source/drivers/adabas/BIndexes \
+ connectivity/source/drivers/adabas/BKeys \
+ connectivity/source/drivers/adabas/BPreparedStatement \
+ connectivity/source/drivers/adabas/BResultSet \
+ connectivity/source/drivers/adabas/BResultSetMetaData \
+ connectivity/source/drivers/adabas/BStatement \
+ connectivity/source/drivers/adabas/BTable \
+ connectivity/source/drivers/adabas/BTables \
+ connectivity/source/drivers/adabas/BUser \
+ connectivity/source/drivers/adabas/BUsers \
+ connectivity/source/drivers/adabas/BViews \
+ connectivity/source/drivers/adabas/Bservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_ado.mk b/main/connectivity/Library_ado.mk
new file mode 100644
index 0000000000..c9a09d557a
--- /dev/null
+++ b/main/connectivity/Library_ado.mk
@@ -0,0 +1,95 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,ado))
+
+$(eval $(call gb_Library_add_precompiled_header,ado,$(SRCDIR)/connectivity/inc/pch/precompiled_ado))
+
+$(eval $(call gb_Library_set_componentfile,ado,connectivity/source/drivers/ado/ado))
+
+$(eval $(call gb_Library_set_include,ado,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/ado \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,ado,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,ado,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ ole32 \
+ oleaut32 \
+ sal \
+ stl \
+ uuid \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,ado,\
+ connectivity/source/drivers/ado/ACallableStatement \
+ connectivity/source/drivers/ado/ACatalog \
+ connectivity/source/drivers/ado/AColumn \
+ connectivity/source/drivers/ado/AColumns \
+ connectivity/source/drivers/ado/AConnection \
+ connectivity/source/drivers/ado/ADatabaseMetaData \
+ connectivity/source/drivers/ado/ADatabaseMetaDataImpl \
+ connectivity/source/drivers/ado/ADatabaseMetaDataResultSet \
+ connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData \
+ connectivity/source/drivers/ado/ADriver \
+ connectivity/source/drivers/ado/AGroup \
+ connectivity/source/drivers/ado/AGroups \
+ connectivity/source/drivers/ado/AIndex \
+ connectivity/source/drivers/ado/AIndexes \
+ connectivity/source/drivers/ado/AKey \
+ connectivity/source/drivers/ado/AKeys \
+ connectivity/source/drivers/ado/Aolevariant \
+ connectivity/source/drivers/ado/APreparedStatement \
+ connectivity/source/drivers/ado/AResultSet \
+ connectivity/source/drivers/ado/AResultSetMetaData \
+ connectivity/source/drivers/ado/Aservices \
+ connectivity/source/drivers/ado/AStatement \
+ connectivity/source/drivers/ado/ATable \
+ connectivity/source/drivers/ado/ATables \
+ connectivity/source/drivers/ado/AUser \
+ connectivity/source/drivers/ado/AUsers \
+ connectivity/source/drivers/ado/AView \
+ connectivity/source/drivers/ado/AViews \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,ado,\
+ connectivity/source/drivers/ado/Awrapado \
+ connectivity/source/drivers/ado/adoimp \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_calc.mk b/main/connectivity/Library_calc.mk
new file mode 100644
index 0000000000..bda3dcb4bc
--- /dev/null
+++ b/main/connectivity/Library_calc.mk
@@ -0,0 +1,73 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,calc))
+
+$(eval $(call gb_Library_add_precompiled_header,calc,$(SRCDIR)/connectivity/inc/pch/precompiled_calc))
+
+$(eval $(call gb_Library_set_componentfile,calc,connectivity/source/drivers/calc/calc))
+
+$(eval $(call gb_Library_set_include,calc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,calc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,calc,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,calc,\
+ connectivity/source/drivers/calc/CResultSet \
+ connectivity/source/drivers/calc/CStatement \
+ connectivity/source/drivers/calc/CPreparedStatement \
+ connectivity/source/drivers/calc/CDatabaseMetaData \
+ connectivity/source/drivers/calc/CCatalog \
+ connectivity/source/drivers/calc/CColumns \
+ connectivity/source/drivers/calc/CTable \
+ connectivity/source/drivers/calc/CTables \
+ connectivity/source/drivers/calc/CConnection \
+ connectivity/source/drivers/calc/Cservices \
+ connectivity/source/drivers/calc/CDriver \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbase.mk b/main/connectivity/Library_dbase.mk
new file mode 100644
index 0000000000..fb886f4aa3
--- /dev/null
+++ b/main/connectivity/Library_dbase.mk
@@ -0,0 +1,108 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbase))
+
+$(eval $(call gb_Library_add_precompiled_header,dbase,$(SRCDIR)/connectivity/inc/pch/precompiled_dbase))
+
+$(eval $(call gb_Library_set_componentfile,dbase,connectivity/source/drivers/dbase/dbase))
+
+$(eval $(call gb_Library_set_include,dbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,dbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbase,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DCode \
+ connectivity/source/drivers/dbase/DResultSet \
+ connectivity/source/drivers/dbase/DStatement \
+ connectivity/source/drivers/dbase/DPreparedStatement \
+ connectivity/source/drivers/dbase/dindexnode \
+ connectivity/source/drivers/dbase/DIndexIter \
+ connectivity/source/drivers/dbase/DDatabaseMetaData \
+ connectivity/source/drivers/dbase/DCatalog \
+ connectivity/source/drivers/dbase/DColumns \
+ connectivity/source/drivers/dbase/DIndexColumns \
+ connectivity/source/drivers/dbase/DIndex \
+ connectivity/source/drivers/dbase/DIndexes \
+ connectivity/source/drivers/dbase/DTables \
+ connectivity/source/drivers/dbase/DConnection \
+ connectivity/source/drivers/dbase/Dservices \
+ connectivity/source/drivers/dbase/DDriver \
+))
+
+# [kh] ppc linux gcc compiler problem
+# [Don Lewis] clang 3.4 -O2 on amd64 tries to use R_X86_64_PC32 relocation with
+# symbol _ZThn192_N12connectivity4file10OFileTable7acquireEvj
+
+# FIXME: no way to translate $(CCNUMVER)>=000300040000 && $(CCNUMVER)<000300050000)
+ifeq ($(OS)$(COM)$(CPUNAME),LINUXGCCPOWERPC)
+$(eval $(call gb_Library_add_cxxobjects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+ifeq ($(OS)$(COM)$(CPUNAME),FREEBSDCLANGX86_64)
+ifeq ("$(CCNUMVER)","000300040000")
+$(eval $(call gb_Library_add_cxxobjects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+ , $(gb_COMPILERNOOPTFLAGS) $(gb_LinkTarget_EXCEPTIONFLAGS) \
+))
+else
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+))
+endif
+else
+$(eval $(call gb_Library_add_exception_objects,dbase,\
+ connectivity/source/drivers/dbase/DTable \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbpool2.mk b/main/connectivity/Library_dbpool2.mk
new file mode 100644
index 0000000000..2d990bc63a
--- /dev/null
+++ b/main/connectivity/Library_dbpool2.mk
@@ -0,0 +1,62 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbpool2))
+
+$(eval $(call gb_Library_add_precompiled_header,dbpool2,$(SRCDIR)/connectivity/inc/pch/precompiled_dbpool2))
+
+$(eval $(call gb_Library_set_componentfile,dbpool2,connectivity/source/cpool/dbpool2))
+
+$(eval $(call gb_Library_set_include,dbpool2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+))
+
+$(eval $(call gb_Library_add_api,dbpool2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbpool2,\
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,dbpool2,\
+ connectivity/source/cpool/ZConnectionWrapper \
+ connectivity/source/cpool/ZDriverWrapper \
+ connectivity/source/cpool/ZPooledConnection \
+ connectivity/source/cpool/ZConnectionPool \
+ connectivity/source/cpool/ZPoolCollection \
+ connectivity/source/cpool/Zregistration \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_dbtools.mk b/main/connectivity/Library_dbtools.mk
new file mode 100644
index 0000000000..878d7f6b67
--- /dev/null
+++ b/main/connectivity/Library_dbtools.mk
@@ -0,0 +1,184 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,dbtools))
+
+$(eval $(call gb_Library_add_package_headers,dbtools,connectivity_inc))
+
+$(eval $(call gb_Library_add_precompiled_header,dbtools,$(SRCDIR)/connectivity/inc/pch/precompiled_dbtools))
+
+$(eval $(call gb_Library_set_componentfile,dbtools,connectivity/source/dbtools/dbtools))
+
+$(eval $(call gb_Library_set_include,dbtools,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,dbtools,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,dbtools,\
+ -DOOO_DLLIMPLEMENTATION_DBTOOLS \
+ -DBOOST_SPIRIT_USE_OLD_NAMESPACE \
+ -DCONN_SHARED_RESOURCE_FILE=cnr \
+))
+
+$(eval $(call gb_Library_add_linked_libs,dbtools,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ i18nisolang1 \
+ jvmaccess \
+ sal \
+ stl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+# NETBSD: somewhere we have to instantiate the static data members.
+# NETBSD-1.2.1 doesn't know about weak symbols so the default mechanism for GCC won't work.
+# SCO and MACOSX: the linker does know about weak symbols, but we can't ignore multiple defined symbols
+ifeq ($(OS),NETBSD)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS),SCO)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS)$(COM),OS2GCC)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Library_add_linked_libs,dbtools,ucbhelper))
+endif
+
+
+$(eval $(call gb_Library_add_exception_objects,dbtools,\
+ connectivity/source/sdbcx/VDescriptor \
+ connectivity/source/sdbcx/VCollection \
+ connectivity/source/sdbcx/VColumn \
+ connectivity/source/sdbcx/VIndexColumn \
+ connectivity/source/sdbcx/VKeyColumn \
+ connectivity/source/sdbcx/VUser \
+ connectivity/source/sdbcx/VGroup \
+ connectivity/source/sdbcx/VTable \
+ connectivity/source/sdbcx/VKey \
+ connectivity/source/sdbcx/VIndex \
+ connectivity/source/sdbcx/VCatalog \
+ connectivity/source/sdbcx/VView \
+ connectivity/source/commontools/predicateinput \
+ connectivity/source/commontools/ConnectionWrapper \
+ connectivity/source/commontools/TConnection \
+ connectivity/source/commontools/conncleanup \
+ connectivity/source/commontools/dbtools \
+ connectivity/source/commontools/dbtools2 \
+ connectivity/source/commontools/dbexception \
+ connectivity/source/commontools/CommonTools \
+ connectivity/source/commontools/TColumnsHelper \
+ connectivity/source/commontools/TTableHelper \
+ connectivity/source/commontools/TKeys \
+ connectivity/source/commontools/TKey \
+ connectivity/source/commontools/TKeyColumns \
+ connectivity/source/commontools/TIndexes \
+ connectivity/source/commontools/TIndex \
+ connectivity/source/commontools/TIndexColumns \
+ connectivity/source/commontools/DateConversion \
+ connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData \
+ connectivity/source/commontools/FDatabaseMetaDataResultSet \
+ connectivity/source/commontools/TDatabaseMetaDataBase \
+ connectivity/source/commontools/TPrivilegesResultSet \
+ connectivity/source/commontools/TSkipDeletedSet \
+ connectivity/source/commontools/dbmetadata \
+ connectivity/source/commontools/TSortIndex \
+ connectivity/source/commontools/dbcharset \
+ connectivity/source/commontools/propertyids \
+ connectivity/source/commontools/FValue \
+ connectivity/source/commontools/paramwrapper \
+ connectivity/source/commontools/statementcomposer \
+ connectivity/source/commontools/RowFunctionParser \
+ connectivity/source/commontools/sqlerror \
+ connectivity/source/commontools/filtermanager \
+ connectivity/source/commontools/parameters \
+ connectivity/source/commontools/ParamterSubstitution \
+ connectivity/source/commontools/DriversConfig \
+ connectivity/source/commontools/formattedcolumnvalue \
+ connectivity/source/commontools/BlobHelper \
+ connectivity/source/commontools/warningscontainer \
+ connectivity/source/parse/PColumn \
+ connectivity/source/parse/sqliterator \
+ connectivity/source/parse/sqlnode \
+ connectivity/source/parse/wrap_sqlbison \
+ connectivity/source/parse/internalnode \
+ connectivity/source/simpledbt/charset_s \
+ connectivity/source/simpledbt/staticdbtools_s \
+ connectivity/source/simpledbt/parsenode_s \
+ connectivity/source/simpledbt/parser_s \
+ connectivity/source/resource/sharedresources \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,dbtools,\
+ connectivity/source/commontools/AutoRetrievingBase \
+ connectivity/source/commontools/dbconversion \
+ connectivity/source/parse/wrap_sqlflex \
+ connectivity/source/simpledbt/refbase \
+ connectivity/source/simpledbt/dbtfactory \
+))
+
+############
+# BISON rule
+############
+
+# FIXME: no proper dependencies of other files on Yacc's outputs - needs "make clean" on any changes!
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx : TRTEMPFILE := $(shell $(gb_MKTEMP))
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx : $(SRCDIR)/connectivity/source/parse/sqlbison.y
+ tr -d "\015" < $< > $(TRTEMPFILE)
+ mkdir -p $(dir $@)
+ bison -v -d -l -pSQLyy -bsql -o $@ $(TRTEMPFILE)
+ rm $(TRTEMPFILE)
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx
+
+# Add depenedencies. This is so ugly and doesn't cover the fact evoab2 also uses it:
+
+$(SRCDIR)/connectivity/inc/connectivity/sqlparse.hxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx
+
+$(SRCDIR)/connectivity/source/parse/wrap_sqlbison.cxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.cxx
+
+###########
+# FLEX rule
+###########
+
+$(WORKDIR)/CustomTarget/connectivity/source/parse/sqlflex.cxx : $(SRCDIR)/connectivity/source/parse/sqlflex.l
+ mkdir -p $(dir $@)
+ flex -i -8 -PSQLyy -L -o$@ $<
+
+$(SRCDIR)/connectivity/source/parse/wrap_sqlflex.cxx : $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlflex.cxx $(WORKDIR)/CustomTarget/connectivity/source/parse/sqlbison.hxx
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_evoab2.mk b/main/connectivity/Library_evoab2.mk
new file mode 100644
index 0000000000..74d53baad7
--- /dev/null
+++ b/main/connectivity/Library_evoab2.mk
@@ -0,0 +1,89 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,evoab2))
+
+$(eval $(call gb_Library_add_precompiled_header,evoab2,$(SRCDIR)/connectivity/inc/pch/precompiled_evoab2))
+
+$(eval $(call gb_Library_set_componentfile,evoab2,connectivity/source/drivers/evoab2/evoab))
+
+$(eval $(call gb_Library_set_include,evoab2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/evoab2 \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+ $(filter -I%,$(GTK_CFLAGS)) \
+ $(filter -I%,$(GOBJECT_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_cxxflags,evoab2,\
+ $(filter-out -I%,$(GTK_CFLAGS)) \
+ $(filter-out -I%,$(GOBJECT_CFLAGS)) \
+))
+
+$(eval $(call gb_Library_add_api,evoab2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,evoab2,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_libs,evoab2,\
+ $(GTK_LIBS) \
+ $(GOBJECT_LIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,evoab2,\
+ connectivity/source/drivers/evoab2/NCatalog \
+ connectivity/source/drivers/evoab2/NColumns \
+ connectivity/source/drivers/evoab2/NConnection \
+ connectivity/source/drivers/evoab2/NDatabaseMetaData \
+ connectivity/source/drivers/evoab2/NDriver \
+ connectivity/source/drivers/evoab2/NPreparedStatement \
+ connectivity/source/drivers/evoab2/NResultSet \
+ connectivity/source/drivers/evoab2/NResultSetMetaData \
+ connectivity/source/drivers/evoab2/NStatement \
+ connectivity/source/drivers/evoab2/NTable \
+ connectivity/source/drivers/evoab2/NTables \
+ connectivity/source/drivers/evoab2/NServices \
+ connectivity/source/drivers/evoab2/EApi \
+ connectivity/source/drivers/evoab2/NDebug \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_file.mk b/main/connectivity/Library_file.mk
new file mode 100644
index 0000000000..434bf9e375
--- /dev/null
+++ b/main/connectivity/Library_file.mk
@@ -0,0 +1,86 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,file))
+
+$(eval $(call gb_Library_add_precompiled_header,file,$(SRCDIR)/connectivity/inc/pch/precompiled_file))
+
+$(eval $(call gb_Library_set_include,file,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,file,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_defs,file,\
+ -DOOO_DLLIMPLEMENTATION_FILE \
+))
+
+$(eval $(call gb_Library_add_linked_libs,file,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ ucbhelper \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,file,\
+ connectivity/source/drivers/file/FNoException \
+ connectivity/source/drivers/file/FConnection \
+ connectivity/source/drivers/file/FResultSetMetaData \
+ connectivity/source/drivers/file/FColumns \
+ connectivity/source/drivers/file/FTables \
+ connectivity/source/drivers/file/FTable \
+ connectivity/source/drivers/file/FCatalog \
+ connectivity/source/drivers/file/FResultSet \
+ connectivity/source/drivers/file/FStatement \
+ connectivity/source/drivers/file/FPreparedStatement \
+ connectivity/source/drivers/file/FDatabaseMetaData \
+ connectivity/source/drivers/file/FDriver \
+ connectivity/source/drivers/file/fanalyzer \
+ connectivity/source/drivers/file/fcomp \
+ connectivity/source/drivers/file/fcode \
+))
+
+$(eval $(call gb_Library_add_noexception_objects,file,\
+ connectivity/source/drivers/file/FStringFunctions \
+ connectivity/source/drivers/file/FDateFunctions \
+ connectivity/source/drivers/file/FNumericFunctions \
+ connectivity/source/drivers/file/quotedstring \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_flat.mk b/main/connectivity/Library_flat.mk
new file mode 100644
index 0000000000..bed4d0ea90
--- /dev/null
+++ b/main/connectivity/Library_flat.mk
@@ -0,0 +1,73 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,flat))
+
+$(eval $(call gb_Library_add_precompiled_header,flat,$(SRCDIR)/connectivity/inc/pch/precompiled_flat))
+
+$(eval $(call gb_Library_set_componentfile,flat,connectivity/source/drivers/flat/flat))
+
+$(eval $(call gb_Library_set_include,flat,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,flat,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,flat,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ file \
+ dbtools \
+ sal \
+ stl \
+ svl \
+ tl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,flat,\
+ connectivity/source/drivers/flat/ECatalog \
+ connectivity/source/drivers/flat/EColumns \
+ connectivity/source/drivers/flat/EConnection \
+ connectivity/source/drivers/flat/EDatabaseMetaData \
+ connectivity/source/drivers/flat/EDriver \
+ connectivity/source/drivers/flat/EPreparedStatement \
+ connectivity/source/drivers/flat/EResultSet \
+ connectivity/source/drivers/flat/EStatement \
+ connectivity/source/drivers/flat/ETable \
+ connectivity/source/drivers/flat/ETables \
+ connectivity/source/drivers/flat/Eservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_hsqldb.mk b/main/connectivity/Library_hsqldb.mk
new file mode 100644
index 0000000000..09606223f8
--- /dev/null
+++ b/main/connectivity/Library_hsqldb.mk
@@ -0,0 +1,87 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,hsqldb))
+
+$(eval $(call gb_Library_add_precompiled_header,hsqldb,$(SRCDIR)/connectivity/inc/pch/precompiled_hsqldb))
+
+$(eval $(call gb_Library_set_componentfile,hsqldb,connectivity/source/drivers/hsqldb/hsqldb))
+
+$(eval $(call gb_Library_set_include,hsqldb,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+# FIXME: Macs will presumably also need to do something with:
+# SHL1CREATEJNILIB=TRUE
+
+ifeq ($(SYSTEM_HSQLDB),YES)
+$(eval $(call gb_Library_add_cxxflags,hsqldb,\
+ -DSYSTEM_HSQLDB -DHSQLDB_JAR=\""file://$(HSQLDB_JAR)"\"
+))
+endif
+
+$(eval $(call gb_Library_add_api,hsqldb,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,hsqldb,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ jvmfwk \
+ sal \
+ stl \
+ tl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,hsqldb,\
+ connectivity/source/drivers/hsqldb/HStorageMap \
+ connectivity/source/drivers/hsqldb/HStorageAccess \
+ connectivity/source/drivers/hsqldb/HDriver \
+ connectivity/source/drivers/hsqldb/HConnection \
+ connectivity/source/drivers/hsqldb/HTerminateListener \
+ connectivity/source/drivers/hsqldb/StorageNativeOutputStream \
+ connectivity/source/drivers/hsqldb/StorageNativeInputStream \
+ connectivity/source/drivers/hsqldb/StorageFileAccess \
+ connectivity/source/drivers/hsqldb/HTables \
+ connectivity/source/drivers/hsqldb/HTable \
+ connectivity/source/drivers/hsqldb/HView \
+ connectivity/source/drivers/hsqldb/HViews \
+ connectivity/source/drivers/hsqldb/HCatalog \
+ connectivity/source/drivers/hsqldb/HColumns \
+ connectivity/source/drivers/hsqldb/HUser \
+ connectivity/source/drivers/hsqldb/HUsers \
+ connectivity/source/drivers/hsqldb/Hservices \
+ connectivity/source/drivers/hsqldb/HTools \
+ connectivity/source/drivers/hsqldb/accesslog \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_jdbc.mk b/main/connectivity/Library_jdbc.mk
new file mode 100644
index 0000000000..e81b2a0f74
--- /dev/null
+++ b/main/connectivity/Library_jdbc.mk
@@ -0,0 +1,91 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,jdbc))
+
+$(eval $(call gb_Library_add_precompiled_header,jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_jdbc))
+
+$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
+
+$(eval $(call gb_Library_set_include,jdbc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/jdbc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,jdbc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,jdbc,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ jvmaccess \
+ jvmfwk \
+ sal \
+ stl \
+ utl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,jdbc,\
+ connectivity/source/drivers/jdbc/Array \
+ connectivity/source/drivers/jdbc/Blob \
+ connectivity/source/drivers/jdbc/Boolean \
+ connectivity/source/drivers/jdbc/CallableStatement \
+ connectivity/source/drivers/jdbc/Class \
+ connectivity/source/drivers/jdbc/Clob \
+ connectivity/source/drivers/jdbc/ConnectionLog \
+ connectivity/source/drivers/jdbc/DatabaseMetaData \
+ connectivity/source/drivers/jdbc/Date \
+ connectivity/source/drivers/jdbc/DriverPropertyInfo \
+ connectivity/source/drivers/jdbc/Exception \
+ connectivity/source/drivers/jdbc/InputStream \
+ connectivity/source/drivers/jdbc/JConnection \
+ connectivity/source/drivers/jdbc/JDriver \
+ connectivity/source/drivers/jdbc/JStatement \
+ connectivity/source/drivers/jdbc/Object \
+ connectivity/source/drivers/jdbc/PreparedStatement \
+ connectivity/source/drivers/jdbc/Reader \
+ connectivity/source/drivers/jdbc/Ref \
+ connectivity/source/drivers/jdbc/ResultSet \
+ connectivity/source/drivers/jdbc/ResultSetMetaData \
+ connectivity/source/drivers/jdbc/SQLException \
+ connectivity/source/drivers/jdbc/SQLWarning \
+ connectivity/source/drivers/jdbc/String \
+ connectivity/source/drivers/jdbc/Throwable \
+ connectivity/source/drivers/jdbc/Timestamp \
+ connectivity/source/drivers/jdbc/jservices \
+ connectivity/source/drivers/jdbc/JBigDecimal \
+ connectivity/source/drivers/jdbc/tools \
+ connectivity/source/drivers/jdbc/ContextClassLoader \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_macab1.mk b/main/connectivity/Library_macab1.mk
new file mode 100644
index 0000000000..449ccf576c
--- /dev/null
+++ b/main/connectivity/Library_macab1.mk
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,macab1))
+
+$(eval $(call gb_Library_add_precompiled_header,macab1,$(SRCDIR)/connectivity/inc/pch/precompiled_macab1))
+
+$(eval $(call gb_Library_set_componentfile,macab1,connectivity/source/drivers/macab/macab1))
+
+$(eval $(call gb_Library_set_include,macab1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/macab \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,macab1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,macab1,\
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,macab1,\
+ connectivity/source/drivers/macab/MacabDriver \
+ connectivity/source/drivers/macab/MacabServices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_macabdrv1.mk b/main/connectivity/Library_macabdrv1.mk
new file mode 100644
index 0000000000..e622c53ccf
--- /dev/null
+++ b/main/connectivity/Library_macabdrv1.mk
@@ -0,0 +1,78 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,macabdrv1))
+
+$(eval $(call gb_Library_add_precompiled_header,macabdrv1,$(SRCDIR)/connectivity/inc/pch/precompiled_macabdrv1))
+
+$(eval $(call gb_Library_set_include,macabdrv1,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/macab \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,macabdrv1,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_libs,macabdrv1,\
+ -framework Carbon \
+ -framework AddressBook \
+))
+
+$(eval $(call gb_Library_add_linked_libs,macabdrv1,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,macabdrv1,\
+ connectivity/source/drivers/macab/MacabColumns \
+ connectivity/source/drivers/macab/MacabTable \
+ connectivity/source/drivers/macab/MacabTables \
+ connectivity/source/drivers/macab/MacabCatalog \
+ connectivity/source/drivers/macab/MacabResultSet \
+ connectivity/source/drivers/macab/MacabStatement \
+ connectivity/source/drivers/macab/MacabPreparedStatement \
+ connectivity/source/drivers/macab/MacabDatabaseMetaData \
+ connectivity/source/drivers/macab/MacabConnection \
+ connectivity/source/drivers/macab/MacabResultSetMetaData \
+ connectivity/source/drivers/macab/macabcondition \
+ connectivity/source/drivers/macab/macaborder \
+ connectivity/source/drivers/macab/MacabRecord \
+ connectivity/source/drivers/macab/MacabRecords \
+ connectivity/source/drivers/macab/MacabHeader \
+ connectivity/source/drivers/macab/MacabGroup \
+ connectivity/source/drivers/macab/MacabAddressBook \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_mysql.mk b/main/connectivity/Library_mysql.mk
new file mode 100644
index 0000000000..fa0242f11f
--- /dev/null
+++ b/main/connectivity/Library_mysql.mk
@@ -0,0 +1,66 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,mysql))
+
+$(eval $(call gb_Library_add_precompiled_header,mysql,$(SRCDIR)/connectivity/inc/pch/precompiled_mysql))
+
+$(eval $(call gb_Library_set_componentfile,mysql,connectivity/source/drivers/mysql/mysql))
+
+$(eval $(call gb_Library_set_include,mysql,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(SRCDIR)/connectivity/source/drivers/mysql \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_api,mysql,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,mysql,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,mysql,\
+ connectivity/source/drivers/mysql/YCatalog \
+ connectivity/source/drivers/mysql/YColumns \
+ connectivity/source/drivers/mysql/YDriver \
+ connectivity/source/drivers/mysql/YTable \
+ connectivity/source/drivers/mysql/YTables \
+ connectivity/source/drivers/mysql/YUser \
+ connectivity/source/drivers/mysql/YUsers \
+ connectivity/source/drivers/mysql/YViews \
+ connectivity/source/drivers/mysql/Yservices \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_odbc.mk b/main/connectivity/Library_odbc.mk
new file mode 100644
index 0000000000..8fd95dce99
--- /dev/null
+++ b/main/connectivity/Library_odbc.mk
@@ -0,0 +1,65 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,odbc))
+
+$(eval $(call gb_Library_add_precompiled_header,odbc,$(SRCDIR)/connectivity/inc/pch/precompiled_odbc))
+
+$(eval $(call gb_Library_set_componentfile,odbc,connectivity/source/drivers/odbc/odbc))
+
+$(eval $(call gb_Library_set_include,odbc,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,odbc,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,odbc,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odbc,\
+ cppuhelper \
+ cppu \
+ odbcbase \
+ sal \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbc,\
+ connectivity/source/drivers/odbc/oservices \
+ connectivity/source/drivers/odbc/ORealDriver \
+ connectivity/source/drivers/odbc/OFunctions \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_odbcbase.mk b/main/connectivity/Library_odbcbase.mk
new file mode 100644
index 0000000000..8a7f984b4e
--- /dev/null
+++ b/main/connectivity/Library_odbcbase.mk
@@ -0,0 +1,74 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,odbcbase))
+
+$(eval $(call gb_Library_add_precompiled_header,odbcbase,$(SRCDIR)/connectivity/inc/pch/precompiled_odbcbase))
+
+$(eval $(call gb_Library_set_include,odbcbase,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+ -I$(SRCDIR)/connectivity/source/inc \
+ -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
+))
+
+$(eval $(call gb_Library_add_cxxflags,odbcbase,\
+ -DOOO_DLLIMPLEMENTATION_ODBCBASE \
+))
+
+ifeq ($(SYSTEM_ODBC_HEADERS),YES)
+$(eval $(call gb_Library_add_cxxflags,odbcbase,\
+ -DSYSTEM_ODBC_HEADERS \
+))
+endif
+
+$(eval $(call gb_Library_add_api,odbcbase,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,odbcbase,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ vos3 \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,odbcbase,\
+ connectivity/source/drivers/odbcbase/OPreparedStatement \
+ connectivity/source/drivers/odbcbase/OStatement \
+ connectivity/source/drivers/odbcbase/OResultSetMetaData \
+ connectivity/source/drivers/odbcbase/OResultSet \
+ connectivity/source/drivers/odbcbase/OTools \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet \
+ connectivity/source/drivers/odbcbase/ODatabaseMetaData \
+ connectivity/source/drivers/odbcbase/ODriver \
+ connectivity/source/drivers/odbcbase/OConnection \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Library_sdbc2.mk b/main/connectivity/Library_sdbc2.mk
new file mode 100644
index 0000000000..4cbda2b89d
--- /dev/null
+++ b/main/connectivity/Library_sdbc2.mk
@@ -0,0 +1,58 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,sdbc2))
+
+$(eval $(call gb_Library_add_precompiled_header,sdbc2,$(SRCDIR)/connectivity/inc/pch/precompiled_sdbc2))
+
+$(eval $(call gb_Library_set_componentfile,sdbc2,connectivity/source/manager/sdbc2))
+
+$(eval $(call gb_Library_set_include,sdbc2,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/connectivity/inc \
+ -I$(SRCDIR)/connectivity/inc/pch \
+))
+
+$(eval $(call gb_Library_add_api,sdbc2,\
+ offapi \
+ udkapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,sdbc2,\
+ comphelper \
+ cppuhelper \
+ cppu \
+ dbtools \
+ sal \
+ stl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+
+$(eval $(call gb_Library_add_exception_objects,sdbc2,\
+ connectivity/source/manager/mdrivermanager \
+ connectivity/source/manager/mregistration \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Makefile b/main/connectivity/Makefile
new file mode 100644
index 0000000000..c1d144cbd4
--- /dev/null
+++ b/main/connectivity/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Module_connectivity.mk b/main/connectivity/Module_connectivity.mk
new file mode 100644
index 0000000000..70b15d10b4
--- /dev/null
+++ b/main/connectivity/Module_connectivity.mk
@@ -0,0 +1,72 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,connectivity))
+
+$(eval $(call gb_Module_add_targets,connectivity,\
+ AllLangResTarget_cnr \
+ AllLangResTarget_hsqldb \
+ AllLangResTarget_sdbcl \
+ AllLangResTarget_sdberr \
+ Configuration \
+ Connectivity \
+ Jar_sdbc_hsqldb \
+ Library_adabas \
+ Library_calc \
+ Library_dbase \
+ Library_dbpool2 \
+ Library_dbtools \
+ Library_file \
+ Library_flat \
+ Library_hsqldb \
+ Library_jdbc \
+ Library_mysql \
+ Library_odbc \
+ Library_odbcbase \
+ Library_sdbc2 \
+ Package_inc \
+ Package_generated_inc \
+))
+
+ifeq ($(GUI),WNT)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_ado \
+))
+endif
+
+ifeq ($(ENABLE_EVOAB2),TRUE)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_evoab2 \
+))
+endif
+
+ifeq ($(GUI),UNX)
+ifeq ($(OS),MACOSX)
+$(eval $(call gb_Module_add_targets,connectivity,\
+ Library_macab1 \
+ Library_macabdrv1 \
+))
+endif
+endif
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Package_generated_inc.mk b/main/connectivity/Package_generated_inc.mk
new file mode 100644
index 0000000000..4ae3d0df28
--- /dev/null
+++ b/main/connectivity/Package_generated_inc.mk
@@ -0,0 +1,26 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,connectivity_generated_inc,$(WORKDIR)/CustomTarget/connectivity/source/parse))
+
+$(eval $(call gb_Package_add_file,connectivity_generated_inc,inc/connectivity/sqlbison.hxx,sqlbison.hxx))
diff --git a/main/connectivity/Package_inc.mk b/main/connectivity/Package_inc.mk
new file mode 100644
index 0000000000..69f109206c
--- /dev/null
+++ b/main/connectivity/Package_inc.mk
@@ -0,0 +1,78 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Package_Package,connectivity_inc,$(SRCDIR)/connectivity/inc))
+
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/BlobHelper.hxx,connectivity/BlobHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/CommonTools.hxx,connectivity/CommonTools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/conncleanup.hxx,connectivity/conncleanup.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ConnectionWrapper.hxx,connectivity/ConnectionWrapper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DateConversion.hxx,connectivity/DateConversion.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbcharset.hxx,connectivity/dbcharset.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbconversion.hxx,connectivity/dbconversion.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbexception.hxx,connectivity/dbexception.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbmetadata.hxx,connectivity/dbmetadata.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtools.hxx,connectivity/dbtools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/dbtoolsdllapi.hxx,connectivity/dbtoolsdllapi.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/DriversConfig.hxx,connectivity/DriversConfig.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/filtermanager.hxx,connectivity/filtermanager.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/formattedcolumnvalue.hxx,connectivity/formattedcolumnvalue.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/FValue.hxx,connectivity/FValue.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/IParseContext.hxx,connectivity/IParseContext.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/ParameterCont.hxx,connectivity/ParameterCont.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/parameters.hxx,connectivity/parameters.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/paramwrapper.hxx,connectivity/paramwrapper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/PColumn.hxx,connectivity/PColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/predicateinput.hxx,connectivity/predicateinput.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/IRefreshable.hxx,connectivity/sdbcx/IRefreshable.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCatalog.hxx,connectivity/sdbcx/VCatalog.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VCollection.hxx,connectivity/sdbcx/VCollection.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VColumn.hxx,connectivity/sdbcx/VColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VDescriptor.hxx,connectivity/sdbcx/VDescriptor.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VGroup.hxx,connectivity/sdbcx/VGroup.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndex.hxx,connectivity/sdbcx/VIndex.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VIndexColumn.hxx,connectivity/sdbcx/VIndexColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKey.hxx,connectivity/sdbcx/VKey.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VKeyColumn.hxx,connectivity/sdbcx/VKeyColumn.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTable.hxx,connectivity/sdbcx/VTable.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VTypeDef.hxx,connectivity/sdbcx/VTypeDef.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VUser.hxx,connectivity/sdbcx/VUser.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sdbcx/VView.hxx,connectivity/sdbcx/VView.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlerror.hxx,connectivity/sqlerror.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqliterator.hxx,connectivity/sqliterator.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlnode.hxx,connectivity/sqlnode.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/sqlparse.hxx,connectivity/sqlparse.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/SQLStatementHelper.hxx,connectivity/SQLStatementHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/standardsqlstate.hxx,connectivity/standardsqlstate.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/statementcomposer.hxx,connectivity/statementcomposer.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/StdTypeDefs.hxx,connectivity/StdTypeDefs.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TColumnsHelper.hxx,connectivity/TColumnsHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndex.hxx,connectivity/TIndex.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexColumns.hxx,connectivity/TIndexColumns.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TIndexes.hxx,connectivity/TIndexes.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKey.hxx,connectivity/TKey.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeyColumns.hxx,connectivity/TKeyColumns.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TKeys.hxx,connectivity/TKeys.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/TTableHelper.hxx,connectivity/TTableHelper.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/virtualdbtools.hxx,connectivity/virtualdbtools.hxx))
+$(eval $(call gb_Package_add_file,connectivity_inc,inc/connectivity/warningscontainer.hxx,connectivity/warningscontainer.hxx))
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_adabas.cxx
similarity index 95%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_adabas.cxx
index ae97eedf20..cb81a710ea 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_adabas.cxx
@@ -21,4 +21,5 @@
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_adabas.hxx
similarity index 100%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_adabas.hxx
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_ado.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_ado.cxx
index ae97eedf20..4a3ea73fff 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_ado.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_ado.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_ado.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_ado.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_calc.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_calc.cxx
index ae97eedf20..7efdb38a66 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_calc.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_calc.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_calc.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_calc.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbase.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbase.cxx
index ae97eedf20..b23aeda967 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbase.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbase.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbase.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_dbase.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbpool2.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbpool2.cxx
index ae97eedf20..90ad91b818 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbpool2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbpool2.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbpool2.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_dbpool2.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_dbtools.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_dbtools.cxx
index ae97eedf20..888fe6201b 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_dbtools.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_dbtools.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_dbtools.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_dbtools.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_evoab2.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_evoab2.cxx
index ae97eedf20..2b0e9d8e7a 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_evoab2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_evoab2.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_evoab2.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_evoab2.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_file.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_file.cxx
index ae97eedf20..8a2c288228 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_file.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_file.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_file.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_file.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_flat.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_flat.cxx
index ae97eedf20..524768eec9 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_flat.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_flat.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_flat.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_flat.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_hsqldb.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_hsqldb.cxx
index ae97eedf20..54351bb5f5 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_hsqldb.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_hsqldb.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_hsqldb.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_hsqldb.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_jdbc.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_jdbc.cxx
index ae97eedf20..b79f477926 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_jdbc.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_jdbc.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_jdbc.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_jdbc.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_macab1.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_macab1.cxx
index ae97eedf20..9353bd97ce 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_macab1.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_macab1.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_macab1.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_macab1.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_macabdrv1.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_macabdrv1.cxx
index ae97eedf20..b85221030a 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_macabdrv1.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_macabdrv1.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_macabdrv1.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_macabdrv1.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_mysql.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_mysql.cxx
index ae97eedf20..9f31ec2889 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_mysql.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_mysql.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_mysql.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_mysql.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_odbc.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_odbc.cxx
index ae97eedf20..38cca33711 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_odbc.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_odbc.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_odbc.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_odbc.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_odbcbase.cxx
similarity index 94%
copy from main/connectivity/inc/pch/precompiled_connectivity.cxx
copy to main/connectivity/inc/pch/precompiled_odbcbase.cxx
index ae97eedf20..4afdf874d4 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_odbcbase.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_odbcbase.hxx
similarity index 99%
copy from main/connectivity/inc/pch/precompiled_connectivity.hxx
copy to main/connectivity/inc/pch/precompiled_odbcbase.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_odbcbase.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.cxx b/main/connectivity/inc/pch/precompiled_sdbc2.cxx
similarity index 94%
rename from main/connectivity/inc/pch/precompiled_connectivity.cxx
rename to main/connectivity/inc/pch/precompiled_sdbc2.cxx
index ae97eedf20..9a4bb44301 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.cxx
+++ b/main/connectivity/inc/pch/precompiled_sdbc2.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,18 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
+
diff --git a/main/connectivity/inc/pch/precompiled_connectivity.hxx b/main/connectivity/inc/pch/precompiled_sdbc2.hxx
similarity index 99%
rename from main/connectivity/inc/pch/precompiled_connectivity.hxx
rename to main/connectivity/inc/pch/precompiled_sdbc2.hxx
index 4406206eca..a499016c00 100644
--- a/main/connectivity/inc/pch/precompiled_connectivity.hxx
+++ b/main/connectivity/inc/pch/precompiled_sdbc2.hxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
@@ -322,7 +322,7 @@
#include "vos/mutex.hxx"
#include "vos/process.hxx"
#include "vos/ref.hxx"
-#include "vos/ref.hxx"
+#include "vos/ref.hxx"
#include "vos/refernce.hxx"
#include "vos/timer.hxx"
//---MARKER---
diff --git a/main/connectivity/prj/build.lst b/main/connectivity/prj/build.lst
index 441742c91e..1db7f0d072 100644
--- a/main/connectivity/prj/build.lst
+++ b/main/connectivity/prj/build.lst
@@ -1,30 +1,2 @@
cn connectivity : shell L10N:l10n comphelper SO:moz_prebuilt svl UNIXODBC:unixODBC unoil javaunohelper HSQLDB:hsqldb qadevOOo officecfg LIBXSLT:libxslt APACHE_COMMONS:apache-commons NULL
-cn connectivity usr1 - all cn_mkout NULL
-cn connectivity\inc nmake - all cn_inc NULL
-cn connectivity\java\dbtools nmake - all cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_jdbc nmake - all cn_jdbc cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_hsqldb nmake - all cn_jhsqldbdb cn_hsqldb cn_jdbtools cn_inc NULL
-cn connectivity\java\sdbc_postgresql nmake - all cn_postgresqldb cn_dbtools cn_jdbtools cn_inc NULL
-cn connectivity\source\commontools nmake - all cn_cmtools cn_parse cn_inc NULL
-cn connectivity\source\manager nmake - all cn_manager cn_dbtools cn_inc NULL
-cn connectivity\source\cpool nmake - all cn_cpool cn_dbtools cn_inc NULL
-cn connectivity\source\resource nmake - all cn_res cn_inc NULL
-cn connectivity\source\sdbcx nmake - all cn_sdbcx cn_inc NULL
-cn connectivity\source\drivers\ado nmake - all cn_ado cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\macab nmake - all cn_macab cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\evoab2 nmake - all cn_evoab2 cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\calc nmake - all cn_calc cn_file cn_inc NULL
-cn connectivity\source\drivers\odbcbase nmake - all cn_odbcbase cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\odbc nmake - all cn_odbc cn_odbcbase cn_inc NULL
-cn connectivity\source\drivers\mysql nmake - all cn_mysql cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\adabas nmake - all cn_adabas cn_dbtools cn_odbcbase cn_inc NULL
-cn connectivity\source\drivers\file nmake - all cn_file cn_dbtools cn_inc NULL
-cn connectivity\source\drivers\flat nmake - all cn_flat cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\dbase nmake - all cn_dbase cn_dbtools cn_file cn_inc NULL
-cn connectivity\source\drivers\hsqldb nmake - all cn_hsqldb cn_dbtools cn_inc NULL
-cn connectivity\source\parse nmake - all cn_parse cn_inc NULL
-cn connectivity\source\simpledbt nmake - all cn_simpledbt cn_cmtools cn_inc NULL
-cn connectivity\source\dbtools nmake - all cn_dbtools cn_simpledbt cn_cmtools cn_parse cn_res cn_sdbcx cn_inc cn_res NULL
-cn connectivity\qa\connectivity\tools nmake - all cn_qa_tools cn_inc NULL
-cn connectivity\qa\complex\connectivity nmake - all cn_qa_complex cn_inc NULL
-cn connectivity\util nmake - all cn_util cn_ado cn_evoab2 cn_calc cn_odbc cn_mysql cn_jdbc cn_adabas cn_flat cn_dbase cn_hsqldb cn_macab cn_postgresqldb NULL
+cn connectivity\prj nmake - all cn_prj NULL
diff --git a/main/connectivity/prj/d.lst b/main/connectivity/prj/d.lst
index 7a7e5f40b8..e69de29bb2 100644
--- a/main/connectivity/prj/d.lst
+++ b/main/connectivity/prj/d.lst
@@ -1,52 +0,0 @@
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\*.so
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.jnilib %_DEST%\lib%_EXT%\*.jnilib
-..\%__SRC%\slb\connectivity*.* %_DEST%\lib%_EXT%\connectivity*.*
-..\%__SRC%\lib\idbt* %_DEST%\lib%_EXT%\idbt*
-..\%__SRC%\lib\dbt*.lib %_DEST%\lib%_EXT%\dbt*.lib
-
-..\source\cpool\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\adabas\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\ado\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\macab\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\file\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\flat\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\dbase\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\odbc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\evoab2\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\calc\*.xml %_DEST%\xml%_EXT%\*.xml
-..\source\drivers\mysql\*.xml %_DEST%\xml%_EXT%\*.xml
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\dbtools\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_hsqldb\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_jdbc\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\class\sdbc_postgresql\*.jar %_DEST%\bin%_EXT%\*.jar
-
-mkdir: %_DEST%\inc%_EXT%\connectivity
-mkdir: %_DEST%\inc%_EXT%\connectivity\sdbcx
-mkdir: %_DEST%\xml%_EXT%\registry\spool\DataAccess
-
-..\inc\connectivity\*.hxx %_DEST%\inc%_EXT%\connectivity\*.hxx
-..\%__SRC%\inc\sqlbison.hxx %_DEST%\inc%_EXT%\connectivity\sqlbison.hxx
-..\inc\connectivity\sdbcx\*.hxx %_DEST%\inc%_EXT%\connectivity\sdbcx\*.hxx
-#..\version.mk %_DEST%\inc%_EXT%\connectivity\version.mk
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\spool\DataAccess\*.xcu
-..\%COMMON_OUTDIR%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\bin\fcfg_drivers_*.zip %_DEST%\pck%_EXT%\fcfg_drivers_*.zip
-..\%__SRC%\misc\adabas.component %_DEST%\xml%_EXT%\adabas.component
-..\%__SRC%\misc\ado.component %_DEST%\xml%_EXT%\ado.component
-..\%__SRC%\misc\calc.component %_DEST%\xml%_EXT%\calc.component
-..\%__SRC%\misc\dbase.component %_DEST%\xml%_EXT%\dbase.component
-..\%__SRC%\misc\dbpool2.component %_DEST%\xml%_EXT%\dbpool2.component
-..\%__SRC%\misc\dbtools.component %_DEST%\xml%_EXT%\dbtools.component
-..\%__SRC%\misc\evoab.component %_DEST%\xml%_EXT%\evoab.component
-..\%__SRC%\misc\flat.component %_DEST%\xml%_EXT%\flat.component
-..\%__SRC%\misc\hsqldb.component %_DEST%\xml%_EXT%\hsqldb.component
-..\%__SRC%\misc\jdbc.component %_DEST%\xml%_EXT%\jdbc.component
-..\%__SRC%\misc\macab1.component %_DEST%\xml%_EXT%\macab1.component
-..\%__SRC%\misc\mysql.component %_DEST%\xml%_EXT%\mysql.component
-..\%__SRC%\misc\odbc.component %_DEST%\xml%_EXT%\odbc.component
-..\%__SRC%\misc\postgresql.component %_DEST%\xml%_EXT%\postgresql.component
-..\%__SRC%\misc\sdbc2.component %_DEST%\xml%_EXT%\sdbc2.component
diff --git a/main/connectivity/prj/makefile.mk b/main/connectivity/prj/makefile.mk
new file mode 100644
index 0000000000..353f9e0db1
--- /dev/null
+++ b/main/connectivity/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/main/connectivity/source/commontools/AutoRetrievingBase.cxx b/main/connectivity/source/commontools/AutoRetrievingBase.cxx
index d4fec6a442..736373580d 100644
--- a/main/connectivity/source/commontools/AutoRetrievingBase.cxx
+++ b/main/connectivity/source/commontools/AutoRetrievingBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "AutoRetrievingBase.hxx"
namespace connectivity
diff --git a/main/connectivity/source/commontools/BlobHelper.cxx b/main/connectivity/source/commontools/BlobHelper.cxx
index 172745559d..863b2effac 100644
--- a/main/connectivity/source/commontools/BlobHelper.cxx
+++ b/main/connectivity/source/commontools/BlobHelper.cxx
@@ -21,7 +21,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/BlobHelper.hxx"
#include <comphelper/seqstream.hxx>
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/commontools/CommonTools.cxx b/main/connectivity/source/commontools/CommonTools.cxx
index 940c8fe8c1..44d95a0f94 100644
--- a/main/connectivity/source/commontools/CommonTools.cxx
+++ b/main/connectivity/source/commontools/CommonTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/CommonTools.hxx"
diff --git a/main/connectivity/source/commontools/ConnectionWrapper.cxx b/main/connectivity/source/commontools/ConnectionWrapper.cxx
index 96d58a2781..6b480e9638 100644
--- a/main/connectivity/source/commontools/ConnectionWrapper.cxx
+++ b/main/connectivity/source/commontools/ConnectionWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
#include "connectivity/ConnectionWrapper.hxx"
#endif
diff --git a/main/connectivity/source/commontools/DateConversion.cxx b/main/connectivity/source/commontools/DateConversion.cxx
index db166ddb70..bc0432e18f 100644
--- a/main/connectivity/source/commontools/DateConversion.cxx
+++ b/main/connectivity/source/commontools/DateConversion.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbconversion.hxx"
diff --git a/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
index 94d3e82fcd..f7fa144c69 100644
--- a/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "ParameterSubstitution.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
diff --git a/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
index a6c8e75f5a..f580c82d3b 100644
--- a/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
+++ b/main/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "FDatabaseMetaDataResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ProcedureResult.hpp>
diff --git a/main/connectivity/source/commontools/FValue.cxx b/main/connectivity/source/commontools/FValue.cxx
index e9a2e4f7b1..e3f09e3ae0 100644
--- a/main/connectivity/source/commontools/FValue.cxx
+++ b/main/connectivity/source/commontools/FValue.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/FValue.hxx"
diff --git a/main/connectivity/source/commontools/ParamterSubstitution.cxx b/main/connectivity/source/commontools/ParamterSubstitution.cxx
index 724eed690a..189aea380b 100644
--- a/main/connectivity/source/commontools/ParamterSubstitution.cxx
+++ b/main/connectivity/source/commontools/ParamterSubstitution.cxx
@@ -20,7 +20,7 @@
*************************************************************/
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "ParameterSubstitution.hxx"
#include "connectivity/sqlparse.hxx"
#include <comphelper/sequenceashashmap.hxx>
diff --git a/main/connectivity/source/commontools/RowFunctionParser.cxx b/main/connectivity/source/commontools/RowFunctionParser.cxx
index f5fb3fd0e3..204cac91b5 100644
--- a/main/connectivity/source/commontools/RowFunctionParser.cxx
+++ b/main/connectivity/source/commontools/RowFunctionParser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
// Makes parser a static resource,
// we're synchronized externally.
diff --git a/main/connectivity/source/commontools/TColumnsHelper.cxx b/main/connectivity/source/commontools/TColumnsHelper.cxx
index 3b0004a88a..e62c15c978 100644
--- a/main/connectivity/source/commontools/TColumnsHelper.cxx
+++ b/main/connectivity/source/commontools/TColumnsHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TColumnsHelper.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/commontools/TConnection.cxx b/main/connectivity/source/commontools/TConnection.cxx
index 5a81afb343..9fc1d76549 100644
--- a/main/connectivity/source/commontools/TConnection.cxx
+++ b/main/connectivity/source/commontools/TConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TConnection.hxx"
#include <cppuhelper/typeprovider.hxx>
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
index 1663d52155..3524439e8c 100644
--- a/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
+++ b/main/connectivity/source/commontools/TDatabaseMetaDataBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TDatabaseMetaDataBase.hxx"
#include "RowFunctionParser.hxx"
diff --git a/main/connectivity/source/commontools/TIndex.cxx b/main/connectivity/source/commontools/TIndex.cxx
index 36693ac68e..9df36bba62 100644
--- a/main/connectivity/source/commontools/TIndex.cxx
+++ b/main/connectivity/source/commontools/TIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndex.hxx"
#include "connectivity/TIndexColumns.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TIndexColumns.cxx b/main/connectivity/source/commontools/TIndexColumns.cxx
index 06da078d54..6f3dade5e6 100644
--- a/main/connectivity/source/commontools/TIndexColumns.cxx
+++ b/main/connectivity/source/commontools/TIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndexColumns.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TIndexes.cxx b/main/connectivity/source/commontools/TIndexes.cxx
index 3c61a42e12..7acd9ddaea 100644
--- a/main/connectivity/source/commontools/TIndexes.cxx
+++ b/main/connectivity/source/commontools/TIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TIndexes.hxx"
#include "connectivity/TIndex.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TKey.cxx b/main/connectivity/source/commontools/TKey.cxx
index 24597ce577..be69c01858 100644
--- a/main/connectivity/source/commontools/TKey.cxx
+++ b/main/connectivity/source/commontools/TKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKey.hxx"
diff --git a/main/connectivity/source/commontools/TKeyColumns.cxx b/main/connectivity/source/commontools/TKeyColumns.cxx
index f5628a45ca..718a05ed86 100644
--- a/main/connectivity/source/commontools/TKeyColumns.cxx
+++ b/main/connectivity/source/commontools/TKeyColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKeyColumns.hxx"
#include "connectivity/sdbcx/VKeyColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TKeys.cxx b/main/connectivity/source/commontools/TKeys.cxx
index 0ed088d2ec..bede0d87e8 100644
--- a/main/connectivity/source/commontools/TKeys.cxx
+++ b/main/connectivity/source/commontools/TKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TKeys.hxx"
#include "connectivity/TKey.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/commontools/TPrivilegesResultSet.cxx b/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
index 5a75946447..2673d29042 100644
--- a/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
+++ b/main/connectivity/source/commontools/TPrivilegesResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TPrivilegesResultSet.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/commontools/TSkipDeletedSet.cxx b/main/connectivity/source/commontools/TSkipDeletedSet.cxx
index 8504bc6ba6..2811691b35 100644
--- a/main/connectivity/source/commontools/TSkipDeletedSet.cxx
+++ b/main/connectivity/source/commontools/TSkipDeletedSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TSkipDeletedSet.hxx"
#include <osl/diagnose.h>
#include <rtl/logfile.hxx>
diff --git a/main/connectivity/source/commontools/TSortIndex.cxx b/main/connectivity/source/commontools/TSortIndex.cxx
index 667b66d70e..cae8fb0678 100644
--- a/main/connectivity/source/commontools/TSortIndex.cxx
+++ b/main/connectivity/source/commontools/TSortIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "TSortIndex.hxx"
#include <algorithm>
#include <functional>
diff --git a/main/connectivity/source/commontools/TTableHelper.cxx b/main/connectivity/source/commontools/TTableHelper.cxx
index e30a130650..74f34040ab 100644
--- a/main/connectivity/source/commontools/TTableHelper.cxx
+++ b/main/connectivity/source/commontools/TTableHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/TTableHelper.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/commontools/conncleanup.cxx b/main/connectivity/source/commontools/conncleanup.cxx
index 341ed81f46..90fd56aa69 100644
--- a/main/connectivity/source/commontools/conncleanup.cxx
+++ b/main/connectivity/source/commontools/conncleanup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/conncleanup.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/main/connectivity/source/commontools/dbcharset.cxx b/main/connectivity/source/commontools/dbcharset.cxx
index d7845e8c84..44bb2dc8bf 100644
--- a/main/connectivity/source/commontools/dbcharset.cxx
+++ b/main/connectivity/source/commontools/dbcharset.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbcharset.hxx>
#include "diagnose_ex.h"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/commontools/dbconversion.cxx b/main/connectivity/source/commontools/dbconversion.cxx
index f7a750607d..320da13bd5 100644
--- a/main/connectivity/source/commontools/dbconversion.cxx
+++ b/main/connectivity/source/commontools/dbconversion.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbconversion.hxx>
#include <connectivity/dbcharset.hxx>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/commontools/dbexception.cxx b/main/connectivity/source/commontools/dbexception.cxx
index a220f84621..6c9eba0961 100644
--- a/main/connectivity/source/commontools/dbexception.cxx
+++ b/main/connectivity/source/commontools/dbexception.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/dbexception.hxx>
#include <comphelper/types.hxx>
#include <cppuhelper/exc_hlp.hxx>
diff --git a/main/connectivity/source/commontools/dbmetadata.cxx b/main/connectivity/source/commontools/dbmetadata.cxx
index 225849d0b7..f2117324f2 100644
--- a/main/connectivity/source/commontools/dbmetadata.cxx
+++ b/main/connectivity/source/commontools/dbmetadata.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbmetadata.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/commontools/dbtools.cxx b/main/connectivity/source/commontools/dbtools.cxx
index b0eed578e3..c1ebac0a84 100644
--- a/main/connectivity/source/commontools/dbtools.cxx
+++ b/main/connectivity/source/commontools/dbtools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/CommonTools.hxx"
#include "diagnose_ex.h"
diff --git a/main/connectivity/source/commontools/dbtools2.cxx b/main/connectivity/source/commontools/dbtools2.cxx
index 10484fd9ef..58fc70e34d 100644
--- a/main/connectivity/source/commontools/dbtools2.cxx
+++ b/main/connectivity/source/commontools/dbtools2.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/dbtools.hxx"
#include "connectivity/dbconversion.hxx"
#include "connectivity/dbcharset.hxx"
diff --git a/main/connectivity/source/commontools/filtermanager.cxx b/main/connectivity/source/commontools/filtermanager.cxx
index 9ec2d2e532..4f2c0079d8 100644
--- a/main/connectivity/source/commontools/filtermanager.cxx
+++ b/main/connectivity/source/commontools/filtermanager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/filtermanager.hxx"
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/formattedcolumnvalue.cxx b/main/connectivity/source/commontools/formattedcolumnvalue.cxx
index e4e6fd9230..dd8fd9b6bb 100644
--- a/main/connectivity/source/commontools/formattedcolumnvalue.cxx
+++ b/main/connectivity/source/commontools/formattedcolumnvalue.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/formattedcolumnvalue.hxx"
#include "connectivity/dbtools.hxx"
diff --git a/main/connectivity/source/commontools/parameters.cxx b/main/connectivity/source/commontools/parameters.cxx
index 98992aa420..9f69d3b721 100644
--- a/main/connectivity/source/commontools/parameters.cxx
+++ b/main/connectivity/source/commontools/parameters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/parameters.hxx"
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/paramwrapper.cxx b/main/connectivity/source/commontools/paramwrapper.cxx
index b8b3b1c759..5a8cc372eb 100644
--- a/main/connectivity/source/commontools/paramwrapper.cxx
+++ b/main/connectivity/source/commontools/paramwrapper.cxx
@@ -21,7 +21,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/paramwrapper.hxx>
/** === begin UNO includes === **/
diff --git a/main/connectivity/source/commontools/predicateinput.cxx b/main/connectivity/source/commontools/predicateinput.cxx
index 8747527715..2719edbd31 100644
--- a/main/connectivity/source/commontools/predicateinput.cxx
+++ b/main/connectivity/source/commontools/predicateinput.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/predicateinput.hxx>
#include <comphelper/types.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/main/connectivity/source/commontools/propertyids.cxx b/main/connectivity/source/commontools/propertyids.cxx
index ae4768993e..8066eff204 100644
--- a/main/connectivity/source/commontools/propertyids.cxx
+++ b/main/connectivity/source/commontools/propertyids.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "propertyids.hxx"
diff --git a/main/connectivity/source/commontools/sqlerror.cxx b/main/connectivity/source/commontools/sqlerror.cxx
index 105c499736..b684d1a79b 100644
--- a/main/connectivity/source/commontools/sqlerror.cxx
+++ b/main/connectivity/source/commontools/sqlerror.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sqlerror.hxx"
diff --git a/main/connectivity/source/commontools/statementcomposer.cxx b/main/connectivity/source/commontools/statementcomposer.cxx
index 5e6985a930..250f457253 100644
--- a/main/connectivity/source/commontools/statementcomposer.cxx
+++ b/main/connectivity/source/commontools/statementcomposer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/statementcomposer.hxx>
#include <connectivity/dbtools.hxx>
diff --git a/main/connectivity/source/commontools/warningscontainer.cxx b/main/connectivity/source/commontools/warningscontainer.cxx
index 52365c1af4..94a9b9ea2e 100644
--- a/main/connectivity/source/commontools/warningscontainer.cxx
+++ b/main/connectivity/source/commontools/warningscontainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/warningscontainer.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/cpool/ZConnectionPool.cxx b/main/connectivity/source/cpool/ZConnectionPool.cxx
index 3ce8256694..017bb3de45 100644
--- a/main/connectivity/source/cpool/ZConnectionPool.cxx
+++ b/main/connectivity/source/cpool/ZConnectionPool.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include <stdio.h>
#include "ZConnectionPool.hxx"
diff --git a/main/connectivity/source/cpool/ZConnectionWrapper.cxx b/main/connectivity/source/cpool/ZConnectionWrapper.cxx
index ad23883e5c..bfb3f8cdcb 100644
--- a/main/connectivity/source/cpool/ZConnectionWrapper.cxx
+++ b/main/connectivity/source/cpool/ZConnectionWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZConnectionWrapper.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/cpool/ZDriverWrapper.cxx b/main/connectivity/source/cpool/ZDriverWrapper.cxx
index 5118925f09..bc4308617b 100644
--- a/main/connectivity/source/cpool/ZDriverWrapper.cxx
+++ b/main/connectivity/source/cpool/ZDriverWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZDriverWrapper.hxx"
#include "ZConnectionPool.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/cpool/ZPoolCollection.cxx b/main/connectivity/source/cpool/ZPoolCollection.cxx
index 9a1b8662c9..1a2c184c35 100644
--- a/main/connectivity/source/cpool/ZPoolCollection.cxx
+++ b/main/connectivity/source/cpool/ZPoolCollection.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZPoolCollection.hxx"
#include "ZDriverWrapper.hxx"
#include "ZConnectionPool.hxx"
diff --git a/main/connectivity/source/cpool/ZPooledConnection.cxx b/main/connectivity/source/cpool/ZPooledConnection.cxx
index d24048ab27..e944c5e396 100644
--- a/main/connectivity/source/cpool/ZPooledConnection.cxx
+++ b/main/connectivity/source/cpool/ZPooledConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include "ZPooledConnection.hxx"
#include "ZConnectionWrapper.hxx"
#ifndef _CONNECTIVITY_CONNECTIONWRAPPER_HXX_
diff --git a/main/connectivity/source/cpool/Zregistration.cxx b/main/connectivity/source/cpool/Zregistration.cxx
index bc1099f92d..00143054b4 100644
--- a/main/connectivity/source/cpool/Zregistration.cxx
+++ b/main/connectivity/source/cpool/Zregistration.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbpool2.hxx"
#include <stdio.h>
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/adabas/BCatalog.cxx b/main/connectivity/source/drivers/adabas/BCatalog.cxx
index 1ef5495bf3..1c437e2117 100644
--- a/main/connectivity/source/drivers/adabas/BCatalog.cxx
+++ b/main/connectivity/source/drivers/adabas/BCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BCatalog.hxx"
#include "adabas/BConnection.hxx"
#include "adabas/BGroups.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BColumns.cxx b/main/connectivity/source/drivers/adabas/BColumns.cxx
index d86bcae352..8e75ff2cc5 100644
--- a/main/connectivity/source/drivers/adabas/BColumns.cxx
+++ b/main/connectivity/source/drivers/adabas/BColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BConnection.cxx b/main/connectivity/source/drivers/adabas/BConnection.cxx
index 028512f3b6..d8b8c63ac6 100644
--- a/main/connectivity/source/drivers/adabas/BConnection.cxx
+++ b/main/connectivity/source/drivers/adabas/BConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include <cppuhelper/typeprovider.hxx>
#include "adabas/BConnection.hxx"
#include "adabas/BDriver.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx b/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
index d9cf7360c0..8bf9972e73 100644
--- a/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/adabas/BDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_BDATABASEMETADATA_HXX_
#include "adabas/BDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BDriver.cxx b/main/connectivity/source/drivers/adabas/BDriver.cxx
index b39ed1b922..5c05394c41 100644
--- a/main/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/main/connectivity/source/drivers/adabas/BDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include <unotools/tempfile.hxx>
#include "adabas/BDriver.hxx"
#include "adabas/BConnection.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BFunctions.cxx b/main/connectivity/source/drivers/adabas/BFunctions.cxx
index e0713b46be..c9d90b789c 100644
--- a/main/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/main/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
//--------------------------------------------------------------------------
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BGroup.cxx b/main/connectivity/source/drivers/adabas/BGroup.cxx
index 9e31cf77e4..9eee5f3baf 100644
--- a/main/connectivity/source/drivers/adabas/BGroup.cxx
+++ b/main/connectivity/source/drivers/adabas/BGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_GROUP_HXX_
#include "adabas/BGroup.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BGroups.cxx b/main/connectivity/source/drivers/adabas/BGroups.cxx
index 874311f723..60d3680630 100644
--- a/main/connectivity/source/drivers/adabas/BGroups.cxx
+++ b/main/connectivity/source/drivers/adabas/BGroups.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BGroups.hxx"
#include "adabas/BGroup.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndex.cxx b/main/connectivity/source/drivers/adabas/BIndex.cxx
index 76f71bd307..e981ab9a11 100644
--- a/main/connectivity/source/drivers/adabas/BIndex.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BIndex.hxx"
#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_
#include "adabas/BIndexColumns.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndexColumns.cxx b/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
index 3788dac997..92c7a29bb1 100644
--- a/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_INDEXCOLUMNS_HXX_
#include "adabas/BIndexColumns.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BIndexes.cxx b/main/connectivity/source/drivers/adabas/BIndexes.cxx
index e0b39cf885..d51c7f79d7 100644
--- a/main/connectivity/source/drivers/adabas/BIndexes.cxx
+++ b/main/connectivity/source/drivers/adabas/BIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BIndexes.hxx"
#include "adabas/BIndex.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BKeys.cxx b/main/connectivity/source/drivers/adabas/BKeys.cxx
index cb72607b00..9b95b00112 100644
--- a/main/connectivity/source/drivers/adabas/BKeys.cxx
+++ b/main/connectivity/source/drivers/adabas/BKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BKeys.hxx"
#include "adabas/BTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx b/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
index e94326a217..95ec6d6442 100644
--- a/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/adabas/BPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BPreparedStatement.hxx"
#include "adabas/BResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BResultSet.cxx b/main/connectivity/source/drivers/adabas/BResultSet.cxx
index 64ff7ab834..3d4c5c331f 100644
--- a/main/connectivity/source/drivers/adabas/BResultSet.cxx
+++ b/main/connectivity/source/drivers/adabas/BResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BResultSet.hxx"
#include "adabas/BResultSetMetaData.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx b/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
index 88f5544b81..e53cbba2d2 100644
--- a/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/adabas/BResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#ifndef _CONNECTIVITY_ADABAS_BRESULTSETMETADATA_HXX_
#include "adabas/BResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BStatement.cxx b/main/connectivity/source/drivers/adabas/BStatement.cxx
index ab2256fdad..058d8d7ec7 100644
--- a/main/connectivity/source/drivers/adabas/BStatement.cxx
+++ b/main/connectivity/source/drivers/adabas/BStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BStatement.hxx"
#include "adabas/BResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BTable.cxx b/main/connectivity/source/drivers/adabas/BTable.cxx
index 62826214c1..6fa0acf5aa 100644
--- a/main/connectivity/source/drivers/adabas/BTable.cxx
+++ b/main/connectivity/source/drivers/adabas/BTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BTable.hxx"
#include "adabas/BTables.hxx"
#include "adabas/BIndexes.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BTables.cxx b/main/connectivity/source/drivers/adabas/BTables.cxx
index 27e9c90215..3e0d307a38 100644
--- a/main/connectivity/source/drivers/adabas/BTables.cxx
+++ b/main/connectivity/source/drivers/adabas/BTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BTables.hxx"
#include "adabas/BViews.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BUser.cxx b/main/connectivity/source/drivers/adabas/BUser.cxx
index 1b8dc34765..cc3c8810c2 100644
--- a/main/connectivity/source/drivers/adabas/BUser.cxx
+++ b/main/connectivity/source/drivers/adabas/BUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BUser.hxx"
#include "adabas/BGroups.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/BUsers.cxx b/main/connectivity/source/drivers/adabas/BUsers.cxx
index 47843e2fea..e0fe96688d 100644
--- a/main/connectivity/source/drivers/adabas/BUsers.cxx
+++ b/main/connectivity/source/drivers/adabas/BUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BUsers.hxx"
#include "adabas/BUser.hxx"
#include "adabas/BTable.hxx"
diff --git a/main/connectivity/source/drivers/adabas/BViews.cxx b/main/connectivity/source/drivers/adabas/BViews.cxx
index 6f74a416f4..bde24abc22 100644
--- a/main/connectivity/source/drivers/adabas/BViews.cxx
+++ b/main/connectivity/source/drivers/adabas/BViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BViews.hxx"
#include "adabas/BTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/adabas/Bservices.cxx b/main/connectivity/source/drivers/adabas/Bservices.cxx
index 9f4c2a6900..a271c7032a 100644
--- a/main/connectivity/source/drivers/adabas/Bservices.cxx
+++ b/main/connectivity/source/drivers/adabas/Bservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_adabas.hxx"
#include "adabas/BDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/ado/ACallableStatement.cxx b/main/connectivity/source/drivers/ado/ACallableStatement.cxx
index 405d5f7d26..fce368658f 100644
--- a/main/connectivity/source/drivers/ado/ACallableStatement.cxx
+++ b/main/connectivity/source/drivers/ado/ACallableStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ACallableStatement.hxx"
#include <connectivity/dbexception.hxx>
diff --git a/main/connectivity/source/drivers/ado/ACatalog.cxx b/main/connectivity/source/drivers/ado/ACatalog.cxx
index 4ca8c3ca7c..4ce2b79a12 100644
--- a/main/connectivity/source/drivers/ado/ACatalog.cxx
+++ b/main/connectivity/source/drivers/ado/ACatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ACatalog.hxx"
#ifndef _CONNECTIVITY_ADO_BCONNECTION_HXX_
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AColumn.cxx b/main/connectivity/source/drivers/ado/AColumn.cxx
index 7a791f35c0..ee61fb26da 100644
--- a/main/connectivity/source/drivers/ado/AColumn.cxx
+++ b/main/connectivity/source/drivers/ado/AColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AColumn.hxx"
#include "ado/AConnection.hxx"
#include "ado/Awrapado.hxx"
diff --git a/main/connectivity/source/drivers/ado/AColumns.cxx b/main/connectivity/source/drivers/ado/AColumns.cxx
index 278b0850f0..6d9393cc54 100644
--- a/main/connectivity/source/drivers/ado/AColumns.cxx
+++ b/main/connectivity/source/drivers/ado/AColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AColumns.hxx"
#include "ado/AColumn.hxx"
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AConnection.cxx b/main/connectivity/source/drivers/ado/AConnection.cxx
index 34c755d4af..8eef123e1a 100644
--- a/main/connectivity/source/drivers/ado/AConnection.cxx
+++ b/main/connectivity/source/drivers/ado/AConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AConnection.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADriver.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
index d4196f5259..73ce18b746 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADatabaseMetaDataResultSet.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
index fa656903a7..91e2abc9eb 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaData.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
#include "ado/Awrapado.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
index fd67921ce5..089fcefe29 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include <comphelper/sequence.hxx>
#include "ado/ADatabaseMetaDataResultSet.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
index 2e15598581..676c0161f9 100644
--- a/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADatabaseMetaDataResultSetMetaData.hxx"
#include "ado/Awrapado.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/ado/ADriver.cxx b/main/connectivity/source/drivers/ado/ADriver.cxx
index a31735a6a4..17d2bf6918 100644
--- a/main/connectivity/source/drivers/ado/ADriver.cxx
+++ b/main/connectivity/source/drivers/ado/ADriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADriver.hxx"
#include "ado/AConnection.hxx"
#include "ado/Awrapadox.hxx"
diff --git a/main/connectivity/source/drivers/ado/AGroup.cxx b/main/connectivity/source/drivers/ado/AGroup.cxx
index 79ccac7a14..9591643b67 100644
--- a/main/connectivity/source/drivers/ado/AGroup.cxx
+++ b/main/connectivity/source/drivers/ado/AGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#ifndef _CONNECTIVITY_ADO_GROUP_HXX_
#include "ado/AGroup.hxx"
diff --git a/main/connectivity/source/drivers/ado/AGroups.cxx b/main/connectivity/source/drivers/ado/AGroups.cxx
index 45b6f7f895..0367247c55 100644
--- a/main/connectivity/source/drivers/ado/AGroups.cxx
+++ b/main/connectivity/source/drivers/ado/AGroups.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AGroups.hxx"
#include "ado/AGroup.hxx"
#include "ado/ATable.hxx"
diff --git a/main/connectivity/source/drivers/ado/AIndex.cxx b/main/connectivity/source/drivers/ado/AIndex.cxx
index 7d49c685a4..fc92cd34b5 100644
--- a/main/connectivity/source/drivers/ado/AIndex.cxx
+++ b/main/connectivity/source/drivers/ado/AIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AIndex.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/ado/AIndexes.cxx b/main/connectivity/source/drivers/ado/AIndexes.cxx
index 33885cbccf..ce01231803 100644
--- a/main/connectivity/source/drivers/ado/AIndexes.cxx
+++ b/main/connectivity/source/drivers/ado/AIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AIndexes.hxx"
#include "ado/AIndex.hxx"
#include "ado/AConnection.hxx"
diff --git a/main/connectivity/source/drivers/ado/AKey.cxx b/main/connectivity/source/drivers/ado/AKey.cxx
index 79af8e4a9c..758d16b3ed 100644
--- a/main/connectivity/source/drivers/ado/AKey.cxx
+++ b/main/connectivity/source/drivers/ado/AKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AKey.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/ado/AKeys.cxx b/main/connectivity/source/drivers/ado/AKeys.cxx
index fcefee857c..57847b55fc 100644
--- a/main/connectivity/source/drivers/ado/AKeys.cxx
+++ b/main/connectivity/source/drivers/ado/AKeys.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AKeys.hxx"
#ifndef _CONNECTIVITY_ADO_INDEX_HXX_
#include "ado/AKey.hxx"
diff --git a/main/connectivity/source/drivers/ado/APreparedStatement.cxx b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
index 9dba43356a..0e4373376d 100644
--- a/main/connectivity/source/drivers/ado/APreparedStatement.cxx
+++ b/main/connectivity/source/drivers/ado/APreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "connectivity/sqlparse.hxx"
#include "ado/APreparedStatement.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/AResultSet.cxx b/main/connectivity/source/drivers/ado/AResultSet.cxx
index dc16d4e9ed..a3e986b5a9 100644
--- a/main/connectivity/source/drivers/ado/AResultSet.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AResultSet.hxx"
#include "ado/AResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
index 020951ca2f..14fce47d46 100644
--- a/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/ado/AResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AResultSetMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ColumnValue.hpp>
diff --git a/main/connectivity/source/drivers/ado/AStatement.cxx b/main/connectivity/source/drivers/ado/AStatement.cxx
index 57526fc78b..41b3a568c3 100644
--- a/main/connectivity/source/drivers/ado/AStatement.cxx
+++ b/main/connectivity/source/drivers/ado/AStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AStatement.hxx"
#include "ado/AConnection.hxx"
#include "ado/AResultSet.hxx"
diff --git a/main/connectivity/source/drivers/ado/ATable.cxx b/main/connectivity/source/drivers/ado/ATable.cxx
index b5f9fbd3b4..2badedff23 100644
--- a/main/connectivity/source/drivers/ado/ATable.cxx
+++ b/main/connectivity/source/drivers/ado/ATable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ATable.hxx"
#include "ado/AIndexes.hxx"
#include "ado/AColumns.hxx"
diff --git a/main/connectivity/source/drivers/ado/ATables.cxx b/main/connectivity/source/drivers/ado/ATables.cxx
index 893cda4693..2b82e4bcf5 100644
--- a/main/connectivity/source/drivers/ado/ATables.cxx
+++ b/main/connectivity/source/drivers/ado/ATables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ATables.hxx"
#include "ado/ATable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/ado/AUser.cxx b/main/connectivity/source/drivers/ado/AUser.cxx
index c4dff5ac24..ee8dd0bfa5 100644
--- a/main/connectivity/source/drivers/ado/AUser.cxx
+++ b/main/connectivity/source/drivers/ado/AUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AUser.hxx"
#include "ado/ACatalog.hxx"
#include "ado/AGroups.hxx"
diff --git a/main/connectivity/source/drivers/ado/AUsers.cxx b/main/connectivity/source/drivers/ado/AUsers.cxx
index 86a943b7ad..efdfcd071a 100644
--- a/main/connectivity/source/drivers/ado/AUsers.cxx
+++ b/main/connectivity/source/drivers/ado/AUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AUsers.hxx"
#include "ado/AUser.hxx"
#include "ado/ATable.hxx"
diff --git a/main/connectivity/source/drivers/ado/AView.cxx b/main/connectivity/source/drivers/ado/AView.cxx
index b4bb06ffa3..407070b9c1 100644
--- a/main/connectivity/source/drivers/ado/AView.cxx
+++ b/main/connectivity/source/drivers/ado/AView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AView.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "ado/adoimp.hxx"
diff --git a/main/connectivity/source/drivers/ado/AViews.cxx b/main/connectivity/source/drivers/ado/AViews.cxx
index faf88c95cc..25d77c0f9c 100644
--- a/main/connectivity/source/drivers/ado/AViews.cxx
+++ b/main/connectivity/source/drivers/ado/AViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/AViews.hxx"
#include "ado/AView.hxx"
#include "ado/ATables.hxx"
diff --git a/main/connectivity/source/drivers/ado/Aolevariant.cxx b/main/connectivity/source/drivers/ado/Aolevariant.cxx
index f4d791aee0..725ca1fd2b 100644
--- a/main/connectivity/source/drivers/ado/Aolevariant.cxx
+++ b/main/connectivity/source/drivers/ado/Aolevariant.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/Aolevariant.hxx"
#include "connectivity/dbconversion.hxx"
#include <com/sun/star/sdbc/SQLException.hpp>
diff --git a/main/connectivity/source/drivers/ado/Aservices.cxx b/main/connectivity/source/drivers/ado/Aservices.cxx
index ebd5c51a17..38df7499e9 100644
--- a/main/connectivity/source/drivers/ado/Aservices.cxx
+++ b/main/connectivity/source/drivers/ado/Aservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/ADriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/ado/Awrapado.cxx b/main/connectivity/source/drivers/ado/Awrapado.cxx
index 013168ccbe..e409689a41 100644
--- a/main/connectivity/source/drivers/ado/Awrapado.cxx
+++ b/main/connectivity/source/drivers/ado/Awrapado.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include "ado/Awrapado.hxx"
#include "ado/Awrapadox.hxx"
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/drivers/ado/adoimp.cxx b/main/connectivity/source/drivers/ado/adoimp.cxx
index f1730dce89..abd2c5cf72 100644
--- a/main/connectivity/source/drivers/ado/adoimp.cxx
+++ b/main/connectivity/source/drivers/ado/adoimp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_ado.hxx"
#include <com/sun/star/sdbcx/Privilege.hpp>
#include <com/sun/star/sdbcx/PrivilegeObject.hpp>
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/calc/CCatalog.cxx b/main/connectivity/source/drivers/calc/CCatalog.cxx
index 878c0490a0..f2b13e1c2c 100644
--- a/main/connectivity/source/drivers/calc/CCatalog.cxx
+++ b/main/connectivity/source/drivers/calc/CCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/CColumns.cxx b/main/connectivity/source/drivers/calc/CColumns.cxx
index 7e2163087e..b5344b7b38 100644
--- a/main/connectivity/source/drivers/calc/CColumns.cxx
+++ b/main/connectivity/source/drivers/calc/CColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CColumns.hxx"
#include "calc/CTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/calc/CConnection.cxx b/main/connectivity/source/drivers/calc/CConnection.cxx
index d01cb164ff..6058ff53b5 100644
--- a/main/connectivity/source/drivers/calc/CConnection.cxx
+++ b/main/connectivity/source/drivers/calc/CConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CConnection.hxx"
#include "calc/CDatabaseMetaData.hxx"
#include "calc/CCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
index b22bcb71de..9ae9f15f26 100644
--- a/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/calc/CDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/calc/CDriver.cxx b/main/connectivity/source/drivers/calc/CDriver.cxx
index da3cbecdfd..32b1d1c981 100644
--- a/main/connectivity/source/drivers/calc/CDriver.cxx
+++ b/main/connectivity/source/drivers/calc/CDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDriver.hxx"
#include "calc/CConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/calc/CPreparedStatement.cxx b/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
index e3b57fdffc..42f596e8f5 100644
--- a/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/calc/CPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CPreparedStatement.hxx"
#include "calc/CResultSet.hxx"
diff --git a/main/connectivity/source/drivers/calc/CResultSet.cxx b/main/connectivity/source/drivers/calc/CResultSet.cxx
index 3f81544cfc..0079619607 100644
--- a/main/connectivity/source/drivers/calc/CResultSet.cxx
+++ b/main/connectivity/source/drivers/calc/CResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include "calc/CResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/calc/CStatement.cxx b/main/connectivity/source/drivers/calc/CStatement.cxx
index 96947ed9cc..902a8bb272 100644
--- a/main/connectivity/source/drivers/calc/CStatement.cxx
+++ b/main/connectivity/source/drivers/calc/CStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CStatement.hxx"
#include "calc/CResultSet.hxx"
diff --git a/main/connectivity/source/drivers/calc/CTable.cxx b/main/connectivity/source/drivers/calc/CTable.cxx
index e2a81cf759..0cd50fe5b3 100644
--- a/main/connectivity/source/drivers/calc/CTable.cxx
+++ b/main/connectivity/source/drivers/calc/CTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/calc/CTables.cxx b/main/connectivity/source/drivers/calc/CTables.cxx
index 801cb7e691..7df7071583 100644
--- a/main/connectivity/source/drivers/calc/CTables.cxx
+++ b/main/connectivity/source/drivers/calc/CTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CTables.hxx"
#include "calc/CTable.hxx"
#include "file/FCatalog.hxx"
diff --git a/main/connectivity/source/drivers/calc/Cservices.cxx b/main/connectivity/source/drivers/calc/Cservices.cxx
index 0539faefa9..b7141144eb 100644
--- a/main/connectivity/source/drivers/calc/Cservices.cxx
+++ b/main/connectivity/source/drivers/calc/Cservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_calc.hxx"
#include "calc/CDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/dbase/DCatalog.cxx b/main/connectivity/source/drivers/dbase/DCatalog.cxx
index 04ce19c13c..d1426f063a 100644
--- a/main/connectivity/source/drivers/dbase/DCatalog.cxx
+++ b/main/connectivity/source/drivers/dbase/DCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DCatalog.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DCode.cxx b/main/connectivity/source/drivers/dbase/DCode.cxx
index 40f8816b28..9eae8b594b 100644
--- a/main/connectivity/source/drivers/dbase/DCode.cxx
+++ b/main/connectivity/source/drivers/dbase/DCode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DCode.hxx"
#include <com/sun/star/sdbcx/XColumnsSupplier.hpp>
#include "dbase/DIndex.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DColumns.cxx b/main/connectivity/source/drivers/dbase/DColumns.cxx
index eb873268a5..35531b81e1 100644
--- a/main/connectivity/source/drivers/dbase/DColumns.cxx
+++ b/main/connectivity/source/drivers/dbase/DColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DColumns.hxx"
#include "dbase/DTable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DConnection.cxx b/main/connectivity/source/drivers/dbase/DConnection.cxx
index 7702569821..1d75baff5c 100644
--- a/main/connectivity/source/drivers/dbase/DConnection.cxx
+++ b/main/connectivity/source/drivers/dbase/DConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#ifndef _CONNECTIVITY_DBASE_OCONNECTION_HXX_
#include "dbase/DConnection.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
index b5dad674c8..dfb2a0bee5 100644
--- a/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#ifndef _CONNECTIVITY_DBASE_ODbaseDatabaseMetaData_HXX_
diff --git a/main/connectivity/source/drivers/dbase/DDriver.cxx b/main/connectivity/source/drivers/dbase/DDriver.cxx
index 1a23e39bbc..6725ff4646 100644
--- a/main/connectivity/source/drivers/dbase/DDriver.cxx
+++ b/main/connectivity/source/drivers/dbase/DDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DDriver.hxx"
#include "dbase/DConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndex.cxx b/main/connectivity/source/drivers/dbase/DIndex.cxx
index 24c2773d52..5ce97d7e51 100644
--- a/main/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndex.hxx"
#include "dbase/DIndexColumns.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndexColumns.cxx b/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
index 2576748485..2615830428 100644
--- a/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexColumns.hxx"
#include "dbase/DTable.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DIndexIter.cxx b/main/connectivity/source/drivers/dbase/DIndexIter.cxx
index 78572a7024..559906078a 100644
--- a/main/connectivity/source/drivers/dbase/DIndexIter.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexIter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexIter.hxx"
#include <com/sun/star/sdb/SQLFilterOperator.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DIndexes.cxx b/main/connectivity/source/drivers/dbase/DIndexes.cxx
index 1d367c8482..f98726c628 100644
--- a/main/connectivity/source/drivers/dbase/DIndexes.cxx
+++ b/main/connectivity/source/drivers/dbase/DIndexes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DIndexes.hxx"
#include "dbase/DIndex.hxx"
#include <connectivity/dbexception.hxx>
diff --git a/main/connectivity/source/drivers/dbase/DNoException.cxx b/main/connectivity/source/drivers/dbase/DNoException.cxx
index ee8c3db6b1..a2632a0a36 100644
--- a/main/connectivity/source/drivers/dbase/DNoException.cxx
+++ b/main/connectivity/source/drivers/dbase/DNoException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTable.hxx"
#include "dbase/DIndex.hxx"
#include "dbase/dindexnode.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx b/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
index 7562113a5b..77a2eb100b 100644
--- a/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/dbase/DPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DPreparedStatement.hxx"
#include "dbase/DResultSet.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DResultSet.cxx b/main/connectivity/source/drivers/dbase/DResultSet.cxx
index d6fb082a69..d65c85870d 100644
--- a/main/connectivity/source/drivers/dbase/DResultSet.cxx
+++ b/main/connectivity/source/drivers/dbase/DResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include "dbase/DResultSet.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DStatement.cxx b/main/connectivity/source/drivers/dbase/DStatement.cxx
index 834ff82500..9a55411e09 100644
--- a/main/connectivity/source/drivers/dbase/DStatement.cxx
+++ b/main/connectivity/source/drivers/dbase/DStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DStatement.hxx"
#include "dbase/DResultSet.hxx"
diff --git a/main/connectivity/source/drivers/dbase/DTable.cxx b/main/connectivity/source/drivers/dbase/DTable.cxx
index acefc7d610..fbf907e49d 100644
--- a/main/connectivity/source/drivers/dbase/DTable.cxx
+++ b/main/connectivity/source/drivers/dbase/DTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTable.hxx"
#include <com/sun/star/sdbc/ColumnValue.hpp>
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/dbase/DTables.cxx b/main/connectivity/source/drivers/dbase/DTables.cxx
index 9b2d2a037d..81fb71bbc2 100644
--- a/main/connectivity/source/drivers/dbase/DTables.cxx
+++ b/main/connectivity/source/drivers/dbase/DTables.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DTables.hxx"
#include "dbase/DTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/dbase/Dservices.cxx b/main/connectivity/source/drivers/dbase/Dservices.cxx
index 35f15ad09c..ca8a7a550a 100644
--- a/main/connectivity/source/drivers/dbase/Dservices.cxx
+++ b/main/connectivity/source/drivers/dbase/Dservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/DDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/dbase/dindexnode.cxx b/main/connectivity/source/drivers/dbase/dindexnode.cxx
index f455bf6cf4..f18d5f438c 100644
--- a/main/connectivity/source/drivers/dbase/dindexnode.cxx
+++ b/main/connectivity/source/drivers/dbase/dindexnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbase.hxx"
#include "dbase/dindexnode.hxx"
#include "connectivity/CommonTools.hxx"
#include <osl/thread.h>
diff --git a/main/connectivity/source/drivers/evoab2/EApi.cxx b/main/connectivity/source/drivers/evoab2/EApi.cxx
index c34daacbc6..c08f1a67b5 100644
--- a/main/connectivity/source/drivers/evoab2/EApi.cxx
+++ b/main/connectivity/source/drivers/evoab2/EApi.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <rtl/ustring.hxx>
#include <osl/module.h>
diff --git a/main/connectivity/source/drivers/evoab2/NCatalog.cxx b/main/connectivity/source/drivers/evoab2/NCatalog.cxx
index 3c1eec2ef3..af761eeaac 100644
--- a/main/connectivity/source/drivers/evoab2/NCatalog.cxx
+++ b/main/connectivity/source/drivers/evoab2/NCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NCatalog.hxx"
#include "NConnection.hxx"
#include "NTables.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NColumns.cxx b/main/connectivity/source/drivers/evoab2/NColumns.cxx
index efd210cdd5..2b02f81f80 100644
--- a/main/connectivity/source/drivers/evoab2/NColumns.cxx
+++ b/main/connectivity/source/drivers/evoab2/NColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NColumns.hxx"
#include "NTable.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NConnection.cxx b/main/connectivity/source/drivers/evoab2/NConnection.cxx
index 5c7a195449..f259f3e9ce 100644
--- a/main/connectivity/source/drivers/evoab2/NConnection.cxx
+++ b/main/connectivity/source/drivers/evoab2/NConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NConnection.hxx"
#include "NDatabaseMetaData.hxx"
#include "NCatalog.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
index 371dc6875c..045acecfcd 100644
--- a/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDatabaseMetaData.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
#include <com/sun/star/sdbc/ResultSetType.hpp>
diff --git a/main/connectivity/source/drivers/evoab2/NDebug.cxx b/main/connectivity/source/drivers/evoab2/NDebug.cxx
index 605f7e53a9..aca20d0704 100644
--- a/main/connectivity/source/drivers/evoab2/NDebug.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDebug.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDebug.hxx"
#include <osl/diagnose.h>
#ifdef DEBUG
diff --git a/main/connectivity/source/drivers/evoab2/NDriver.cxx b/main/connectivity/source/drivers/evoab2/NDriver.cxx
index 98134c297f..41484569dc 100644
--- a/main/connectivity/source/drivers/evoab2/NDriver.cxx
+++ b/main/connectivity/source/drivers/evoab2/NDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDriver.hxx"
#include "NConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
index 61a4bbc216..02e8142d8a 100644
--- a/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/evoab2/NPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NResultSet.cxx b/main/connectivity/source/drivers/evoab2/NResultSet.cxx
index ccb951bfeb..47a897cf2d 100644
--- a/main/connectivity/source/drivers/evoab2/NResultSet.cxx
+++ b/main/connectivity/source/drivers/evoab2/NResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDatabaseMetaData.hxx"
#include "NConnection.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
index b78e36e0c3..8c133487e3 100644
--- a/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NResultSetMetaData.hxx"
#include "NDatabaseMetaData.hxx"
#include "connectivity/dbexception.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NServices.cxx b/main/connectivity/source/drivers/evoab2/NServices.cxx
index 108b30c8d7..610828bff2 100644
--- a/main/connectivity/source/drivers/evoab2/NServices.cxx
+++ b/main/connectivity/source/drivers/evoab2/NServices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NDriver.hxx"
#include <cppuhelper/factory.hxx>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NStatement.cxx b/main/connectivity/source/drivers/evoab2/NStatement.cxx
index 5099f6b468..a4474dd8f3 100644
--- a/main/connectivity/source/drivers/evoab2/NStatement.cxx
+++ b/main/connectivity/source/drivers/evoab2/NStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/evoab2/NTable.cxx b/main/connectivity/source/drivers/evoab2/NTable.cxx
index b1be4f87ed..2fa502c53b 100644
--- a/main/connectivity/source/drivers/evoab2/NTable.cxx
+++ b/main/connectivity/source/drivers/evoab2/NTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NTable.hxx"
#include "NTables.hxx"
diff --git a/main/connectivity/source/drivers/evoab2/NTables.cxx b/main/connectivity/source/drivers/evoab2/NTables.cxx
index 7c6019dd61..a7f89cc121 100644
--- a/main/connectivity/source/drivers/evoab2/NTables.cxx
+++ b/main/connectivity/source/drivers/evoab2/NTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_evoab2.hxx"
#include "NTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/file/FCatalog.cxx b/main/connectivity/source/drivers/file/FCatalog.cxx
index cc8f38f39e..7793da0b58 100644
--- a/main/connectivity/source/drivers/file/FCatalog.cxx
+++ b/main/connectivity/source/drivers/file/FCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FCatalog.hxx"
#include "file/FConnection.hxx"
#include "file/FTables.hxx"
diff --git a/main/connectivity/source/drivers/file/FColumns.cxx b/main/connectivity/source/drivers/file/FColumns.cxx
index d79fbeb620..4c4b1d625c 100644
--- a/main/connectivity/source/drivers/file/FColumns.cxx
+++ b/main/connectivity/source/drivers/file/FColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FColumns.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/file/FConnection.cxx b/main/connectivity/source/drivers/file/FConnection.cxx
index cb193bdab7..6372aa8b88 100644
--- a/main/connectivity/source/drivers/file/FConnection.cxx
+++ b/main/connectivity/source/drivers/file/FConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <cppuhelper/typeprovider.hxx>
#include "file/FConnection.hxx"
#include "file/FDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
index d76a130815..1c70cf17fd 100644
--- a/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/file/FDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDatabaseMetaData.hxx"
#include "FDatabaseMetaDataResultSet.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/drivers/file/FDateFunctions.cxx b/main/connectivity/source/drivers/file/FDateFunctions.cxx
index 5d8d13fa7e..8d57ca9d2c 100644
--- a/main/connectivity/source/drivers/file/FDateFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FDateFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDateFunctions.hxx"
#include <tools/date.hxx>
diff --git a/main/connectivity/source/drivers/file/FDriver.cxx b/main/connectivity/source/drivers/file/FDriver.cxx
index 7c46acf109..89c8262ebc 100644
--- a/main/connectivity/source/drivers/file/FDriver.cxx
+++ b/main/connectivity/source/drivers/file/FDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FDriver.hxx"
#include "file/FConnection.hxx"
#include "file/fcode.hxx"
diff --git a/main/connectivity/source/drivers/file/FNoException.cxx b/main/connectivity/source/drivers/file/FNoException.cxx
index c7266383c1..acd7846bce 100644
--- a/main/connectivity/source/drivers/file/FNoException.cxx
+++ b/main/connectivity/source/drivers/file/FNoException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FCatalog.hxx"
#include "file/fcomp.hxx"
#include "file/fanalyzer.hxx"
diff --git a/main/connectivity/source/drivers/file/FNumericFunctions.cxx b/main/connectivity/source/drivers/file/FNumericFunctions.cxx
index 43707ff6e1..8237fcb0f5 100644
--- a/main/connectivity/source/drivers/file/FNumericFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FNumericFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <cmath>
#include "file/FNumericFunctions.hxx"
diff --git a/main/connectivity/source/drivers/file/FPreparedStatement.cxx b/main/connectivity/source/drivers/file/FPreparedStatement.cxx
index 41685bfd3b..6fc2bd172c 100644
--- a/main/connectivity/source/drivers/file/FPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/file/FPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/file/FResultSet.cxx b/main/connectivity/source/drivers/file/FResultSet.cxx
index 6fa2c77839..8c27e1a623 100644
--- a/main/connectivity/source/drivers/file/FResultSet.cxx
+++ b/main/connectivity/source/drivers/file/FResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <limits> // included here to prevent problems if compiling with C52
#ifdef GCC
diff --git a/main/connectivity/source/drivers/file/FResultSetMetaData.cxx b/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
index df38d0c944..82b7ce3405 100644
--- a/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/file/FResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FResultSetMetaData.hxx"
#include "file/FTable.hxx"
#include <comphelper/extract.hxx>
diff --git a/main/connectivity/source/drivers/file/FStatement.cxx b/main/connectivity/source/drivers/file/FStatement.cxx
index 893a834ed8..7215a648c3 100644
--- a/main/connectivity/source/drivers/file/FStatement.cxx
+++ b/main/connectivity/source/drivers/file/FStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <osl/diagnose.h>
#include "file/FStatement.hxx"
#include "file/FConnection.hxx"
diff --git a/main/connectivity/source/drivers/file/FStringFunctions.cxx b/main/connectivity/source/drivers/file/FStringFunctions.cxx
index 8fec294eb0..4cda801600 100644
--- a/main/connectivity/source/drivers/file/FStringFunctions.cxx
+++ b/main/connectivity/source/drivers/file/FStringFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FStringFunctions.hxx"
#include <rtl/ustrbuf.hxx>
diff --git a/main/connectivity/source/drivers/file/FTable.cxx b/main/connectivity/source/drivers/file/FTable.cxx
index 2cc5f03de1..2e823e5977 100644
--- a/main/connectivity/source/drivers/file/FTable.cxx
+++ b/main/connectivity/source/drivers/file/FTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include <stdio.h>
#include "file/FTable.hxx"
diff --git a/main/connectivity/source/drivers/file/FTables.cxx b/main/connectivity/source/drivers/file/FTables.cxx
index 5e9a265b61..2798d82b67 100644
--- a/main/connectivity/source/drivers/file/FTables.cxx
+++ b/main/connectivity/source/drivers/file/FTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/FTables.hxx"
#include "file/FTable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/file/fanalyzer.cxx b/main/connectivity/source/drivers/file/fanalyzer.cxx
index 82972837f9..f3161ec805 100644
--- a/main/connectivity/source/drivers/file/fanalyzer.cxx
+++ b/main/connectivity/source/drivers/file/fanalyzer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fanalyzer.hxx"
#include "connectivity/sqlparse.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/file/fcode.cxx b/main/connectivity/source/drivers/file/fcode.cxx
index b8f5cd43c9..cb67267e11 100644
--- a/main/connectivity/source/drivers/file/fcode.cxx
+++ b/main/connectivity/source/drivers/file/fcode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fcode.hxx"
#include <osl/diagnose.h>
#include "connectivity/sqlparse.hxx"
diff --git a/main/connectivity/source/drivers/file/fcomp.cxx b/main/connectivity/source/drivers/file/fcomp.cxx
index 66225021cc..46d8264f11 100644
--- a/main/connectivity/source/drivers/file/fcomp.cxx
+++ b/main/connectivity/source/drivers/file/fcomp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/fcomp.hxx"
#include <tools/debug.hxx>
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/file/quotedstring.cxx b/main/connectivity/source/drivers/file/quotedstring.cxx
index bb35dda159..5706c5c9ee 100644
--- a/main/connectivity/source/drivers/file/quotedstring.cxx
+++ b/main/connectivity/source/drivers/file/quotedstring.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_file.hxx"
#include "file/quotedstring.hxx"
#include <rtl/logfile.hxx>
#include <rtl/ustrbuf.hxx>
diff --git a/main/connectivity/source/drivers/flat/ECatalog.cxx b/main/connectivity/source/drivers/flat/ECatalog.cxx
index cdfd5f27b2..5f251e7492 100644
--- a/main/connectivity/source/drivers/flat/ECatalog.cxx
+++ b/main/connectivity/source/drivers/flat/ECatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/ECatalog.hxx"
diff --git a/main/connectivity/source/drivers/flat/EColumns.cxx b/main/connectivity/source/drivers/flat/EColumns.cxx
index bb35f08d25..ee18ef52bd 100644
--- a/main/connectivity/source/drivers/flat/EColumns.cxx
+++ b/main/connectivity/source/drivers/flat/EColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EColumns.hxx"
#include "flat/ETable.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/drivers/flat/EConnection.cxx b/main/connectivity/source/drivers/flat/EConnection.cxx
index 6c89588280..7af8bae53b 100644
--- a/main/connectivity/source/drivers/flat/EConnection.cxx
+++ b/main/connectivity/source/drivers/flat/EConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EConnection.hxx"
#include "flat/EDatabaseMetaData.hxx"
#include "flat/ECatalog.hxx"
diff --git a/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
index 1fa7a8953d..affc971668 100644
--- a/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/flat/EDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/flat/EDriver.cxx b/main/connectivity/source/drivers/flat/EDriver.cxx
index e54ec00c28..61829a3715 100644
--- a/main/connectivity/source/drivers/flat/EDriver.cxx
+++ b/main/connectivity/source/drivers/flat/EDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDriver.hxx"
#include "flat/EConnection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/drivers/flat/EPreparedStatement.cxx b/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
index 6a53139c08..2f0ae4fe91 100644
--- a/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/flat/EPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#ifndef _CONNECTIVITY_FLAT_EPREPAREDSTATEMENT_HXX_
#include "flat/EPreparedStatement.hxx"
diff --git a/main/connectivity/source/drivers/flat/EResultSet.cxx b/main/connectivity/source/drivers/flat/EResultSet.cxx
index 7ec38044e9..f9b0729022 100644
--- a/main/connectivity/source/drivers/flat/EResultSet.cxx
+++ b/main/connectivity/source/drivers/flat/EResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include <com/sun/star/sdbcx/CompareBookmark.hpp>
#include <com/sun/star/sdbcx/XDeleteRows.hpp>
#include "flat/EResultSet.hxx"
diff --git a/main/connectivity/source/drivers/flat/EStatement.cxx b/main/connectivity/source/drivers/flat/EStatement.cxx
index ba8e70fcb0..ff4dacdbdf 100644
--- a/main/connectivity/source/drivers/flat/EStatement.cxx
+++ b/main/connectivity/source/drivers/flat/EStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EStatement.hxx"
#include "flat/EResultSet.hxx"
diff --git a/main/connectivity/source/drivers/flat/ETable.cxx b/main/connectivity/source/drivers/flat/ETable.cxx
index 5e7bd4cb86..0b8a65950b 100644
--- a/main/connectivity/source/drivers/flat/ETable.cxx
+++ b/main/connectivity/source/drivers/flat/ETable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include <ctype.h>
#include "flat/ETable.hxx"
diff --git a/main/connectivity/source/drivers/flat/ETables.cxx b/main/connectivity/source/drivers/flat/ETables.cxx
index a6d440b124..4f0807811c 100644
--- a/main/connectivity/source/drivers/flat/ETables.cxx
+++ b/main/connectivity/source/drivers/flat/ETables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/ETables.hxx"
#include "flat/ETable.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/flat/Eservices.cxx b/main/connectivity/source/drivers/flat/Eservices.cxx
index 73a279f9b7..0b5ae901d9 100644
--- a/main/connectivity/source/drivers/flat/Eservices.cxx
+++ b/main/connectivity/source/drivers/flat/Eservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_flat.hxx"
#include "flat/EDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/hsqldb/HCatalog.cxx b/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
index 6ff2f49245..b76f3322d5 100644
--- a/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HCatalog.hxx"
#include "hsqldb/HUsers.hxx"
#include "hsqldb/HTables.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HColumns.cxx b/main/connectivity/source/drivers/hsqldb/HColumns.cxx
index 780285091f..df835b0515 100644
--- a/main/connectivity/source/drivers/hsqldb/HColumns.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HColumns.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HConnection.cxx b/main/connectivity/source/drivers/hsqldb/HConnection.cxx
index d716608a60..3faf496bb0 100644
--- a/main/connectivity/source/drivers/hsqldb/HConnection.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HConnection.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HDriver.cxx b/main/connectivity/source/drivers/hsqldb/HDriver.cxx
index 2d5537c249..2163934536 100644
--- a/main/connectivity/source/drivers/hsqldb/HDriver.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HDriver.hxx"
#include "hsqldb/HConnection.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
index fb4f3667e2..91da80c0b6 100644
--- a/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HStorageAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HStorageAccess.hxx"
#include <comphelper/processfactory.hxx>
#include <com/sun/star/embed/XStorage.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
index 60f6550e8e..5ba95f78b7 100644
--- a/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HStorageMap.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HStorageMap.hxx"
#include <comphelper/types.hxx>
#include <com/sun/star/embed/XTransactionBroadcaster.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HTable.cxx b/main/connectivity/source/drivers/hsqldb/HTable.cxx
index e2d81aed91..528d2c4394 100644
--- a/main/connectivity/source/drivers/hsqldb/HTable.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTable.hxx"
#include "hsqldb/HTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HTables.cxx b/main/connectivity/source/drivers/hsqldb/HTables.cxx
index 0aa0ef0be5..2a52459bb4 100644
--- a/main/connectivity/source/drivers/hsqldb/HTables.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTables.hxx"
#include "hsqldb/HViews.hxx"
#include "hsqldb/HTable.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
index 691df179a8..2099edf6ff 100644
--- a/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTerminateListener.cxx
@@ -22,8 +22,8 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
-
+#include "precompiled_hsqldb.hxx"
+
#include "HTerminateListener.hxx"
#include "hsqldb/HDriver.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HTools.cxx b/main/connectivity/source/drivers/hsqldb/HTools.cxx
index 0b869acd81..8aa691ef9a 100644
--- a/main/connectivity/source/drivers/hsqldb/HTools.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HUser.cxx b/main/connectivity/source/drivers/hsqldb/HUser.cxx
index f15a882b6c..329eaf2abc 100644
--- a/main/connectivity/source/drivers/hsqldb/HUser.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HUser.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/hsqldb/HUsers.cxx b/main/connectivity/source/drivers/hsqldb/HUsers.cxx
index 58f3c0bdcf..704bb7fbdc 100644
--- a/main/connectivity/source/drivers/hsqldb/HUsers.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HUsers.hxx"
#include "hsqldb/HUser.hxx"
#include "hsqldb/HTable.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HView.cxx b/main/connectivity/source/drivers/hsqldb/HView.cxx
index eaccf4afba..1468e8dad7 100644
--- a/main/connectivity/source/drivers/hsqldb/HView.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HView.hxx"
#include "hsqldb/HTools.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/HViews.cxx b/main/connectivity/source/drivers/hsqldb/HViews.cxx
index 36b876fad1..dc96561712 100644
--- a/main/connectivity/source/drivers/hsqldb/HViews.cxx
+++ b/main/connectivity/source/drivers/hsqldb/HViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HTables.hxx"
#include "hsqldb/HViews.hxx"
diff --git a/main/connectivity/source/drivers/hsqldb/Hservices.cxx b/main/connectivity/source/drivers/hsqldb/Hservices.cxx
index 440c8bb02e..2e2b94e7d8 100644
--- a/main/connectivity/source/drivers/hsqldb/Hservices.cxx
+++ b/main/connectivity/source/drivers/hsqldb/Hservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#include "hsqldb/HDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
index ccfba7f9d5..60a76446f1 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
index bfaea4f7a6..89a04da802 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
diff --git a/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
index 253e8bf40e..0666bbe21f 100644
--- a/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
+++ b/main/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#if defined(HAVE_CONFIG_H) && HAVE_CONFIG_H
#include <config.h>
#endif
diff --git a/main/connectivity/source/drivers/hsqldb/accesslog.cxx b/main/connectivity/source/drivers/hsqldb/accesslog.cxx
index a57e9cc3b2..ad9eb71ae8 100644
--- a/main/connectivity/source/drivers/hsqldb/accesslog.cxx
+++ b/main/connectivity/source/drivers/hsqldb/accesslog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_hsqldb.hxx"
#ifdef HSQLDB_DBG
#include "accesslog.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Array.cxx b/main/connectivity/source/drivers/jdbc/Array.cxx
index 458199674f..3dd14ee500 100644
--- a/main/connectivity/source/drivers/jdbc/Array.cxx
+++ b/main/connectivity/source/drivers/jdbc/Array.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Array.hxx"
#include "java/tools.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Blob.cxx b/main/connectivity/source/drivers/jdbc/Blob.cxx
index 1ebc499d58..599edb8d90 100644
--- a/main/connectivity/source/drivers/jdbc/Blob.cxx
+++ b/main/connectivity/source/drivers/jdbc/Blob.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Blob.hxx"
#include "java/tools.hxx"
#include "java/io/InputStream.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Boolean.cxx b/main/connectivity/source/drivers/jdbc/Boolean.cxx
index 88884bc7bd..e85ecd9f94 100644
--- a/main/connectivity/source/drivers/jdbc/Boolean.cxx
+++ b/main/connectivity/source/drivers/jdbc/Boolean.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Boolean.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/CallableStatement.cxx b/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
index 711513ccce..f0259b0aad 100644
--- a/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/CallableStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/CallableStatement.hxx"
#include "java/tools.hxx"
#include "java/sql/Array.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Class.cxx b/main/connectivity/source/drivers/jdbc/Class.cxx
index 84a8cb3bc0..9093d6caa5 100644
--- a/main/connectivity/source/drivers/jdbc/Class.cxx
+++ b/main/connectivity/source/drivers/jdbc/Class.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Class.hxx"
#include "java/tools.hxx"
#include <rtl/ustring.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/Clob.cxx b/main/connectivity/source/drivers/jdbc/Clob.cxx
index 1ab5e30db8..bcd3f069d4 100644
--- a/main/connectivity/source/drivers/jdbc/Clob.cxx
+++ b/main/connectivity/source/drivers/jdbc/Clob.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Clob.hxx"
#include "java/tools.hxx"
#include "java/io/Reader.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx b/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
index 77fdb7e2fd..731c7bacd7 100644
--- a/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
+++ b/main/connectivity/source/drivers/jdbc/ConnectionLog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/ConnectionLog.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx b/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
index 95e55af7dd..fc4e0db107 100644
--- a/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
+++ b/main/connectivity/source/drivers/jdbc/ContextClassLoader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/ContextClassLoader.hxx"
#include "java/lang/Object.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
index a852c8991c..4f07935be9 100644
--- a/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/DatabaseMetaData.hxx"
#include "java/sql/Connection.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Date.cxx b/main/connectivity/source/drivers/jdbc/Date.cxx
index 3c65d00178..ae444c17d0 100644
--- a/main/connectivity/source/drivers/jdbc/Date.cxx
+++ b/main/connectivity/source/drivers/jdbc/Date.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/util/Date.hxx"
#include "java/tools.hxx"
#include "connectivity/dbconversion.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
index 90c26937e3..a013e446a0 100644
--- a/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
+++ b/main/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/DriverPropertyInfo.hxx"
#include "java/lang/Boolean.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Exception.cxx b/main/connectivity/source/drivers/jdbc/Exception.cxx
index f8e77ed579..8c5d8e1307 100644
--- a/main/connectivity/source/drivers/jdbc/Exception.cxx
+++ b/main/connectivity/source/drivers/jdbc/Exception.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Exception.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/InputStream.cxx b/main/connectivity/source/drivers/jdbc/InputStream.cxx
index 38e5e73ba8..68668a5901 100644
--- a/main/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/main/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/io/InputStream.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx b/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
index 63c15a514e..f7f6e3e8dc 100644
--- a/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
+++ b/main/connectivity/source/drivers/jdbc/JBigDecimal.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/math/BigDecimal.hxx"
#include "java/tools.hxx"
#include "resource/jdbc_log.hrc"
diff --git a/main/connectivity/source/drivers/jdbc/JConnection.cxx b/main/connectivity/source/drivers/jdbc/JConnection.cxx
index 4ac10ee392..23d1fa597e 100644
--- a/main/connectivity/source/drivers/jdbc/JConnection.cxx
+++ b/main/connectivity/source/drivers/jdbc/JConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Connection.hxx"
#include "java/lang/Class.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JDriver.cxx b/main/connectivity/source/drivers/jdbc/JDriver.cxx
index 3f3a1bfdca..8910e3f0c7 100644
--- a/main/connectivity/source/drivers/jdbc/JDriver.cxx
+++ b/main/connectivity/source/drivers/jdbc/JDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Driver.hxx"
#include "java/lang/Object.hxx"
#include "java/lang/Class.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/JStatement.cxx b/main/connectivity/source/drivers/jdbc/JStatement.cxx
index 8d734bf420..20db07ae0e 100644
--- a/main/connectivity/source/drivers/jdbc/JStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/JStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/JStatement.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Object.cxx b/main/connectivity/source/drivers/jdbc/Object.cxx
index fa48d75ff0..471f13cf8f 100644
--- a/main/connectivity/source/drivers/jdbc/Object.cxx
+++ b/main/connectivity/source/drivers/jdbc/Object.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#ifndef _CONNECTIVITY_JAVA_LANG_OBJJECT_HXX_
diff --git a/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
index 966c6b4e43..229ff99015 100644
--- a/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
+++ b/main/connectivity/source/drivers/jdbc/PreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/PreparedStatement.hxx"
#include "java/sql/ResultSet.hxx"
#include "java/sql/ResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/Reader.cxx b/main/connectivity/source/drivers/jdbc/Reader.cxx
index f54d6407a2..0ed6196658 100644
--- a/main/connectivity/source/drivers/jdbc/Reader.cxx
+++ b/main/connectivity/source/drivers/jdbc/Reader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/io/Reader.hxx"
#ifndef _INC_MEMORY
//#include <memory.h>
diff --git a/main/connectivity/source/drivers/jdbc/Ref.cxx b/main/connectivity/source/drivers/jdbc/Ref.cxx
index 264db47f82..f1dc0955fe 100644
--- a/main/connectivity/source/drivers/jdbc/Ref.cxx
+++ b/main/connectivity/source/drivers/jdbc/Ref.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Ref.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/ResultSet.cxx b/main/connectivity/source/drivers/jdbc/ResultSet.cxx
index cfa15d5d21..986a123fae 100644
--- a/main/connectivity/source/drivers/jdbc/ResultSet.cxx
+++ b/main/connectivity/source/drivers/jdbc/ResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/String.hxx"
#include "java/lang/Boolean.hxx"
#include "java/sql/ResultSet.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
index 0faa79484b..2d0dc87280 100644
--- a/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/ResultSetMetaData.hxx"
#include "java/sql/Connection.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/SQLException.cxx b/main/connectivity/source/drivers/jdbc/SQLException.cxx
index dee07cbb1c..6a1e61b5f3 100644
--- a/main/connectivity/source/drivers/jdbc/SQLException.cxx
+++ b/main/connectivity/source/drivers/jdbc/SQLException.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/SQLException.hxx"
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/jdbc/SQLWarning.cxx b/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
index 8b26d584c4..9a24157566 100644
--- a/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
+++ b/main/connectivity/source/drivers/jdbc/SQLWarning.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/SQLWarning.hxx"
using namespace connectivity;
//**************************************************************
diff --git a/main/connectivity/source/drivers/jdbc/String.cxx b/main/connectivity/source/drivers/jdbc/String.cxx
index 3118c8b1ac..ad00e3ff5a 100644
--- a/main/connectivity/source/drivers/jdbc/String.cxx
+++ b/main/connectivity/source/drivers/jdbc/String.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/String.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/Throwable.cxx b/main/connectivity/source/drivers/jdbc/Throwable.cxx
index 38d5427dd6..d51ab72b4a 100644
--- a/main/connectivity/source/drivers/jdbc/Throwable.cxx
+++ b/main/connectivity/source/drivers/jdbc/Throwable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/lang/Throwable.hxx"
#include "java/tools.hxx"
using namespace connectivity;
diff --git a/main/connectivity/source/drivers/jdbc/Timestamp.cxx b/main/connectivity/source/drivers/jdbc/Timestamp.cxx
index 712fc0e0f7..36bf286bec 100644
--- a/main/connectivity/source/drivers/jdbc/Timestamp.cxx
+++ b/main/connectivity/source/drivers/jdbc/Timestamp.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Timestamp.hxx"
#include "java/tools.hxx"
#include <comphelper/types.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/jservices.cxx b/main/connectivity/source/drivers/jdbc/jservices.cxx
index 230c79f85c..dfab61a7b4 100644
--- a/main/connectivity/source/drivers/jdbc/jservices.cxx
+++ b/main/connectivity/source/drivers/jdbc/jservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include "java/sql/Driver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/jdbc/tools.cxx b/main/connectivity/source/drivers/jdbc/tools.cxx
index a6253edcee..c631cd1bfc 100644
--- a/main/connectivity/source/drivers/jdbc/tools.cxx
+++ b/main/connectivity/source/drivers/jdbc/tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_jdbc.hxx"
#include <cstdarg>
#include "java/tools.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabAddressBook.cxx b/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
index e623fb876d..6d760a510e 100644
--- a/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
+++ b/main/connectivity/source/drivers/macab/MacabAddressBook.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabAddressBook.hxx"
#include "MacabRecords.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabCatalog.cxx b/main/connectivity/source/drivers/macab/MacabCatalog.cxx
index 63aaa3ede8..eed57b5e5b 100644
--- a/main/connectivity/source/drivers/macab/MacabCatalog.cxx
+++ b/main/connectivity/source/drivers/macab/MacabCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabCatalog.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabColumns.cxx b/main/connectivity/source/drivers/macab/MacabColumns.cxx
index fd7906b0e0..4cc4c017f2 100644
--- a/main/connectivity/source/drivers/macab/MacabColumns.cxx
+++ b/main/connectivity/source/drivers/macab/MacabColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabColumns.hxx"
#include "MacabTable.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabConnection.cxx b/main/connectivity/source/drivers/macab/MacabConnection.cxx
index 736d530427..e40600cc68 100644
--- a/main/connectivity/source/drivers/macab/MacabConnection.cxx
+++ b/main/connectivity/source/drivers/macab/MacabConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabConnection.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
index 837b1dab04..32c0d0c9f4 100644
--- a/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabDatabaseMetaData.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabDriver.cxx b/main/connectivity/source/drivers/macab/MacabDriver.cxx
index 8dc5c4a6d9..79e5fe07a1 100644
--- a/main/connectivity/source/drivers/macab/MacabDriver.cxx
+++ b/main/connectivity/source/drivers/macab/MacabDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
#include "MacabDriver.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabGroup.cxx b/main/connectivity/source/drivers/macab/MacabGroup.cxx
index a8ec3aa25d..d48236dc37 100644
--- a/main/connectivity/source/drivers/macab/MacabGroup.cxx
+++ b/main/connectivity/source/drivers/macab/MacabGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabGroup.hxx"
#include "MacabRecords.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabHeader.cxx b/main/connectivity/source/drivers/macab/MacabHeader.cxx
index 465e3e8de4..a0abf274d8 100644
--- a/main/connectivity/source/drivers/macab/MacabHeader.cxx
+++ b/main/connectivity/source/drivers/macab/MacabHeader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabHeader.hxx"
#include "MacabRecord.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
index 4915b94b2c..4f3ba0b62a 100644
--- a/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/macab/MacabPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabPreparedStatement.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabRecord.cxx b/main/connectivity/source/drivers/macab/MacabRecord.cxx
index 32c29799f1..f70b530f5c 100644
--- a/main/connectivity/source/drivers/macab/MacabRecord.cxx
+++ b/main/connectivity/source/drivers/macab/MacabRecord.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabRecord.hxx"
#include "macabutilities.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabRecords.cxx b/main/connectivity/source/drivers/macab/MacabRecords.cxx
index eab821a744..11fbb97b06 100644
--- a/main/connectivity/source/drivers/macab/MacabRecords.cxx
+++ b/main/connectivity/source/drivers/macab/MacabRecords.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabRecords.hxx"
#include "MacabRecord.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabResultSet.cxx b/main/connectivity/source/drivers/macab/MacabResultSet.cxx
index f68fb6f4ea..945ca79917 100644
--- a/main/connectivity/source/drivers/macab/MacabResultSet.cxx
+++ b/main/connectivity/source/drivers/macab/MacabResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabResultSet.hxx"
#include "MacabAddressBook.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
index ea16d28eb5..7934386770 100644
--- a/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabResultSetMetaData.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabServices.cxx b/main/connectivity/source/drivers/macab/MacabServices.cxx
index c449040a7e..eafe696539 100644
--- a/main/connectivity/source/drivers/macab/MacabServices.cxx
+++ b/main/connectivity/source/drivers/macab/MacabServices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macab1.hxx"
#include "MacabDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/macab/MacabStatement.cxx b/main/connectivity/source/drivers/macab/MacabStatement.cxx
index ffbbc38ddd..cb7c3de55a 100644
--- a/main/connectivity/source/drivers/macab/MacabStatement.cxx
+++ b/main/connectivity/source/drivers/macab/MacabStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabStatement.hxx"
#include "MacabConnection.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabTable.cxx b/main/connectivity/source/drivers/macab/MacabTable.cxx
index 77ad1cce7a..5ab3d5a80c 100644
--- a/main/connectivity/source/drivers/macab/MacabTable.cxx
+++ b/main/connectivity/source/drivers/macab/MacabTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabTable.hxx"
#include "MacabTables.hxx"
diff --git a/main/connectivity/source/drivers/macab/MacabTables.cxx b/main/connectivity/source/drivers/macab/MacabTables.cxx
index 8267f12df9..d55957c8fc 100644
--- a/main/connectivity/source/drivers/macab/MacabTables.cxx
+++ b/main/connectivity/source/drivers/macab/MacabTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "MacabTables.hxx"
#include "MacabTable.hxx"
diff --git a/main/connectivity/source/drivers/macab/macabcondition.cxx b/main/connectivity/source/drivers/macab/macabcondition.cxx
index 2729eb5efc..a6f4c2cc2b 100644
--- a/main/connectivity/source/drivers/macab/macabcondition.cxx
+++ b/main/connectivity/source/drivers/macab/macabcondition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "macabcondition.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/macab/macaborder.cxx b/main/connectivity/source/drivers/macab/macaborder.cxx
index 4b36f28b0f..630e3e9a69 100644
--- a/main/connectivity/source/drivers/macab/macaborder.cxx
+++ b/main/connectivity/source/drivers/macab/macaborder.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_macabdrv1.hxx"
#include "macaborder.hxx"
#include "MacabHeader.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YCatalog.cxx b/main/connectivity/source/drivers/mysql/YCatalog.cxx
index 45ee63d644..1529e4297f 100644
--- a/main/connectivity/source/drivers/mysql/YCatalog.cxx
+++ b/main/connectivity/source/drivers/mysql/YCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YCatalog.hxx"
#include "mysql/YUsers.hxx"
#include "mysql/YTables.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YColumns.cxx b/main/connectivity/source/drivers/mysql/YColumns.cxx
index 06ce6f0dd5..72321dd81d 100644
--- a/main/connectivity/source/drivers/mysql/YColumns.cxx
+++ b/main/connectivity/source/drivers/mysql/YColumns.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YColumns.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YDriver.cxx b/main/connectivity/source/drivers/mysql/YDriver.cxx
index 9e32be875b..de41dfdb47 100644
--- a/main/connectivity/source/drivers/mysql/YDriver.cxx
+++ b/main/connectivity/source/drivers/mysql/YDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YDriver.hxx"
#include "mysql/YCatalog.hxx"
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/mysql/YTable.cxx b/main/connectivity/source/drivers/mysql/YTable.cxx
index b9d9d50f19..7a4b989f01 100644
--- a/main/connectivity/source/drivers/mysql/YTable.cxx
+++ b/main/connectivity/source/drivers/mysql/YTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YTable.hxx"
#include "mysql/YTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/mysql/YTables.cxx b/main/connectivity/source/drivers/mysql/YTables.cxx
index 126989717a..417e4e625a 100644
--- a/main/connectivity/source/drivers/mysql/YTables.cxx
+++ b/main/connectivity/source/drivers/mysql/YTables.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YTables.hxx"
#include "mysql/YViews.hxx"
#include "mysql/YTable.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YUser.cxx b/main/connectivity/source/drivers/mysql/YUser.cxx
index c8b69405e5..a7e4cc2bdc 100644
--- a/main/connectivity/source/drivers/mysql/YUser.cxx
+++ b/main/connectivity/source/drivers/mysql/YUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YUser.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/sdbc/XResultSet.hpp>
diff --git a/main/connectivity/source/drivers/mysql/YUsers.cxx b/main/connectivity/source/drivers/mysql/YUsers.cxx
index 862c042da5..7c167881cd 100644
--- a/main/connectivity/source/drivers/mysql/YUsers.cxx
+++ b/main/connectivity/source/drivers/mysql/YUsers.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YUsers.hxx"
#include "mysql/YUser.hxx"
#include "mysql/YTable.hxx"
diff --git a/main/connectivity/source/drivers/mysql/YViews.cxx b/main/connectivity/source/drivers/mysql/YViews.cxx
index 89221926e8..b0238befd8 100644
--- a/main/connectivity/source/drivers/mysql/YViews.cxx
+++ b/main/connectivity/source/drivers/mysql/YViews.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YViews.hxx"
#include "mysql/YTables.hxx"
#include <com/sun/star/sdbc/XRow.hpp>
diff --git a/main/connectivity/source/drivers/mysql/Yservices.cxx b/main/connectivity/source/drivers/mysql/Yservices.cxx
index 43de949080..c19fef3da1 100644
--- a/main/connectivity/source/drivers/mysql/Yservices.cxx
+++ b/main/connectivity/source/drivers/mysql/Yservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_mysql.hxx"
#include "mysql/YDriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/odbc/OFunctions.cxx b/main/connectivity/source/drivers/odbc/OFunctions.cxx
index 727c74068c..450de7526f 100644
--- a/main/connectivity/source/drivers/odbc/OFunctions.cxx
+++ b/main/connectivity/source/drivers/odbc/OFunctions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
//--------------------------------------------------------------------------
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/odbc/ORealDriver.cxx b/main/connectivity/source/drivers/odbc/ORealDriver.cxx
index d542a251b6..c9db5d6642 100644
--- a/main/connectivity/source/drivers/odbc/ORealDriver.cxx
+++ b/main/connectivity/source/drivers/odbc/ORealDriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
#include "ORealDriver.hxx"
#include "odbc/ODriver.hxx"
#include "odbc/OTools.hxx"
diff --git a/main/connectivity/source/drivers/odbc/oservices.cxx b/main/connectivity/source/drivers/odbc/oservices.cxx
index 100f55d71c..9d888ab2cb 100644
--- a/main/connectivity/source/drivers/odbc/oservices.cxx
+++ b/main/connectivity/source/drivers/odbc/oservices.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbc.hxx"
#include "ORealDriver.hxx"
#include "odbc/ODriver.hxx"
#include <cppuhelper/factory.hxx>
diff --git a/main/connectivity/source/drivers/odbcbase/OConnection.cxx b/main/connectivity/source/drivers/odbcbase/OConnection.cxx
index 419da03e40..c6fe1ff986 100644
--- a/main/connectivity/source/drivers/odbcbase/OConnection.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OConnection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OConnection.hxx"
#include "odbc/ODatabaseMetaData.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
index 6152caf152..00aa38eade 100644
--- a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/ODatabaseMetaData.hxx"
#include "odbc/OTools.hxx"
#ifndef _CONNECTIVITY_ODBC_ORESULTSET_HXX_
diff --git a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
index c371135ef6..ec28971caf 100644
--- a/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODatabaseMetaDataResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "TConnection.hxx"
#ifndef _CONNECTIVITY_ADO_ADATABASEMETADATARESULTSET_HXX_
diff --git a/main/connectivity/source/drivers/odbcbase/ODriver.cxx b/main/connectivity/source/drivers/odbcbase/ODriver.cxx
index 663fc17400..5dd1067351 100644
--- a/main/connectivity/source/drivers/odbcbase/ODriver.cxx
+++ b/main/connectivity/source/drivers/odbcbase/ODriver.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/ODriver.hxx"
#include "odbc/OConnection.hxx"
#include "odbc/OFunctions.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx b/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
index 26b43c2743..54350cdfdd 100644
--- a/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OPreparedStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include <stdio.h>
#include <string.h>
diff --git a/main/connectivity/source/drivers/odbcbase/OResultSet.cxx b/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
index 947e0beb30..12c4f7fb96 100644
--- a/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OResultSet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OResultSet.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OResultSetMetaData.hxx"
diff --git a/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx b/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
index 23bf305b4f..68eb4722cc 100644
--- a/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OResultSetMetaData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OResultSetMetaData.hxx"
#include "odbc/OTools.hxx"
#include <rtl/logfile.hxx>
diff --git a/main/connectivity/source/drivers/odbcbase/OStatement.cxx b/main/connectivity/source/drivers/odbcbase/OStatement.cxx
index 5120e32b83..73792c720b 100644
--- a/main/connectivity/source/drivers/odbcbase/OStatement.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OStatement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include <stdio.h>
#include <osl/diagnose.h>
diff --git a/main/connectivity/source/drivers/odbcbase/OTools.cxx b/main/connectivity/source/drivers/odbcbase/OTools.cxx
index 9b8e8f5b4a..4527189be0 100644
--- a/main/connectivity/source/drivers/odbcbase/OTools.cxx
+++ b/main/connectivity/source/drivers/odbcbase/OTools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_odbcbase.hxx"
#include "odbc/OTools.hxx"
#include "odbc/OFunctions.hxx"
#include <com/sun/star/sdbc/DataType.hpp>
diff --git a/main/connectivity/source/inc/ParameterSubstitution.hxx b/main/connectivity/source/inc/ParameterSubstitution.hxx
index 409ed8f51c..21c131d540 100644
--- a/main/connectivity/source/inc/ParameterSubstitution.hxx
+++ b/main/connectivity/source/inc/ParameterSubstitution.hxx
@@ -20,7 +20,6 @@
*************************************************************/
-#include "precompiled_connectivity.hxx"
#include <com/sun/star/util/XStringSubstitution.hpp>
#include <com/sun/star/lang/XInitialization.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
diff --git a/main/connectivity/source/manager/mdrivermanager.cxx b/main/connectivity/source/manager/mdrivermanager.cxx
index c1eb42cc02..228db6f305 100644
--- a/main/connectivity/source/manager/mdrivermanager.cxx
+++ b/main/connectivity/source/manager/mdrivermanager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
#include <stdio.h>
diff --git a/main/connectivity/source/manager/mregistration.cxx b/main/connectivity/source/manager/mregistration.cxx
index e55d936fda..aade06a7b4 100644
--- a/main/connectivity/source/manager/mregistration.cxx
+++ b/main/connectivity/source/manager/mregistration.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_sdbc2.hxx"
#include "mdrivermanager.hxx"
diff --git a/main/connectivity/source/parse/PColumn.cxx b/main/connectivity/source/parse/PColumn.cxx
index f456bdc03e..ea5d2740f1 100644
--- a/main/connectivity/source/parse/PColumn.cxx
+++ b/main/connectivity/source/parse/PColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/PColumn.hxx"
#include "connectivity/dbtools.hxx"
diff --git a/main/connectivity/source/parse/internalnode.cxx b/main/connectivity/source/parse/internalnode.cxx
index 86a2139a00..0082b55dd2 100644
--- a/main/connectivity/source/parse/internalnode.cxx
+++ b/main/connectivity/source/parse/internalnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "internalnode.hxx"
#include <algorithm>
diff --git a/main/connectivity/source/parse/sqliterator.cxx b/main/connectivity/source/parse/sqliterator.cxx
index fbd0a5122d..16d9712113 100644
--- a/main/connectivity/source/parse/sqliterator.cxx
+++ b/main/connectivity/source/parse/sqliterator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sqliterator.hxx"
#include "connectivity/sdbcx/VTable.hxx"
#include <connectivity/sqlparse.hxx>
diff --git a/main/connectivity/source/parse/sqlnode.cxx b/main/connectivity/source/parse/sqlnode.cxx
index 8e85819a85..964257add6 100644
--- a/main/connectivity/source/parse/sqlnode.cxx
+++ b/main/connectivity/source/parse/sqlnode.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/sqlnode.hxx>
diff --git a/main/connectivity/source/parse/wrap_sqlbison.cxx b/main/connectivity/source/parse/wrap_sqlbison.cxx
index 228a981cfd..edeac69267 100644
--- a/main/connectivity/source/parse/wrap_sqlbison.cxx
+++ b/main/connectivity/source/parse/wrap_sqlbison.cxx
@@ -22,6 +22,6 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "sqlbison.cxx"
diff --git a/main/connectivity/source/parse/wrap_sqlflex.cxx b/main/connectivity/source/parse/wrap_sqlflex.cxx
index fb957c1a86..86014f2775 100644
--- a/main/connectivity/source/parse/wrap_sqlflex.cxx
+++ b/main/connectivity/source/parse/wrap_sqlflex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#if defined _MSC_VER
#pragma warning(disable:4505)
diff --git a/main/connectivity/source/resource/sharedresources.cxx b/main/connectivity/source/resource/sharedresources.cxx
index 14018512b2..e9c0c7d134 100644
--- a/main/connectivity/source/resource/sharedresources.cxx
+++ b/main/connectivity/source/resource/sharedresources.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "resource/sharedresources.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/main/connectivity/source/sdbcx/VCatalog.cxx b/main/connectivity/source/sdbcx/VCatalog.cxx
index 16557b681e..9aa2ec4b82 100644
--- a/main/connectivity/source/sdbcx/VCatalog.cxx
+++ b/main/connectivity/source/sdbcx/VCatalog.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VCatalog.hxx"
#include "connectivity/sdbcx/VCollection.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
diff --git a/main/connectivity/source/sdbcx/VCollection.cxx b/main/connectivity/source/sdbcx/VCollection.cxx
index 74fd4303c8..658c13cac5 100644
--- a/main/connectivity/source/sdbcx/VCollection.cxx
+++ b/main/connectivity/source/sdbcx/VCollection.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <algorithm>
#include <stdio.h>
diff --git a/main/connectivity/source/sdbcx/VColumn.cxx b/main/connectivity/source/sdbcx/VColumn.cxx
index 9a486fe14f..eeb0ef58dd 100644
--- a/main/connectivity/source/sdbcx/VColumn.cxx
+++ b/main/connectivity/source/sdbcx/VColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VColumn.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/sequence.hxx>
diff --git a/main/connectivity/source/sdbcx/VDescriptor.cxx b/main/connectivity/source/sdbcx/VDescriptor.cxx
index ee7c1c1c92..dc7ca8ae34 100644
--- a/main/connectivity/source/sdbcx/VDescriptor.cxx
+++ b/main/connectivity/source/sdbcx/VDescriptor.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/sdbcx/VDescriptor.hxx>
#include <cppuhelper/queryinterface.hxx>
diff --git a/main/connectivity/source/sdbcx/VGroup.cxx b/main/connectivity/source/sdbcx/VGroup.cxx
index 443b40c5b9..9d9d9533c5 100644
--- a/main/connectivity/source/sdbcx/VGroup.cxx
+++ b/main/connectivity/source/sdbcx/VGroup.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VGroup.hxx"
diff --git a/main/connectivity/source/sdbcx/VIndex.cxx b/main/connectivity/source/sdbcx/VIndex.cxx
index bdc0827605..8ba2b03708 100644
--- a/main/connectivity/source/sdbcx/VIndex.cxx
+++ b/main/connectivity/source/sdbcx/VIndex.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VIndex.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "connectivity/sdbcx/VColumn.hxx"
diff --git a/main/connectivity/source/sdbcx/VIndexColumn.cxx b/main/connectivity/source/sdbcx/VIndexColumn.cxx
index 0195c08af8..aff96eb8c9 100644
--- a/main/connectivity/source/sdbcx/VIndexColumn.cxx
+++ b/main/connectivity/source/sdbcx/VIndexColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VIndexColumn.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/sdbcx/VKey.cxx b/main/connectivity/source/sdbcx/VKey.cxx
index c4bf2ebd91..53b534acac 100644
--- a/main/connectivity/source/sdbcx/VKey.cxx
+++ b/main/connectivity/source/sdbcx/VKey.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VKey.hxx"
diff --git a/main/connectivity/source/sdbcx/VKeyColumn.cxx b/main/connectivity/source/sdbcx/VKeyColumn.cxx
index f13cc8f42a..27cd995e76 100644
--- a/main/connectivity/source/sdbcx/VKeyColumn.cxx
+++ b/main/connectivity/source/sdbcx/VKeyColumn.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VKeyColumn.hxx"
#include "TConnection.hxx"
diff --git a/main/connectivity/source/sdbcx/VTable.cxx b/main/connectivity/source/sdbcx/VTable.cxx
index 62cafb43b4..0e30afcb43 100644
--- a/main/connectivity/source/sdbcx/VTable.cxx
+++ b/main/connectivity/source/sdbcx/VTable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VTable.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include "connectivity/sdbcx/VIndex.hxx"
diff --git a/main/connectivity/source/sdbcx/VUser.cxx b/main/connectivity/source/sdbcx/VUser.cxx
index 081888596f..f5d6cf3343 100644
--- a/main/connectivity/source/sdbcx/VUser.cxx
+++ b/main/connectivity/source/sdbcx/VUser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <stdio.h>
#include "connectivity/sdbcx/VUser.hxx"
diff --git a/main/connectivity/source/sdbcx/VView.cxx b/main/connectivity/source/sdbcx/VView.cxx
index 234fb1ff3b..8be7b70397 100644
--- a/main/connectivity/source/sdbcx/VView.cxx
+++ b/main/connectivity/source/sdbcx/VView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "connectivity/sdbcx/VView.hxx"
#include <com/sun/star/lang/DisposedException.hpp>
#include <comphelper/sequence.hxx>
diff --git a/main/connectivity/source/simpledbt/charset_s.cxx b/main/connectivity/source/simpledbt/charset_s.cxx
index 9ad7f371f2..102c642b75 100644
--- a/main/connectivity/source/simpledbt/charset_s.cxx
+++ b/main/connectivity/source/simpledbt/charset_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "charset_s.hxx"
//........................................................................
diff --git a/main/connectivity/source/simpledbt/dbtfactory.cxx b/main/connectivity/source/simpledbt/dbtfactory.cxx
index 682fd7c45c..0c74965c31 100644
--- a/main/connectivity/source/simpledbt/dbtfactory.cxx
+++ b/main/connectivity/source/simpledbt/dbtfactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include <connectivity/formattedcolumnvalue.hxx>
diff --git a/main/connectivity/source/simpledbt/parsenode_s.cxx b/main/connectivity/source/simpledbt/parsenode_s.cxx
index 0a89ef1ff1..512865a9be 100644
--- a/main/connectivity/source/simpledbt/parsenode_s.cxx
+++ b/main/connectivity/source/simpledbt/parsenode_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "parsenode_s.hxx"
#include <connectivity/sqlnode.hxx>
diff --git a/main/connectivity/source/simpledbt/parser_s.cxx b/main/connectivity/source/simpledbt/parser_s.cxx
index c6803a6da4..511fb9f763 100644
--- a/main/connectivity/source/simpledbt/parser_s.cxx
+++ b/main/connectivity/source/simpledbt/parser_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "parser_s.hxx"
#include "parsenode_s.hxx"
diff --git a/main/connectivity/source/simpledbt/refbase.cxx b/main/connectivity/source/simpledbt/refbase.cxx
index 71075f1bff..9edb7b0f88 100644
--- a/main/connectivity/source/simpledbt/refbase.cxx
+++ b/main/connectivity/source/simpledbt/refbase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include "refbase.hxx"
//........................................................................
diff --git a/main/connectivity/source/simpledbt/staticdbtools_s.cxx b/main/connectivity/source/simpledbt/staticdbtools_s.cxx
index 15603c98d9..e0226f5be1 100644
--- a/main/connectivity/source/simpledbt/staticdbtools_s.cxx
+++ b/main/connectivity/source/simpledbt/staticdbtools_s.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_connectivity.hxx"
+#include "precompiled_dbtools.hxx"
#include <connectivity/virtualdbtools.hxx>
#include "staticdbtools_s.hxx"
#include "connectivity/dbconversion.hxx"
(openoffice) 12/21: Remove unused files.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 93fbba6999972aa09c6493dd3e93f08c5e869f40
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Wed Jan 8 08:45:25 2025 +0200
Remove unused files.
Patch by: me
---
main/connectivity/Configuration.mk | 86 --------------------------------
main/connectivity/Jar_sdbc_hsqldb.mk | 59 ----------------------
main/connectivity/Module_connectivity.mk | 3 --
3 files changed, 148 deletions(-)
diff --git a/main/connectivity/Configuration.mk b/main/connectivity/Configuration.mk
deleted file mode 100644
index e38d819061..0000000000
--- a/main/connectivity/Configuration.mk
+++ /dev/null
@@ -1,86 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-#########
-# Inputs:
-#########
-
-PACKAGE := org.openoffice.Office.DataAccess
-COMPONENT_CONFIG_DATA := \
- $(SRCDIR)/source/drivers/ado/ado.xcu \
- $(SRCDIR)/source/drivers/adabas/adabas.xcu \
- $(SRCDIR)/source/drivers/mysql/mysql.xcu \
- $(SRCDIR)/source/drivers/hsqldb/hsqldb.xcu \
- $(SRCDIR)/source/drivers/macab/macab.xcu \
- $(SRCDIR)/source/drivers/evoab2/evoab2.xcu \
- $(SRCDIR)/source/drivers/jdbc/jdbc.xcu \
- $(SRCDIR)/source/drivers/dbase/dbase.xcu \
- $(SRCDIR)/source/drivers/flat/flat.xcu \
- $(SRCDIR)/source/drivers/calc/calc.xcu \
- $(SRCDIR)/source/drivers/odbc/odbc.xcu
-
-LOCALIZEDFILES = $(COMPONENT_CONFIG_DATA)
-XCUFILES = $(COMPONENT_CONFIG_DATA)
-
-
-
-##############################################
-# Processing and output.
-# From dmake's main/solenv/inc/tg_config.mk:
-##############################################
-
-PACKAGEDIR = $(subst .,/,$(PACKAGE))
-XSLTPACKAGEDIR = $(PACKAGEDIR)
-
-XCSROOTURL = $(WORKDIR)/CustomTarget/connectivity
-ifeq ($(GUI),WNT)
-XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
-endif
-ifeq ($(GUI),OS2)
-XCSROOTURL = file:///$(subst \,/,$(XCSROOTURL))
-endif
-
-XCU_DEFAULT = $(foreach file,$(XCUFILES),\
- $(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/$(file))
-XCU_LANG = $(foreach file,$(LOCALIZEDFILES),\
- $(foreach lang,$(gb_AllLangResTarget_LANGS),\
- $(WORKDIR)/CustomTarget/connectivity/registry/res/$(lang)/$(PACKAGEDIR)/$(file)))
-
-$(XCU_DEFAULT) : $(OUTPUTDIR)/xml/registry/component-update.dtd \
- $(OUTPUTDIR)/xml/processing/data_val.xsl \
- $(OUTPUTDIR)/xml/processing/alllang.xsl
-
-$(WORKDIR)/CustomTarget/connectivity/registry/data/$(PACKAGEDIR)/%.xcu : %.xcu
- mkdir -p $(dir $@) && \
- $(gb_XSLTPROC) --nonet -o $*.val \
- --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
- --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
- --path $(OUTPUTDIR)/xml/registry \
- $(OUTPUTDIR)/xml/processing/data_val.xsl $< && \
- $(gb_XSLTPROC) --nonet -o $@ \
- --stringparam xcs $(WORKDIR)/CustomTarget/connectivity/registry/schema/$(XSLTPACKAGEDIR)/$*.xcs \
- --stringparam schemaRoot $(XCSROOTURL)/registry/schema \
- --path $(OUTPUTDIR)/xml/registry \
- $(OUTPUTDIR)/xml/processing/alllang.xsl $< && \
- rm $*.val
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
deleted file mode 100644
index 4bae2ec6ce..0000000000
--- a/main/connectivity/Jar_sdbc_hsqldb.mk
+++ /dev/null
@@ -1,59 +0,0 @@
-###############################################################
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-###############################################################
-
-
-
-$(eval $(call gb_Jar_Jar,sdbc_hsqldb,SRCDIR))
-
-ifeq ($(SYSTEM_HSQLDB),YES)
-# FIXME: not used anywhere else in AOO! Test!
-$(eval $(call gb_Jar_add_system_jars,sdbc_hsqldb,\
- $(HSQLDB_JAR) \
-))
-else
-$(eval $(call gb_Jar_add_jars,sdbc_hsqldb,\
- $(OUTDIR)/bin/hsqldb.jar \
-))
-endif
-
-$(eval $(call gb_Jar_set_packageroot,sdbc_hsqldb,com org))
-
-$(eval $(call gb_Jar_set_manifest,sdbc_hsqldb,$(SRCDIR)/connectivity/com/sun/star/sdbcx/comp/hsqldb/manifest))
-
-$(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
- hsqldb.jar \
- .. \
-))
-
-$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
- connectivity/org/hsqldb/lib/FileSystemRuntimeException \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream \
- connectivity/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Module_connectivity.mk b/main/connectivity/Module_connectivity.mk
index 70b15d10b4..b42691097f 100644
--- a/main/connectivity/Module_connectivity.mk
+++ b/main/connectivity/Module_connectivity.mk
@@ -28,9 +28,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
AllLangResTarget_hsqldb \
AllLangResTarget_sdbcl \
AllLangResTarget_sdberr \
- Configuration \
- Connectivity \
- Jar_sdbc_hsqldb \
Library_adabas \
Library_calc \
Library_dbase \
(openoffice) 15/21: The gb_Deliver_add_deliverable function takes 3 parameters now.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 4dc45a5a3ec47a3ca61c08f62da8d71419eac43b
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 12 13:26:21 2025 +0200
The gb_Deliver_add_deliverable function takes 3 parameters now.
Patch by: me
---
main/solenv/gbuild/Configuration.mk | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/main/solenv/gbuild/Configuration.mk b/main/solenv/gbuild/Configuration.mk
index 59b78cd439..3db75677ab 100644
--- a/main/solenv/gbuild/Configuration.mk
+++ b/main/solenv/gbuild/Configuration.mk
@@ -343,7 +343,8 @@ $(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
$(call gb_XcsTarget_get_outdir_target,$(3)) : \
$(call gb_XcsTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
- $(call gb_XcsTarget_get_target,$(2)/$(3)))
+ $(call gb_XcsTarget_get_target,$(2)/$(3)),\
+ $(1))
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
@@ -366,7 +367,8 @@ $(call gb_XcuDataTarget_get_outdir_target,$(3)) : \
$(call gb_XcuDataTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuDataTarget_get_outdir_target,$(3)),\
- $(call gb_XcuDataTarget_get_target,$(2)/$(3)))
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3)),\
+ $(1))
endef
#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles)
@@ -388,7 +390,8 @@ $(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
$(call gb_XcuModuleTarget_get_target,$(2)/$(3))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
- $(call gb_XcuModuleTarget_get_target,$(2)/$(3)))
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)),\
+ $(1))
endef
# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
@@ -410,7 +413,8 @@ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4))
$(call gb_Deliver_add_deliverable,\
$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
- $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)))
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)),\
+ $(1))
endef
# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
(openoffice) 17/21: Implement JAR sealing and RegistrationClassName in Ant. Port the Java modules in connectivity to build with Ant. Add hsqldb as an Ant external. Add the Configuration files in connectivity to gbuild. Connectivity configuration postprocess packaging w/o zip files. Fixes to naming, paths in postpostprocess. AllLangResTarget for chart2.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 861c48608f1e7c641e96f6098d15fa25c109a9cc
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 17 06:00:18 2025 +0200
Implement JAR sealing and RegistrationClassName in Ant.
Port the Java modules in connectivity to build with Ant.
Add hsqldb as an Ant external.
Add the Configuration files in connectivity to gbuild.
Connectivity configuration postprocess packaging w/o zip files.
Fixes to naming, paths in postpostprocess.
AllLangResTarget for chart2.
Patch by: me
---
main/Repository.mk | 4 +-
main/RepositoryFixes.mk | 8 +
main/chart2/AllLangResTarget_chartcontroller.mk | 200 +++++++++++++++++
main/chart2/Module_chart2.mk | 1 +
.../Ant_dbtools.mk} | 12 +-
.../sdbc_hsqldb/makefile.mk => Ant_sdbc_hsqldb.mk} | 14 +-
.../{java/dbtools/makefile.mk => Ant_sdbc_jdbc.mk} | 17 +-
.../Ant_sdbc_postgresql.mk} | 12 +-
main/connectivity/Configuration_connectivity.mk | 68 ++++++
main/connectivity/Library_jdbc.mk | 91 --------
main/connectivity/Module_connectivity.mk | 6 +-
main/connectivity/java/dbtools/build.xml | 234 ++------------------
.../comp/sdbc/dbtools/comphelper/CompHelper.java | 0
.../comp/sdbc/dbtools/comphelper/EventLogger.java | 0
.../sdbc/dbtools/comphelper/OArrayEnumeration.java | 0
.../dbtools/comphelper/OEnumerationByIndex.java | 0
.../dbtools/comphelper/OEnumerationByName.java | 0
.../dbtools/comphelper/OfficeResourceBundle.java | 0
.../comp/sdbc/dbtools/comphelper/PropertySet.java | 0
.../dbtools/comphelper/PropertySetAdapter.java | 0
.../comphelper/ResourceBasedEventLogger.java | 0
.../comp/sdbc/dbtools/sdbcx/OCatalog.java | 0
.../comp/sdbc/dbtools/sdbcx/OColumn.java | 0
.../comp/sdbc/dbtools/sdbcx/OColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/ODescriptor.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java | 0
.../comp/sdbc/dbtools/sdbcx/OIndexColumn.java | 0
.../sdbc/dbtools/sdbcx/OIndexColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OIndexContainer.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OKey.java | 0
.../comp/sdbc/dbtools/sdbcx/OKeyColumn.java | 0
.../sdbc/dbtools/sdbcx/OKeyColumnContainer.java | 0
.../comp/sdbc/dbtools/sdbcx/OKeyContainer.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OTable.java | 0
.../openoffice/comp/sdbc/dbtools/sdbcx/OView.java | 0
.../comp/sdbc/dbtools/sdbcx/SqlTableHelper.java | 0
.../sdbcx/descriptors/SdbcxColumnDescriptor.java | 0
.../SdbcxColumnDescriptorContainer.java | 0
.../descriptors/SdbcxDescriptorContainer.java | 0
.../descriptors/SdbcxIndexColumnDescriptor.java | 0
.../SdbcxIndexColumnDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxIndexDescriptor.java | 0
.../descriptors/SdbcxIndexDescriptorContainer.java | 0
.../descriptors/SdbcxKeyColumnDescriptor.java | 0
.../SdbcxKeyColumnDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxKeyDescriptor.java | 0
.../descriptors/SdbcxKeyDescriptorContainer.java | 0
.../sdbcx/descriptors/SdbcxTableDescriptor.java | 0
.../sdbcx/descriptors/SdbcxViewDescriptor.java | 0
.../comp/sdbc/dbtools/util/AutoRetrievingBase.java | 0
.../comp/sdbc/dbtools/util/ComposeRule.java | 0
.../comp/sdbc/dbtools/util/CustomColumn.java | 0
.../comp/sdbc/dbtools/util/CustomResultSet.java | 0
.../sdbc/dbtools/util/CustomResultSetMetaData.java | 0
.../comp/sdbc/dbtools/util/DBTypeConversion.java | 0
.../dbtools/util/DatabaseMetaDataResultSet.java | 0
.../openoffice/comp/sdbc/dbtools/util/DbTools.java | 0
.../sdbc/dbtools/util/ISQLStatementHelper.java | 0
.../sdbc/dbtools/util/MapToXNameAccessAdapter.java | 0
.../dbtools/util/MapToXNameContainerAdapter.java | 0
.../comp/sdbc/dbtools/util/ORowSetValue.java | 0
.../openoffice/comp/sdbc/dbtools/util/Osl.java | 0
.../comp/sdbc/dbtools/util/PropertyIds.java | 0
.../comp/sdbc/dbtools/util/Resources.java | 0
.../comp/sdbc/dbtools/util/SharedResources.java | 0
.../comp/sdbc/dbtools/util/StandardSQLState.java | 0
main/connectivity/java/sdbc_hsqldb/build.xml | 215 +------------------
.../sdbcx/comp/hsqldb/NativeInputStreamHelper.java | 0
.../star/sdbcx/comp/hsqldb/NativeLibraries.java | 0
.../comp/hsqldb/NativeOutputStreamHelper.java | 0
.../sdbcx/comp/hsqldb/NativeStorageAccess.java | 0
.../sun/star/sdbcx/comp/hsqldb/StorageAccess.java | 0
.../star/sdbcx/comp/hsqldb/StorageFileAccess.java | 0
.../comp/hsqldb/StorageNativeInputStream.java | 0
.../comp/hsqldb/StorageNativeOutputStream.java | 0
.../org/hsqldb/lib/FileSystemRuntimeException.java | 0
main/connectivity/java/sdbc_jdbc/build.xml | 237 ++-------------------
.../com/sun/star/comp/sdbc/BoundedInputStream.java | 0
.../java}/com/sun/star/comp/sdbc/ClassMap.java | 0
.../com/sun/star/comp/sdbc/ConnectionLog.java | 0
.../star/comp/sdbc/ContextClassLoaderScope.java | 0
.../java}/com/sun/star/comp/sdbc/JDBCDriver.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLArray.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLBlob.java | 0
.../star/comp/sdbc/JavaSQLCallableStatement.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLClob.java | 0
.../com/sun/star/comp/sdbc/JavaSQLConnection.java | 0
.../star/comp/sdbc/JavaSQLDatabaseMetaData.java | 0
.../star/comp/sdbc/JavaSQLPreparedStatement.java | 0
.../java}/com/sun/star/comp/sdbc/JavaSQLRef.java | 0
.../com/sun/star/comp/sdbc/JavaSQLResultSet.java | 0
.../star/comp/sdbc/JavaSQLResultSetMetaData.java | 0
.../com/sun/star/comp/sdbc/JavaSQLStatement.java | 0
.../sun/star/comp/sdbc/JavaSQLStatementBase.java | 0
.../com/sun/star/comp/sdbc/ReaderInputStream.java | 0
.../java}/com/sun/star/comp/sdbc/Tools.java | 0
.../sdbc/classloading/ClassLoaderAndClass.java | 0
.../sun/star/comp/sdbc/classloading/ClassMap.java | 0
main/connectivity/java/sdbc_postgresql/build.xml | 227 ++------------------
.../sdbcx/comp/postgresql/PostgresqlCatalog.java | 0
.../comp/postgresql/PostgresqlConnection.java | 0
.../PostgresqlDatabaseMetaDataResultSet.java | 0
.../postgresql/PostgresqlDatabaseMetadata.java | 0
.../sdbcx/comp/postgresql/PostgresqlDriver.java | 0
.../postgresql/PostgresqlPreparedStatement.java | 0
.../sdbcx/comp/postgresql/PostgresqlResultSet.java | 0
.../postgresql/PostgresqlResultSetMetaData.java | 0
.../sdbcx/comp/postgresql/PostgresqlStatement.java | 0
.../sdbcx/comp/postgresql/PostgresqlTable.java | 0
.../sdbcx/comp/postgresql/PostgresqlTables.java | 0
.../sdbcx/comp/postgresql/PostgresqlViews.java | 0
.../org/openoffice/Office/DataAccess/adabas.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/adabas.xcu | 0
.../org/openoffice/Office/DataAccess/ado.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/ado.xcu | 0
.../org/openoffice/Office/DataAccess/calc.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess/calc.xcu} | 40 ++--
.../org/openoffice/Office/DataAccess/dbase.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/dbase.xcu | 0
.../org/openoffice/Office/DataAccess/evoab2.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/evoab2.xcu | 0
.../org/openoffice/Office/DataAccess/flat.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/flat.xcu | 0
.../org/openoffice/Office/DataAccess/hsqldb.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/hsqldb.xcu | 0
.../org/openoffice/Office/DataAccess/jdbc.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/jdbc.xcu | 0
.../org/openoffice/Office/DataAccess/macab.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/macab.xcu | 0
.../org/openoffice/Office/DataAccess/mysql.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/mysql.xcu | 0
.../org/openoffice/Office/DataAccess/odbc.xcs | 70 ++++++
.../org/openoffice/Office/DataAccess}/odbc.xcu | 0
.../org/openoffice/Office/DataAccess/sdbc_jdbc.xcs | 70 ++++++
.../openoffice/Office/DataAccess}/sdbc_jdbc.xcu | 0
.../Office/DataAccess/sdbc_postgresql.xcs | 70 ++++++
.../Office/DataAccess}/sdbc_postgresql.xcu | 0
main/postprocess/packcomponents/makefile.mk | 20 +-
main/postprocess/packregistry/makefile.mk | 23 +-
main/solenv/ant/aoo-ant.xml | 2 +
main/solenv/ant/externals.xml | 6 +
142 files changed, 1303 insertions(+), 1044 deletions(-)
diff --git a/main/Repository.mk b/main/Repository.mk
index e32ef366be..d8132c48b1 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -148,8 +148,6 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
mcnttype \
msfilter \
msword \
- mysql \
- odbc \
odbcbase \
oox \
package2 \
@@ -280,7 +278,9 @@ $(eval $(call gb_Helper_register_libraries,UNOLIBS_OOO, \
i18npool \
i18nsearch \
lnth \
+ mysql \
nullcanvas \
+ odbc \
passwordcontainer \
pythonloader \
simplecanvas \
diff --git a/main/RepositoryFixes.mk b/main/RepositoryFixes.mk
index 3d62886a1f..80f07cfd26 100644
--- a/main/RepositoryFixes.mk
+++ b/main/RepositoryFixes.mk
@@ -33,6 +33,8 @@ gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyph
gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst mysql:mysql%,mysql:libmysql%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst odbc:odbc%,odbc:libodbc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
@@ -53,6 +55,8 @@ gb_Library_FILENAMES := $(patsubst cppuhelper:libcppuhelper%,cppuhelper:libuno_c
gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyphen.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst mysql:mysql%,mysql:libmysql%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst odbc:odbc%,odbc:libodbc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
@@ -71,6 +75,8 @@ gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyph
gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
# pyuno.so even on Mac OS X, because it is a python module
+gb_Library_FILENAMES := $(patsubst mysql:mysql%,mysql:libmysql%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst odbc:odbc%,odbc:libodbc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
@@ -255,6 +261,8 @@ gb_Library_FILENAMES := $(patsubst hyphen_uno:hyphen_uno.uno%,hyphen_uno:libhyph
gb_Library_FILENAMES := $(patsubst lnth:lnth.uno%,lnth:liblnth.uno%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst jvmfwk:libuno_jvmfwk%,jvmfwk:libjvmfwk%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst mysql:mysql%,mysql:libmysql%,$(gb_Library_FILENAMES))
+gb_Library_FILENAMES := $(patsubst odbc:odbc%,odbc:libodbc%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst reg:libuno_reg%,reg:libreg%,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst pyuno_loader:libpyuno%,pyuno_loader:pyuno.so,$(gb_Library_FILENAMES))
gb_Library_FILENAMES := $(patsubst salhelper:libsalhelper%,salhelper:libuno_salhelper%,$(gb_Library_FILENAMES))
diff --git a/main/chart2/AllLangResTarget_chartcontroller.mk b/main/chart2/AllLangResTarget_chartcontroller.mk
new file mode 100644
index 0000000000..fff62ead8f
--- /dev/null
+++ b/main/chart2/AllLangResTarget_chartcontroller.mk
@@ -0,0 +1,200 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_AllLangResTarget_AllLangResTarget,chartcontroller))
+
+$(eval $(call gb_AllLangResTarget_set_reslocation,chartcontroller,chart2))
+
+$(eval $(call gb_AllLangResTarget_add_srs,chartcontroller,\
+ chartcontroller/controller \
+))
+
+$(eval $(call gb_SrsTarget_SrsTarget,chartcontroller/controller))
+
+$(eval $(call gb_SrsTarget_set_include,chartcontroller/controller,\
+ $$(INCLUDE) \
+ -I$(OUTDIR)/inc \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/controller/inc \
+ -I$(SRCDIR)/chart2/source/controller/dialogs \
+ -I$(WORKDIR)/inc/chart2 \
+))
+
+$(eval $(call gb_SrsTarget_add_files,chartcontroller/controller,\
+ chart2/source/controller/dialogs/res_TextSeparator.src \
+ chart2/source/controller/dialogs/res_BarGeometry.src \
+ chart2/source/controller/dialogs/tp_ChartType.src \
+ chart2/source/controller/dialogs/tp_RangeChooser.src \
+ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src \
+ chart2/source/controller/dialogs/tp_Location.src \
+ chart2/source/controller/dialogs/tp_AxisLabel.src \
+ chart2/source/controller/dialogs/tp_AxisPositions.src \
+ chart2/source/controller/dialogs/tp_DataLabel.src \
+ chart2/source/controller/dialogs/tp_DataSource.src \
+ chart2/source/controller/dialogs/tp_LegendPosition.src \
+ chart2/source/controller/dialogs/tp_PointGeometry.src \
+ chart2/source/controller/dialogs/tp_Scale.src \
+ chart2/source/controller/dialogs/tp_Trendline.src \
+ chart2/source/controller/dialogs/tp_ErrorBars.src \
+ chart2/source/controller/dialogs/tp_SeriesToAxis.src \
+ chart2/source/controller/dialogs/tp_TitleRotation.src \
+ chart2/source/controller/dialogs/tp_3D_SceneGeometry.src \
+ chart2/source/controller/dialogs/tp_3D_SceneAppearance.src \
+ chart2/source/controller/dialogs/tp_3D_SceneIllumination.src \
+ chart2/source/controller/dialogs/tp_PolarOptions.src \
+ chart2/source/controller/dialogs/dlg_ObjectProperties.src \
+ chart2/source/controller/dialogs/Strings_Statistic.src \
+ chart2/source/controller/dialogs/Strings_Scale.src \
+ chart2/source/controller/dialogs/Strings_ChartTypes.src \
+ chart2/source/controller/dialogs/Strings_AdditionalControls.src \
+ chart2/source/controller/dialogs/Strings.src \
+ chart2/source/controller/dialogs/Bitmaps.src \
+ chart2/source/controller/dialogs/Bitmaps_HC.src \
+ chart2/source/controller/dialogs/dlg_DataEditor.src \
+ chart2/source/controller/dialogs/dlg_DataSource.src \
+ chart2/source/controller/dialogs/dlg_View3D.src \
+ chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src \
+ chart2/source/controller/dialogs/dlg_InsertDataLabel.src \
+ chart2/source/controller/dialogs/dlg_InsertLegend.src \
+ chart2/source/controller/dialogs/dlg_InsertTrendline.src \
+ chart2/source/controller/dialogs/dlg_InsertErrorBars.src \
+ chart2/source/controller/dialogs/dlg_InsertTitle.src \
+ chart2/source/controller/dialogs/dlg_ChartType.src \
+ chart2/source/controller/dialogs/dlg_CreationWizard.src \
+ chart2/source/controller/dialogs/dlg_ShapeFont.src \
+ chart2/source/controller/dialogs/dlg_ShapeParagraph.src \
+ chart2/source/controller/menus/ShapeContextMenu.src \
+ chart2/source/controller/menus/ShapeEditContextMenu.src \
+))
+
+
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_DataLabel.src) : $(WORKDIR)/inc/chart2/res_DataLabel.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertDataLabel.src) : $(WORKDIR)/inc/chart2/res_DataLabel.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertLegend.src) : $(WORKDIR)/inc/chart2/res_LegendPosition.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src) : $(WORKDIR)/inc/chart2/res_LegendPosition.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_LegendPosition.src) : $(WORKDIR)/inc/chart2/res_LegendPosition.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_Trendline.src) : $(WORKDIR)/inc/chart2/res_Trendline.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertTrendline.src) : $(WORKDIR)/inc/chart2/res_Trendline.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_ErrorBars.src) : $(WORKDIR)/inc/chart2/res_ErrorBar.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertErrorBars.src) : $(WORKDIR)/inc/chart2/res_ErrorBar.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src) : $(WORKDIR)/inc/chart2/res_Titlesx.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertTitle.src) : $(WORKDIR)/inc/chart2/res_Titlesx.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/dlg_InsertAxis_Grid.src) : $(WORKDIR)/inc/chart2/res_SecondaryAxisCheckBoxes.hrc
+$(call gb_SrsPartTarget_get_target,chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.src) : $(WORKDIR)/inc/chart2/res_SecondaryAxisCheckBoxes.hrc
+
+
+ifeq ($(strip $(WITH_LANG)),)
+
+$(WORKDIR)/inc/chart2/res_DataLabel.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+$(WORKDIR)/inc/chart2/res_LegendPosition.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+$(WORKDIR)/inc/chart2/res_Trendline.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+$(WORKDIR)/inc/chart2/res_ErrorBar.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+$(WORKDIR)/inc/chart2/res_Titlesx.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+$(WORKDIR)/inc/chart2/res_SecondaryAxisCheckBoxes.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc
+ echo copying $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ cp $< $@
+
+else
+
+$(WORKDIR)/inc/chart2/res_DataLabel.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_DataLabel_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+$(WORKDIR)/inc/chart2/res_LegendPosition.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_LegendPosition_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+$(WORKDIR)/inc/chart2/res_Trendline.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_Trendline_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+$(WORKDIR)/inc/chart2/res_ErrorBar.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_ErrorBar_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+$(WORKDIR)/inc/chart2/res_Titlesx.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_Titlesx_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+$(WORKDIR)/inc/chart2/res_SecondaryAxisCheckBoxes.hrc : $(SRCDIR)/chart2/source/controller/dialogs/res_SecondaryAxisCheckBoxes_tmpl.hrc
+ echo merging $@
+ -mkdir -p $(WORKDIR)/inc/chart2
+ $(call gb_Helper_abbreviate_dirs_native, \
+ $(gb_SrsPartMergeTarget_TRANSEXCOMMAND) \
+ -p chart2 \
+ -i $< -o $@ -m $(gb_SrsPartMergeTarget_SDFLOCATION)/chart2/source/controller/dialogs/localize.sdf -l all)
+
+endif
+
+
+.PHONY : $(WORKDIR)/inc/chart2/hrc_clean
+ rm -f \
+ $(WORKDIR)/inc/chart2/res_DataLabel.hrc \
+ $(WORKDIR)/inc/chart2/res_LegendPosition.hrc \
+ $(WORKDIR)/inc/chart2/res_Trendline.hrc \
+ $(WORKDIR)/inc/chart2/res_ErrorBar.hrc \
+ $(WORKDIR)/inc/chart2/res_Titlesx.hrc \
+ $(WORKDIR)/inc/chart2/res_SecondaryAxisCheckBoxes.hrc
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/chart2/Module_chart2.mk b/main/chart2/Module_chart2.mk
index 4c3448ebf0..4c357ed348 100644
--- a/main/chart2/Module_chart2.mk
+++ b/main/chart2/Module_chart2.mk
@@ -24,6 +24,7 @@
$(eval $(call gb_Module_Module,chart2))
$(eval $(call gb_Module_add_targets,chart2,\
+ AllLangResTarget_chartcontroller \
Library_chartcontroller \
Library_chartmodel \
Library_chartview \
diff --git a/main/chart2/Module_chart2.mk b/main/connectivity/Ant_dbtools.mk
similarity index 82%
copy from main/chart2/Module_chart2.mk
copy to main/connectivity/Ant_dbtools.mk
index 4c3448ebf0..3fbf3edfdd 100644
--- a/main/chart2/Module_chart2.mk
+++ b/main/connectivity/Ant_dbtools.mk
@@ -21,15 +21,7 @@
-$(eval $(call gb_Module_Module,chart2))
-
-$(eval $(call gb_Module_add_targets,chart2,\
- Library_chartcontroller \
- Library_chartmodel \
- Library_chartview \
- Library_charttools \
- Package_uiconfig \
-))
-
+$(eval $(call gb_Ant_Ant,dbtools,$(SRCDIR)/connectivity/java/dbtools/build.xml))
# vim: set noet sw=4 ts=4:
+
diff --git a/main/connectivity/java/sdbc_hsqldb/makefile.mk b/main/connectivity/Ant_sdbc_hsqldb.mk
similarity index 82%
rename from main/connectivity/java/sdbc_hsqldb/makefile.mk
rename to main/connectivity/Ant_sdbc_hsqldb.mk
index 81304f6228..dcfc9b7115 100644
--- a/main/connectivity/java/sdbc_hsqldb/makefile.mk
+++ b/main/connectivity/Ant_sdbc_hsqldb.mk
@@ -21,18 +21,8 @@
-PRJ=..$/..
-PRJNAME=connectivity
-TARGET=sdbc_hsqldb
+$(eval $(call gb_Ant_Ant,sdbc_hsqldb,$(SRCDIR)/connectivity/java/sdbc_hsqldb/build.xml))
-.INCLUDE : ant.mk
-.IF defined(debug) || defined(DEBUG)
-ANTDEBUG=true
-.ELSE
-ANTDEBUG=off
-.ENDIF
+# vim: set noet sw=4 ts=4:
-ANT_FLAGS+=-Dantdebug=$(ANTDEBUG)
-
-ALLTAR: ANTBUILD
diff --git a/main/connectivity/java/dbtools/makefile.mk b/main/connectivity/Ant_sdbc_jdbc.mk
similarity index 78%
rename from main/connectivity/java/dbtools/makefile.mk
rename to main/connectivity/Ant_sdbc_jdbc.mk
index 8df3a6423a..531946fdb4 100644
--- a/main/connectivity/java/dbtools/makefile.mk
+++ b/main/connectivity/Ant_sdbc_jdbc.mk
@@ -21,20 +21,9 @@
-PRJ=..$/..
-PRJNAME=connectivity
-TARGET=dbtools
+$(eval $(call gb_Ant_Ant,sdbc_jdbc,$(SRCDIR)/connectivity/java/sdbc_jdbc/build.xml))
-# --- Settings -----------------------------------------------------
+$(eval $(call gb_Ant_set_componentfile,sdbc_jdbc,connectivity/java/sdbc_jdbc/jdbc,OOO))
-.INCLUDE : ant.mk
+# vim: set noet sw=4 ts=4:
-.IF defined(debug) || defined(DEBUG)
-ANTDEBUG=true
-.ELSE
-ANTDEBUG=off
-.ENDIF
-
-ANT_FLAGS+=-Dantdebug=$(ANTDEBUG)
-
-ALLTAR: ANTBUILD
diff --git a/main/chart2/Module_chart2.mk b/main/connectivity/Ant_sdbc_postgresql.mk
similarity index 82%
copy from main/chart2/Module_chart2.mk
copy to main/connectivity/Ant_sdbc_postgresql.mk
index 4c3448ebf0..e23db589a1 100644
--- a/main/chart2/Module_chart2.mk
+++ b/main/connectivity/Ant_sdbc_postgresql.mk
@@ -21,15 +21,9 @@
-$(eval $(call gb_Module_Module,chart2))
-
-$(eval $(call gb_Module_add_targets,chart2,\
- Library_chartcontroller \
- Library_chartmodel \
- Library_chartview \
- Library_charttools \
- Package_uiconfig \
-))
+$(eval $(call gb_Ant_Ant,sdbc_postgresql,$(SRCDIR)/connectivity/java/sdbc_postgresql/build.xml))
+$(eval $(call gb_Ant_set_componentfile,sdbc_postgresql,connectivity/java/sdbc_postgresql/postgresql,OOO))
# vim: set noet sw=4 ts=4:
+
diff --git a/main/connectivity/Configuration_connectivity.mk b/main/connectivity/Configuration_connectivity.mk
new file mode 100644
index 0000000000..3eceda5d1a
--- /dev/null
+++ b/main/connectivity/Configuration_connectivity.mk
@@ -0,0 +1,68 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Configuration_Configuration,connectivity,SRCDIR))
+
+$(call gb_Configuration_add_schemas,connectivity,connectivity/registry,\
+ org/openoffice/Office/DataAccess/adabas.xcs \
+ org/openoffice/Office/DataAccess/ado.xcs \
+ org/openoffice/Office/DataAccess/calc.xcs \
+ org/openoffice/Office/DataAccess/dbase.xcs \
+ org/openoffice/Office/DataAccess/evoab2.xcs \
+ org/openoffice/Office/DataAccess/flat.xcs \
+ org/openoffice/Office/DataAccess/hsqldb.xcs \
+ org/openoffice/Office/DataAccess/jdbc.xcs \
+ org/openoffice/Office/DataAccess/macab.xcs \
+ org/openoffice/Office/DataAccess/mysql.xcs \
+ org/openoffice/Office/DataAccess/odbc.xcs \
+ org/openoffice/Office/DataAccess/sdbc_jdbc.xcs \
+ org/openoffice/Office/DataAccess/sdbc_postgresql.xcs \
+)
+
+$(call gb_Configuration_add_datas,connectivity,connectivity/registry,\
+ org/openoffice/Office/DataAccess/adabas.xcu \
+ org/openoffice/Office/DataAccess/ado.xcu \
+ org/openoffice/Office/DataAccess/calc.xcu \
+ org/openoffice/Office/DataAccess/dbase.xcu \
+ org/openoffice/Office/DataAccess/evoab2.xcu \
+ org/openoffice/Office/DataAccess/flat.xcu \
+ org/openoffice/Office/DataAccess/hsqldb.xcu \
+ org/openoffice/Office/DataAccess/jdbc.xcu \
+ org/openoffice/Office/DataAccess/macab.xcu \
+ org/openoffice/Office/DataAccess/mysql.xcu \
+ org/openoffice/Office/DataAccess/odbc.xcu \
+ org/openoffice/Office/DataAccess/sdbc_jdbc.xcu \
+ org/openoffice/Office/DataAccess/sdbc_postgresql.xcu \
+)
+
+$(call gb_Configuration_add_localized_datas,connectivity,connectivity/registry,\
+ org/openoffice/Office/DataAccess/adabas.xcu \
+ org/openoffice/Office/DataAccess/ado.xcu \
+ org/openoffice/Office/DataAccess/calc.xcu \
+ org/openoffice/Office/DataAccess/dbase.xcu \
+ org/openoffice/Office/DataAccess/evoab2.xcu \
+ org/openoffice/Office/DataAccess/flat.xcu \
+ org/openoffice/Office/DataAccess/hsqldb.xcu \
+ org/openoffice/Office/DataAccess/jdbc.xcu \
+ org/openoffice/Office/DataAccess/macab.xcu \
+ org/openoffice/Office/DataAccess/mysql.xcu \
+ org/openoffice/Office/DataAccess/odbc.xcu \
+ org/openoffice/Office/DataAccess/sdbc_jdbc.xcu \
+ org/openoffice/Office/DataAccess/sdbc_postgresql.xcu \
+)
diff --git a/main/connectivity/Library_jdbc.mk b/main/connectivity/Library_jdbc.mk
deleted file mode 100644
index e81b2a0f74..0000000000
--- a/main/connectivity/Library_jdbc.mk
+++ /dev/null
@@ -1,91 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-$(eval $(call gb_Library_Library,jdbc))
-
-$(eval $(call gb_Library_add_precompiled_header,jdbc,$(SRCDIR)/connectivity/inc/pch/precompiled_jdbc))
-
-$(eval $(call gb_Library_set_componentfile,jdbc,connectivity/source/drivers/jdbc/jdbc))
-
-$(eval $(call gb_Library_set_include,jdbc,\
- $$(INCLUDE) \
- -I$(SRCDIR)/connectivity/inc \
- -I$(SRCDIR)/connectivity/inc/pch \
- -I$(SRCDIR)/connectivity/source/inc \
- -I$(SRCDIR)/connectivity/source/drivers/jdbc \
- -I$(WORKDIR)/CustomTarget/connectivity/source/parse \
-))
-
-$(eval $(call gb_Library_add_api,jdbc,\
- offapi \
- udkapi \
-))
-
-$(eval $(call gb_Library_add_linked_libs,jdbc,\
- comphelper \
- cppuhelper \
- cppu \
- dbtools \
- jvmaccess \
- jvmfwk \
- sal \
- stl \
- utl \
- vos3 \
- $(gb_STDLIBS) \
-))
-
-$(eval $(call gb_Library_add_exception_objects,jdbc,\
- connectivity/source/drivers/jdbc/Array \
- connectivity/source/drivers/jdbc/Blob \
- connectivity/source/drivers/jdbc/Boolean \
- connectivity/source/drivers/jdbc/CallableStatement \
- connectivity/source/drivers/jdbc/Class \
- connectivity/source/drivers/jdbc/Clob \
- connectivity/source/drivers/jdbc/ConnectionLog \
- connectivity/source/drivers/jdbc/DatabaseMetaData \
- connectivity/source/drivers/jdbc/Date \
- connectivity/source/drivers/jdbc/DriverPropertyInfo \
- connectivity/source/drivers/jdbc/Exception \
- connectivity/source/drivers/jdbc/InputStream \
- connectivity/source/drivers/jdbc/JConnection \
- connectivity/source/drivers/jdbc/JDriver \
- connectivity/source/drivers/jdbc/JStatement \
- connectivity/source/drivers/jdbc/Object \
- connectivity/source/drivers/jdbc/PreparedStatement \
- connectivity/source/drivers/jdbc/Reader \
- connectivity/source/drivers/jdbc/Ref \
- connectivity/source/drivers/jdbc/ResultSet \
- connectivity/source/drivers/jdbc/ResultSetMetaData \
- connectivity/source/drivers/jdbc/SQLException \
- connectivity/source/drivers/jdbc/SQLWarning \
- connectivity/source/drivers/jdbc/String \
- connectivity/source/drivers/jdbc/Throwable \
- connectivity/source/drivers/jdbc/Timestamp \
- connectivity/source/drivers/jdbc/jservices \
- connectivity/source/drivers/jdbc/JBigDecimal \
- connectivity/source/drivers/jdbc/tools \
- connectivity/source/drivers/jdbc/ContextClassLoader \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/connectivity/Module_connectivity.mk b/main/connectivity/Module_connectivity.mk
index b42691097f..9367423f13 100644
--- a/main/connectivity/Module_connectivity.mk
+++ b/main/connectivity/Module_connectivity.mk
@@ -28,6 +28,11 @@ $(eval $(call gb_Module_add_targets,connectivity,\
AllLangResTarget_hsqldb \
AllLangResTarget_sdbcl \
AllLangResTarget_sdberr \
+ Ant_dbtools \
+ Ant_sdbc_hsqldb \
+ Ant_sdbc_jdbc \
+ Ant_sdbc_postgresql \
+ Configuration_connectivity \
Library_adabas \
Library_calc \
Library_dbase \
@@ -36,7 +41,6 @@ $(eval $(call gb_Module_add_targets,connectivity,\
Library_file \
Library_flat \
Library_hsqldb \
- Library_jdbc \
Library_mysql \
Library_odbc \
Library_odbcbase \
diff --git a/main/connectivity/java/dbtools/build.xml b/main/connectivity/java/dbtools/build.xml
index 1278ddee6d..628315bc80 100644
--- a/main/connectivity/java/dbtools/build.xml
+++ b/main/connectivity/java/dbtools/build.xml
@@ -21,228 +21,24 @@
***********************************************************-->
+
<project name="dbtools" default="main" basedir=".">
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- global properties -->
<property file="../../../ant.properties"/>
- <!-- version info -->
- <property file="../../../solenv/inc/minor.mk"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="dbtools"/>
-
- <!-- name of jar file created, without .jar extension -->
- <property name="jarname" value="dbtools"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value="../.."/>
-
- <!-- build output directory -->
- <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
- <condition property="out" value="${prj}/${OUTPATH}.cap">
- <isset property="${profile}"/>
- </condition>
- <condition property="out" value="${prj}/${OUTPATH}.pro">
- <isset property="${PRODUCT}"/>
- </condition>
- <property name="out" value="${prj}/${OUTPATH}"/>
-
- <!-- build directories -->
- <property name="build.dir" value="${out}"/>
- <property name="build.class" value="${build.dir}/class/${target}"/>
- <property name="build.misc" value="${build.dir}/misc/${target}"/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="src"/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <!-- classpath settings for compile and javadoc tasks -->
- <condition property="jar-class-path" value="${COMMONS_LANG_JAR}" else="commons-lang3-3.3.jar">
- <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
- </condition>
- <condition property="commons-lang-jar" value="${COMMONS_LANG_JAR}" else="${OUTDIR}/bin/commons-lang3-3.3.jar">
- <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
- </condition>
- <path id="classpath">
- <pathelement location="${OUTDIR}/bin/juh.jar"/>
- <pathelement location="${OUTDIR}/bin/jurt.jar"/>
- <pathelement location="${OUTDIR}/bin/ridl.jar"/>
- <pathelement location="${OUTDIR}/bin/unoil.jar"/>
- <!-- 3rd party libs -->
- <pathelement location="${commons-lang-jar}"/>
- </path>
-
- <!-- name to display in documentation -->
- <property name="docname" value="dbtools"/>
-
- <!-- set "modern" java compiler -->
- <property name="build.compiler" value="modern"/>
-
- <!-- set whether we want to compile with debug information -->
- <property name="debug" value="on"/>
-
- <!-- set whether we want to compile with optimisation -->
- <property name="optimize" value="off"/>
-
- <!-- set whether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
-
- <!-- prepare output directories -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/doc/${target}"/>
- <mkdir dir="${build.class}"/>
- <mkdir dir="${build.misc}"/>
- </target>
-
-
- <target name="res" depends="prepare">
- <copy todir="${build.class}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
-
- </fileset>
- </copy>
- </target>
-
-
- <target name="compile" depends="prepare,res">
- <javac destdir="${build.class}"
- debug="${debug}"
- debuglevel="lines,vars,source"
- deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- check if javadoc is up to date -->
- <target name="javadoc_check" depends="prepare" if="build.dir">
- <uptodate property="javadocBuild.notRequired" value="true"
- targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
- <srcfiles dir="${java.dir}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- generate java documentation -->
- <target name="javadoc" depends="prepare,javadoc_check,compile"
- unless="javadocBuild.notRequired"
- if="build.dir">
-
- <javadoc destdir="${build.dir}/doc/${target}/javadoc"
- verbose="false"
- author="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- use="true"
- Doctitle="${docname}"
- windowtitle="${docname}"
- classpathref="classpath">
-
- <packageset dir="${java.dir}" defaultexcludes="yes">
- <include name="com/**"/>
- <include name="org/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
- packagelistLoc="${common.doc}/jdk1.4.2"/>
- <link offline="true"
- href="http://java.sun.com/products/servlet/2.3/javadoc"
- packagelistLoc="${common.doc}/servlet2.3"/>
- <link offline="true"
- href="http://logging.apache.org/log4j/docs/api"
- packagelistLoc="${common.doc}/log4j-1.2.8"/>
- <link offline="true"
- href="http://java.sun.com/products/javabeans/glasgow/javadocs"
- packagelistLoc="${common.doc}/jaf-1.0.2"/>
- <link offline="true"
- href="http://java.sun.com/products/javamail/javadocs"
- packagelistLoc="${common.doc}/javamail-1.3.1"/>
- <link offline="true"
- href="http://ws.apache.org/soap/docs"
- packagelistLoc="${common.doc}/soap-2.3.1"/>
-
- <bottom><i>Copyright &#169; 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
- <header>${docname}</header>
-
- </javadoc>
- </target>
-
- <!-- zip documentation and store in build/doc/${target} -->
- <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
- <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
- basedir="${build.dir}/doc/${target}/javadoc"
- update="true"/>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete dir="${build.class}" includeEmptyDirs="true"/>
- <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
- </target>
-
- <!-- create jar file -->
- <target name="jar" depends="prepare,compile" if="build.class">
- <jar jarfile="${build.class}/${jarname}.jar"
- basedir="${build.class}">
- <manifest>
- <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar"/>
- <attribute name="Solar-Version" value="${RSCREVISION}"/>
- <attribute name="RegistrationClassName" value="com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver"/>
- <attribute name="Sealed" value="true"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
- </jar>
- </target>
-
- <target name="test" depends="prepare">
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.classpath" value="${external.commons-lang.jarclasspath} juh.jar jurt.jar ridl.jar unoil.jar"/>
+ <property name="jar.sealed" value="true"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <!-- 3rd party libs -->
+ <pathelement location="${external.commons-lang.path}"/>
+ </path>
</target>
</project>
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/CompHelper.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/EventLogger.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/EventLogger.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/EventLogger.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/EventLogger.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OArrayEnumeration.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByIndex.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OEnumerationByName.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/OfficeResourceBundle.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySet.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/PropertySetAdapter.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ResourceBasedEventLogger.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ResourceBasedEventLogger.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ResourceBasedEventLogger.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/comphelper/ResourceBasedEventLogger.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OCatalog.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumn.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OColumnContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/ODescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndex.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumn.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexColumnContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OIndexContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKey.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumn.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyColumnContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OKeyContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OTable.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/OView.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/SqlTableHelper.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxColumnDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexColumnDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxIndexDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyColumnDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxKeyDescriptorContainer.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxTableDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/sdbcx/descriptors/SdbcxViewDescriptor.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/AutoRetrievingBase.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/AutoRetrievingBase.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/AutoRetrievingBase.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/AutoRetrievingBase.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ComposeRule.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomColumn.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomColumn.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomColumn.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomColumn.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSet.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSet.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSet.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSet.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSetMetaData.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSetMetaData.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSetMetaData.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/CustomResultSetMetaData.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DBTypeConversion.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DatabaseMetaDataResultSet.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/DbTools.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ISQLStatementHelper.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameAccessAdapter.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/MapToXNameContainerAdapter.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/ORowSetValue.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/Osl.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/PropertyIds.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/Resources.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/SharedResources.java
diff --git a/main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java b/main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java
similarity index 100%
rename from main/connectivity/java/dbtools/src/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java
rename to main/connectivity/java/dbtools/src/main/java/org/apache/openoffice/comp/sdbc/dbtools/util/StandardSQLState.java
diff --git a/main/connectivity/java/sdbc_hsqldb/build.xml b/main/connectivity/java/sdbc_hsqldb/build.xml
index d3b166cec9..8af6c22692 100644
--- a/main/connectivity/java/sdbc_hsqldb/build.xml
+++ b/main/connectivity/java/sdbc_hsqldb/build.xml
@@ -21,218 +21,19 @@
***********************************************************-->
+
<project name="sdbc_hsqldb" default="main" basedir=".">
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- global properties -->
<property file="../../../ant.properties"/>
- <!-- version info -->
- <property file="../../../solenv/inc/minor.mk"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="sdbc_hsqldb"/>
-
- <!-- name of jar file created, without .jar extension -->
- <property name="jarname" value="sdbc_hsqldb"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value="../.."/>
-
- <!-- build output directory -->
- <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
- <condition property="out" value="${prj}/${OUTPATH}.cap">
- <isset property="${profile}"/>
- </condition>
- <condition property="out" value="${prj}/${OUTPATH}.pro">
- <isset property="${PRODUCT}"/>
- </condition>
- <property name="out" value="${prj}/${OUTPATH}"/>
-
- <!-- build directories -->
- <property name="build.dir" value="${out}"/>
- <property name="build.class" value="${build.dir}/class/${target}"/>
- <property name="build.misc" value="${build.dir}/misc/${target}"/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="src"/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <!-- classpath settings for compile and javadoc tasks -->
- <condition property="jar-class-path" value="${HSQLDB_JAR}" else="hsqldb.jar">
- <equals arg1="${SYSTEM_HSQLDB}" arg2="YES"/>
- </condition>
- <property name="HSQLDB_JAR" value="${OUTDIR}/bin/hsqldb.jar"/>
- <path id="classpath">
- <!-- 3rd party libs -->
- <pathelement location="${HSQLDB_JAR}"/>
- </path>
-
- <!-- name to display in documentation -->
- <property name="docname" value="sdbc_hsqldb"/>
-
- <!-- set "modern" java compiler -->
- <property name="build.compiler" value="modern"/>
-
- <!-- set whether we want to compile with debug information -->
- <property name="debug" value="on"/>
-
- <!-- set whether we want to compile with optimisation -->
- <property name="optimize" value="off"/>
-
- <!-- set whether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
-
- <!-- prepare output directories -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/doc/${target}"/>
- <mkdir dir="${build.class}"/>
- <mkdir dir="${build.misc}"/>
- </target>
-
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
- <target name="res" depends="prepare">
- <copy todir="${build.class}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
-
- </fileset>
- </copy>
- </target>
-
-
- <target name="compile" depends="prepare,res">
- <javac destdir="${build.class}"
- debug="${debug}"
- deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- check if javadoc is up to date -->
- <target name="javadoc_check" depends="prepare" if="build.dir">
- <uptodate property="javadocBuild.notRequired" value="true"
- targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
- <srcfiles dir="${java.dir}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- generate java documentation -->
- <target name="javadoc" depends="prepare,javadoc_check,compile"
- unless="javadocBuild.notRequired"
- if="build.dir">
-
- <javadoc destdir="${build.dir}/doc/${target}/javadoc"
- verbose="false"
- author="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- use="true"
- Doctitle="${docname}"
- windowtitle="${docname}"
- classpathref="classpath">
-
- <packageset dir="${java.dir}" defaultexcludes="yes">
- <include name="com/**"/>
- <include name="org/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
- packagelistLoc="${common.doc}/jdk1.4.2"/>
- <link offline="true"
- href="http://java.sun.com/products/servlet/2.3/javadoc"
- packagelistLoc="${common.doc}/servlet2.3"/>
- <link offline="true"
- href="http://logging.apache.org/log4j/docs/api"
- packagelistLoc="${common.doc}/log4j-1.2.8"/>
- <link offline="true"
- href="http://java.sun.com/products/javabeans/glasgow/javadocs"
- packagelistLoc="${common.doc}/jaf-1.0.2"/>
- <link offline="true"
- href="http://java.sun.com/products/javamail/javadocs"
- packagelistLoc="${common.doc}/javamail-1.3.1"/>
- <link offline="true"
- href="http://ws.apache.org/soap/docs"
- packagelistLoc="${common.doc}/soap-2.3.1"/>
-
- <bottom><i>Copyright &#169; 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
- <header>${docname}</header>
-
- </javadoc>
- </target>
-
- <!-- zip documentation and store in build/doc/${target} -->
- <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
- <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
- basedir="${build.dir}/doc/${target}/javadoc"
- update="true"/>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete dir="${build.class}" includeEmptyDirs="true"/>
- <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
- </target>
-
- <!-- create jar file -->
- <target name="jar" depends="prepare,compile" if="build.class">
- <jar jarfile="${build.class}/${jarname}.jar"
- basedir="${build.class}">
- <manifest>
- <attribute name="Class-Path" value="${jar-class-path} .."/>
- <attribute name="Solar-Version" value="${RSCREVISION}"/>
- </manifest>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
- </jar>
- </target>
+ <target name="init-project">
+ <property name="jar.classpath" value="${external.hsqldb.jarclasspath} .."/>
- <target name="test" depends="prepare">
+ <path id="main.classpath">
+ <!-- 3rd party libs -->
+ <pathelement location="${external.hsqldb.path}"/>
+ </path>
</target>
</project>
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeOutputStreamHelper.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/NativeStorageAccess.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageAccess.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageFileAccess.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeInputStream.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/com/sun/star/sdbcx/comp/hsqldb/StorageNativeOutputStream.java
diff --git a/main/connectivity/java/sdbc_hsqldb/src/org/hsqldb/lib/FileSystemRuntimeException.java b/main/connectivity/java/sdbc_hsqldb/src/main/java/org/hsqldb/lib/FileSystemRuntimeException.java
similarity index 100%
rename from main/connectivity/java/sdbc_hsqldb/src/org/hsqldb/lib/FileSystemRuntimeException.java
rename to main/connectivity/java/sdbc_hsqldb/src/main/java/org/hsqldb/lib/FileSystemRuntimeException.java
diff --git a/main/connectivity/java/sdbc_jdbc/build.xml b/main/connectivity/java/sdbc_jdbc/build.xml
index 51725a5255..80b3f45af2 100644
--- a/main/connectivity/java/sdbc_jdbc/build.xml
+++ b/main/connectivity/java/sdbc_jdbc/build.xml
@@ -21,229 +21,26 @@
***********************************************************-->
+
<project name="sdbc_jdbc" default="main" basedir=".">
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- global properties -->
<property file="../../../ant.properties"/>
- <!-- version info -->
- <property file="../../../solenv/inc/minor.mk"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="sdbc_jdbc"/>
-
- <!-- name of jar file created, without .jar extension -->
- <property name="jarname" value="sdbc_jdbc"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value="../.."/>
-
- <!-- build output directory -->
- <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
- <condition property="out" value="${prj}/${OUTPATH}.cap">
- <isset property="${profile}"/>
- </condition>
- <condition property="out" value="${prj}/${OUTPATH}.pro">
- <isset property="${PRODUCT}"/>
- </condition>
- <property name="out" value="${prj}/${OUTPATH}"/>
-
- <!-- build directories -->
- <property name="build.dir" value="${out}"/>
- <property name="build.class" value="${build.dir}/class/${target}"/>
- <property name="build.misc" value="${build.dir}/misc/${target}"/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="src"/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <!-- classpath settings for compile and javadoc tasks -->
- <condition property="jar-class-path" value="${COMMONS_LANG_JAR}" else="commons-lang3-3.3.jar">
- <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
- </condition>
- <condition property="commons-lang-jar" value="${COMMONS_LANG_JAR}" else="${OUTDIR}/bin/commons-lang3-3.3.jar">
- <equals arg1="${SYSTEM_APACHE_COMMONS}" arg2="YES"/>
- </condition>
- <path id="classpath">
- <pathelement location="${OUTDIR}/bin/juh.jar"/>
- <pathelement location="${OUTDIR}/bin/jurt.jar"/>
- <pathelement location="${OUTDIR}/bin/ridl.jar"/>
- <pathelement location="${OUTDIR}/bin/unoil.jar"/>
- <pathelement location="${out}/class/dbtools/dbtools.jar"/>
- <!-- 3rd party libs -->
- <pathelement location="${commons-lang-jar}"/>
- </path>
-
- <!-- name to display in documentation -->
- <property name="docname" value="sdbc_jdbc"/>
-
- <!-- set "modern" java compiler -->
- <property name="build.compiler" value="modern"/>
-
- <!-- set whether we want to compile with debug information -->
- <property name="debug" value="on"/>
-
- <!-- set whether we want to compile with optimisation -->
- <property name="optimize" value="off"/>
-
- <!-- set whether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
-
- <!-- prepare output directories -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/doc/${target}"/>
- <mkdir dir="${build.class}"/>
- <mkdir dir="${build.misc}"/>
- </target>
-
-
- <target name="res" depends="prepare">
- <copy todir="${build.class}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
-
- </fileset>
- </copy>
- </target>
-
-
- <target name="compile" depends="prepare,res">
- <javac destdir="${build.class}"
- debug="${debug}"
- debuglevel="lines,vars,source"
- deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- check if javadoc is up to date -->
- <target name="javadoc_check" depends="prepare" if="build.dir">
- <uptodate property="javadocBuild.notRequired" value="true"
- targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
- <srcfiles dir="${java.dir}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- generate java documentation -->
- <target name="javadoc" depends="prepare,javadoc_check,compile"
- unless="javadocBuild.notRequired"
- if="build.dir">
-
- <javadoc destdir="${build.dir}/doc/${target}/javadoc"
- verbose="false"
- author="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- use="true"
- Doctitle="${docname}"
- windowtitle="${docname}"
- classpathref="classpath">
-
- <packageset dir="${java.dir}" defaultexcludes="yes">
- <include name="com/**"/>
- <include name="org/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
- packagelistLoc="${common.doc}/jdk1.4.2"/>
- <link offline="true"
- href="http://java.sun.com/products/servlet/2.3/javadoc"
- packagelistLoc="${common.doc}/servlet2.3"/>
- <link offline="true"
- href="http://logging.apache.org/log4j/docs/api"
- packagelistLoc="${common.doc}/log4j-1.2.8"/>
- <link offline="true"
- href="http://java.sun.com/products/javabeans/glasgow/javadocs"
- packagelistLoc="${common.doc}/jaf-1.0.2"/>
- <link offline="true"
- href="http://java.sun.com/products/javamail/javadocs"
- packagelistLoc="${common.doc}/javamail-1.3.1"/>
- <link offline="true"
- href="http://ws.apache.org/soap/docs"
- packagelistLoc="${common.doc}/soap-2.3.1"/>
-
- <bottom><i>Copyright &#169; 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
- <header>${docname}</header>
-
- </javadoc>
- </target>
-
- <!-- zip documentation and store in build/doc/${target} -->
- <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
- <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
- basedir="${build.dir}/doc/${target}/javadoc"
- update="true"/>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete dir="${build.class}" includeEmptyDirs="true"/>
- <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
- </target>
-
- <!-- create jar file -->
- <target name="jar" depends="prepare,compile" if="build.class">
- <jar jarfile="${build.class}/${jarname}.jar"
- basedir="${build.class}">
- <manifest>
- <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar dbtools.jar"/>
- <attribute name="Solar-Version" value="${RSCREVISION}"/>
- <attribute name="RegistrationClassName" value="com.sun.star.comp.sdbc.JDBCDriver"/>
- <attribute name="Sealed" value="true"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
- </jar>
- </target>
-
- <target name="test" depends="prepare">
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.classpath" value="${external.commons-lang.jarclasspath} juh.jar jurt.jar ridl.jar unoil.jar dbtools.jar"/>
+ <property name="jar.registration-class-name" value="com.sun.star.comp.sdbc.JDBCDriver"/>
+ <property name="jar.sealed" value="true"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <pathelement location="${OUTDIR}/bin/dbtools.jar"/>
+ <!-- 3rd party libs -->
+ <pathelement location="${external.commons-lang.path}"/>
+ </path>
</target>
</project>
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/BoundedInputStream.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/BoundedInputStream.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/BoundedInputStream.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ClassMap.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ClassMap.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ClassMap.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ConnectionLog.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ConnectionLog.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ConnectionLog.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ConnectionLog.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ContextClassLoaderScope.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JDBCDriver.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JDBCDriver.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JDBCDriver.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLArray.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLArray.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLArray.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLArray.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLBlob.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLBlob.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLBlob.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLBlob.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLCallableStatement.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLClob.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLClob.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLClob.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLClob.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLConnection.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLConnection.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLConnection.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLDatabaseMetaData.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLPreparedStatement.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLRef.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLRef.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLRef.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLRef.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSet.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLResultSet.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSet.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLResultSet.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLResultSetMetaData.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatement.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLStatement.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatement.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLStatement.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatementBase.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLStatementBase.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/JavaSQLStatementBase.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/JavaSQLStatementBase.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ReaderInputStream.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ReaderInputStream.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/ReaderInputStream.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/ReaderInputStream.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/Tools.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/Tools.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/Tools.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/Tools.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/classloading/ClassLoaderAndClass.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/classloading/ClassLoaderAndClass.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/classloading/ClassLoaderAndClass.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/classloading/ClassLoaderAndClass.java
diff --git a/main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/classloading/ClassMap.java b/main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/classloading/ClassMap.java
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/src/com/sun/star/comp/sdbc/classloading/ClassMap.java
rename to main/connectivity/java/sdbc_jdbc/src/main/java/com/sun/star/comp/sdbc/classloading/ClassMap.java
diff --git a/main/connectivity/java/sdbc_postgresql/build.xml b/main/connectivity/java/sdbc_postgresql/build.xml
index a4daf7eb60..ce6d8cbb05 100644
--- a/main/connectivity/java/sdbc_postgresql/build.xml
+++ b/main/connectivity/java/sdbc_postgresql/build.xml
@@ -21,221 +21,24 @@
***********************************************************-->
+
<project name="sdbc_postgresql" default="main" basedir=".">
- <!-- ================================================================= -->
- <!-- settings -->
- <!-- ================================================================= -->
-
- <!-- global properties -->
<property file="../../../ant.properties"/>
- <!-- version info -->
- <property file="../../../solenv/inc/minor.mk"/>
-
- <!-- name of this sub target used in recursive builds -->
- <property name="target" value="sdbc_postgresql"/>
-
- <!-- name of jar file created, without .jar extension -->
- <property name="jarname" value="sdbc_postgresql"/>
-
- <!-- relative path to project directory -->
- <property name="prj" value="../.."/>
-
- <!-- build output directory -->
- <!-- FIXME: there are also extremely rare/obsolete dbcs/bndchk/truetime/hbtoolkit cases in main/solenv/inc/settings.mk -->
- <condition property="out" value="${prj}/${OUTPATH}.cap">
- <isset property="${profile}"/>
- </condition>
- <condition property="out" value="${prj}/${OUTPATH}.pro">
- <isset property="${PRODUCT}"/>
- </condition>
- <property name="out" value="${prj}/${OUTPATH}"/>
-
- <!-- build directories -->
- <property name="build.dir" value="${out}"/>
- <property name="build.class" value="${build.dir}/class/${target}"/>
- <property name="build.misc" value="${build.dir}/misc/${target}"/>
-
- <!-- start of java source code package structure -->
- <property name="java.dir" value="src"/>
-
- <!-- define how to handle CLASSPATH environment -->
- <property name="build.sysclasspath" value="ignore"/>
-
- <!-- classpath settings for compile and javadoc tasks -->
- <path id="classpath">
- <pathelement location="${OUTDIR}/bin/juh.jar"/>
- <pathelement location="${OUTDIR}/bin/jurt.jar"/>
- <pathelement location="${OUTDIR}/bin/ridl.jar"/>
- <pathelement location="${OUTDIR}/bin/unoil.jar"/>
- <pathelement location="${out}/class/dbtools/dbtools.jar"/>
- </path>
-
- <!-- name to display in documentation -->
- <property name="docname" value="sdbc_postgresql"/>
-
- <!-- set "modern" java compiler -->
- <property name="build.compiler" value="modern"/>
-
- <!-- set whether we want to compile with debug information -->
- <property name="debug" value="on"/>
-
- <!-- set whether we want to compile with optimisation -->
- <property name="optimize" value="off"/>
-
- <!-- set whether we want to compile with or without deprecation -->
- <property name="deprecation" value="on"/>
-
- <target name="info">
- <echo message="--------------------"/>
- <echo message="${target}"/>
- <echo message="--------------------"/>
- </target>
-
- <!-- ================================================================= -->
- <!-- custom targets -->
- <!-- ================================================================= -->
-
- <!-- the main target, called in recursive builds -->
- <target name="main" depends="info,prepare,compile,jar,javadoc,zipdoc"/>
-
- <!-- prepare output directories -->
- <target name="prepare">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/doc/${target}"/>
- <mkdir dir="${build.class}"/>
- <mkdir dir="${build.misc}"/>
- </target>
-
-
- <target name="res" depends="prepare">
- <copy todir="${build.class}">
- <fileset dir="${java.dir}">
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
-
- </fileset>
- </copy>
- </target>
-
-
- <target name="compile" depends="prepare,res">
- <javac destdir="${build.class}"
- debug="${debug}"
- debuglevel="lines,vars,source"
- deprecation="${deprecation}"
- optimize="${optimize}"
- classpathref="classpath">
- <src path="${java.dir}"/>
- <include name="**/*.java"/>
- </javac>
- </target>
-
- <!-- check if javadoc is up to date -->
- <target name="javadoc_check" depends="prepare" if="build.dir">
- <uptodate property="javadocBuild.notRequired" value="true"
- targetfile="${build.dir}/doc/${target}/${target}_javadoc.zip">
- <srcfiles dir="${java.dir}" includes="**/*.java"/>
- </uptodate>
- </target>
-
- <!-- generate java documentation -->
- <target name="javadoc" depends="prepare,javadoc_check,compile"
- unless="javadocBuild.notRequired"
- if="build.dir">
-
- <javadoc destdir="${build.dir}/doc/${target}/javadoc"
- verbose="false"
- author="false"
- nodeprecated="true"
- nodeprecatedlist="true"
- use="true"
- Doctitle="${docname}"
- windowtitle="${docname}"
- classpathref="classpath">
-
- <packageset dir="${java.dir}" defaultexcludes="yes">
- <include name="com/**"/>
- <include name="org/**"/>
- </packageset>
-
- <link offline="true" href="http://java.sun.com/j2se/1.4.2/docs/api"
- packagelistLoc="${common.doc}/jdk1.4.2"/>
- <link offline="true"
- href="http://java.sun.com/products/servlet/2.3/javadoc"
- packagelistLoc="${common.doc}/servlet2.3"/>
- <link offline="true"
- href="http://logging.apache.org/log4j/docs/api"
- packagelistLoc="${common.doc}/log4j-1.2.8"/>
- <link offline="true"
- href="http://java.sun.com/products/javabeans/glasgow/javadocs"
- packagelistLoc="${common.doc}/jaf-1.0.2"/>
- <link offline="true"
- href="http://java.sun.com/products/javamail/javadocs"
- packagelistLoc="${common.doc}/javamail-1.3.1"/>
- <link offline="true"
- href="http://ws.apache.org/soap/docs"
- packagelistLoc="${common.doc}/soap-2.3.1"/>
-
- <bottom><i>Copyright &#169; 2004 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, CA 94303 USA</i></bottom>
- <header>${docname}</header>
-
- </javadoc>
- </target>
-
- <!-- zip documentation and store in build/doc/${target} -->
- <target name="zipdoc" depends="javadoc" if="build.dir" unless="javadocBuild.notRequired">
- <zip zipfile="${build.dir}/doc/${target}/${target}_javadoc.zip"
- basedir="${build.dir}/doc/${target}/javadoc"
- update="true"/>
- </target>
-
- <!-- clean up -->
- <target name="clean" depends="prepare">
- <delete dir="${build.class}" includeEmptyDirs="true"/>
- <delete dir="${build.dir}/doc/${target}" includeEmptyDirs="true"/>
- </target>
-
- <!-- create jar file -->
- <target name="jar" depends="prepare,compile" if="build.class">
- <jar jarfile="${build.class}/${jarname}.jar"
- basedir="${build.class}">
- <manifest>
- <attribute name="Class-Path" value="${jar-class-path} juh.jar jurt.jar ridl.jar unoil.jar dbtools.jar"/>
- <attribute name="Solar-Version" value="${RSCREVISION}"/>
- <attribute name="RegistrationClassName" value="com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver"/>
- <attribute name="Sealed" value="true"/>
- <attribute name="UNO-Type-Path" value=""/>
- </manifest>
- <include name="**/*.class"/>
- <include name="**/*.properties"/>
- <include name="**/*.css"/>
- <include name="**/*.dtd"/>
- <include name="**/*.form"/>
- <include name="**/*.gif "/>
- <include name="**/*.htm"/>
- <include name="**/*.html"/>
- <include name="**/*.js"/>
- <include name="**/*.mod"/>
- <include name="**/*.sql"/>
- <include name="**/*.xml"/>
- <include name="**/*.xsl"/>
- <include name="**/*.map"/>
- </jar>
- </target>
-
- <target name="test" depends="prepare">
+ <import file="${SRC_ROOT}/solenv/ant/aoo-ant.xml"/>
+
+ <target name="init-project">
+ <property name="jar.classpath" value="juh.jar jurt.jar ridl.jar unoil.jar dbtools.jar"/>
+ <property name="jar.registration-class-name" value="com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver"/>
+ <property name="jar.sealed" value="true"/>
+
+ <path id="main.classpath">
+ <pathelement location="${OUTDIR}/bin/juh.jar"/>
+ <pathelement location="${OUTDIR}/bin/jurt.jar"/>
+ <pathelement location="${OUTDIR}/bin/ridl.jar"/>
+ <pathelement location="${OUTDIR}/bin/unoil.jar"/>
+ <pathelement location="${OUTDIR}/bin/dbtools.jar"/>
+ </path>
</target>
</project>
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlCatalog.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlConnection.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlConnection.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlConnection.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlConnection.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetaDataResultSet.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetaDataResultSet.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetaDataResultSet.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetaDataResultSet.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDatabaseMetadata.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlDriver.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlPreparedStatement.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlPreparedStatement.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlPreparedStatement.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlPreparedStatement.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSet.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSet.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSet.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSet.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSetMetaData.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSetMetaData.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSetMetaData.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlResultSetMetaData.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlStatement.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlStatement.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlStatement.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlStatement.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlTable.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlTables.java
diff --git a/main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java b/main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/src/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java
rename to main/connectivity/java/sdbc_postgresql/src/main/java/com/sun/star/sdbcx/comp/postgresql/PostgresqlViews.java
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcs
new file mode 100644
index 0000000000..fec5e997a1
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="adabas" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/adabas/adabas.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcu
similarity index 100%
rename from main/connectivity/source/drivers/adabas/adabas.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/adabas.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcs
new file mode 100644
index 0000000000..6d3087b013
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="ado" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/ado/ado.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcu
similarity index 100%
rename from main/connectivity/source/drivers/ado/ado.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/ado.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcs
new file mode 100644
index 0000000000..26407f8dc3
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="calc" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/java/sdbc_postgresql/sdbc_postgresql.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcu
similarity index 69%
copy from main/connectivity/java/sdbc_postgresql/sdbc_postgresql.xcu
copy to main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcu
index 38db83c28b..6577563b5c 100644
--- a/main/connectivity/java/sdbc_postgresql/sdbc_postgresql.xcu
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/calc.xcu
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--***********************************************************
- *
+ *
* 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
@@ -8,61 +8,49 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
***********************************************************-->
<oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<node oor:name="Installed">
- <node oor:name="sdbc:postgresql:jdbc:*" oor:op="replace">
+ <node oor:name="sdbc:calc:*" oor:op="replace">
<prop oor:name="Driver">
- <value>com.sun.star.sdbcx.comp.postgresql.PostgresqlDriver</value>
+ <value>com.sun.star.comp.sdbc.calc.ODriver</value>
</prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
- <value xml:lang="en-US">PostgreSQL</value>
+ <value xml:lang="en-US">Spreadsheet</value>
</prop>
- <node oor:name="Properties">
- <node oor:name="JavaDriverClass" oor:op="replace">
- <prop oor:name="Value" oor:type="xs:string">
- <value>org.postgresql.Driver</value>
- </prop>
- </node>
- </node>
<node oor:name="Features">
- </node>
- <node oor:name="MetaData">
- <node oor:name="SupportsBrowsing" oor:op="replace">
+ <node oor:name="EscapeDateTime" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
</prop>
</node>
- <node oor:name="SupportsTableCreation" oor:op="replace">
+ </node>
+ <node oor:name="MetaData">
+ <node oor:name="SupportsBrowsing" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
</prop>
</node>
- <node oor:name="UseJava" oor:op="replace">
+ <node oor:name="FileSystemBased" oor:op="replace">
<prop oor:name="Value" oor:type="xs:boolean">
<value>true</value>
</prop>
</node>
- <node oor:name="Authentication" oor:op="replace">
+ <node oor:name="MediaType" oor:op="replace">
<prop oor:name="Value" oor:type="xs:string">
- <value>UserPassword</value>
- </prop>
- </node>
- <node oor:name="SupportsColumnDescription" oor:op="replace">
- <prop oor:name="Value" oor:type="xs:boolean">
- <value>true</value>
+ <value>application/vnd.oasis.opendocument.spreadsheet</value>
</prop>
</node>
</node>
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcs
new file mode 100644
index 0000000000..2b9c2c3031
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="dbase" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/dbase/dbase.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcu
similarity index 100%
rename from main/connectivity/source/drivers/dbase/dbase.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/dbase.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcs
new file mode 100644
index 0000000000..7b99db0515
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="evoab2" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/evoab2/evoab2.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcu
similarity index 100%
rename from main/connectivity/source/drivers/evoab2/evoab2.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/evoab2.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcs
new file mode 100644
index 0000000000..48e0f630de
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="flat" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/flat/flat.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcu
similarity index 100%
rename from main/connectivity/source/drivers/flat/flat.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/flat.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcs
new file mode 100644
index 0000000000..1d5392008c
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="hsqldb" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/hsqldb/hsqldb.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcu
similarity index 100%
rename from main/connectivity/source/drivers/hsqldb/hsqldb.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/hsqldb.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcs
new file mode 100644
index 0000000000..e1e1ee79a1
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="jdbc" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/jdbc/jdbc.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcu
similarity index 100%
rename from main/connectivity/source/drivers/jdbc/jdbc.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/jdbc.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcs
new file mode 100644
index 0000000000..527364b2ac
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="macab" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/macab/macab.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcu
similarity index 100%
rename from main/connectivity/source/drivers/macab/macab.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/macab.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcs
new file mode 100644
index 0000000000..4307e7b9ec
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="mysql" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/mysql/mysql.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcu
similarity index 100%
rename from main/connectivity/source/drivers/mysql/mysql.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/mysql.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcs
new file mode 100644
index 0000000000..8169f9e202
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="odbc" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/source/drivers/odbc/odbc.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcu
similarity index 100%
rename from main/connectivity/source/drivers/odbc/odbc.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/odbc.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcs
new file mode 100644
index 0000000000..50c79f850a
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="sdbc_jdbc" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/java/sdbc_jdbc/sdbc_jdbc.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcu
similarity index 100%
rename from main/connectivity/java/sdbc_jdbc/sdbc_jdbc.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_jdbc.xcu
diff --git a/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcs b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcs
new file mode 100644
index 0000000000..afa56eb43b
--- /dev/null
+++ b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcs
@@ -0,0 +1,70 @@
+<?xml version="1.0"?>
+<oor:component-schema xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="sdbc_postgresql" oor:package="org.openoffice.Office.DataAccess" xml:lang="en-US">
+ <info>
+ <desc>Contains the installed OpenOffice.org Base database drivers.</desc>
+ </info>
+ <templates>
+ <group oor:name="Property">
+ <info>
+ <desc>Describes a property of a driver.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="oor:any" oor:localized="true">
+ <info>
+ <desc>Describes the value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="Feature">
+ <info>
+ <desc>Describes a feature a driver supports.</desc>
+ </info>
+ <prop oor:name="Value" oor:type="xs:boolean" oor:localized="true">
+ <info>
+ <desc>The feature value.</desc>
+ </info>
+ </prop>
+ </group>
+ <group oor:name="URLPattern">
+ <info>
+ <desc>Specifies a database driver.</desc>
+ </info>
+ <prop oor:name="ParentURLPattern" oor:type="xs:string">
+ <info>
+ <desc>Specifies the URL pattern of the parent which settings should be used if not present.</desc>
+ </info>
+ </prop>
+ <prop oor:name="Driver" oor:type="xs:string">
+ <info>
+ <desc>Specifies the factory name of the database driver.</desc>
+ </info>
+ </prop>
+ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string" oor:localized="true">
+ <info>
+ <desc>Specifies the UI name of the database driver.</desc>
+ </info>
+ </prop>
+ <set oor:name="Properties" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="Features" oor:node-type="Feature">
+ <info>
+ <desc>Defines a list of all properties which are different from default.</desc>
+ </info>
+ </set>
+ <set oor:name="MetaData" oor:node-type="Property">
+ <info>
+ <desc>Defines a list of all meta data properties which the database application should supports.</desc>
+ </info>
+ </set>
+ </group>
+ </templates>
+ <component>
+ <set oor:name="Installed" oor:node-type="URLPattern">
+ <info>
+ <desc>Contains a list of URLs supported by installed database drivers.</desc>
+ </info>
+ </set>
+ </component>
+</oor:component-schema>
diff --git a/main/connectivity/java/sdbc_postgresql/sdbc_postgresql.xcu b/main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcu
similarity index 100%
rename from main/connectivity/java/sdbc_postgresql/sdbc_postgresql.xcu
rename to main/connectivity/registry/org/openoffice/Office/DataAccess/sdbc_postgresql.xcu
diff --git a/main/postprocess/packcomponents/makefile.mk b/main/postprocess/packcomponents/makefile.mk
index 7d6169ab18..174ba90822 100644
--- a/main/postprocess/packcomponents/makefile.mk
+++ b/main/postprocess/packcomponents/makefile.mk
@@ -48,10 +48,6 @@ my_components = \
abp \
basprov \
bib \
- chartcontroller \
- chartmodel \
- charttools \
- chartview \
component/UnoControls/util/ctl \
component/animations/source/animcore/animcore \
component/avmedia/util/avmedia \
@@ -61,13 +57,20 @@ my_components = \
component/canvas/source/factory/canvasfactory \
component/canvas/source/simplecanvas/simplecanvas \
component/canvas/source/vcl/vclcanvas \
+ component/chart2/source/controller/chartcontroller \
+ component/chart2/source/model/chartmodel \
+ component/chart2/source/tools/charttools \
+ component/chart2/source/view/chartview \
component/comphelper/util/comphelp \
component/configmgr/source/configmgr \
+ component/connectivity/source/cpool/dbpool2 \
+ component/connectivity/source/dbtools/dbtools \
component/connectivity/source/drivers/calc/calc \
component/connectivity/source/drivers/dbase/dbase \
component/connectivity/source/drivers/flat/flat \
component/connectivity/source/drivers/mysql/mysql \
component/connectivity/source/drivers/odbc/odbc \
+ component/connectivity/source/manager/sdbc2 \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
component/dbaccess/source/ext/adabas/adabasui \
@@ -156,8 +159,6 @@ my_components = \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
dbp \
- dbpool2 \
- dbtools \
deployment \
deploymentgui \
dlgprov \
@@ -180,7 +181,6 @@ my_components = \
res \
scn \
scriptframe \
- sdbc2 \
spl \
stringresource \
svgfilter \
@@ -283,9 +283,9 @@ my_components += \
component/wizards/com/sun/star/wizards/agenda/agenda \
component/wizards/com/sun/star/wizards/fax/fax \
component/wizards/com/sun/star/wizards/form/form \
- component/connectivity/drivers/hsqldb/hsqldb \
- component/connectivity/drivers/jdbc/jdbc \
- postgresql \
+ component/connectivity/java/sdbc_jdbc/jdbc \
+ component/connectivity/java/sdbc_postgresql/postgresql \
+ component/connectivity/source/drivers/hsqldb/hsqldb \
component/wizards/com/sun/star/wizards/letter/letter \
component/wizards/com/sun/star/wizards/query/query \
component/wizards/com/sun/star/wizards/report/report \
diff --git a/main/postprocess/packregistry/makefile.mk b/main/postprocess/packregistry/makefile.mk
index 69a026a750..983385e916 100644
--- a/main/postprocess/packregistry/makefile.mk
+++ b/main/postprocess/packregistry/makefile.mk
@@ -79,7 +79,7 @@ MY_FILES_calc = \
$(MY_XCS)/Office/UI/CalcWindowState.xcs \
$(MY_XCU)/Office/UI/CalcCommands.xcu \
$(MY_XCU)/Office/UI/CalcWindowState.xcu \
- $(MY_MOD)/DataAccess/calc.xcu \
+ $(MY_XCU)/Office/DataAccess/calc.xcu \
$(MY_MOD)/fcfg_calc_filters.xcu \
$(MY_MOD)/fcfg_calc_types.xcu \
$(MY_MOD)/org/openoffice/Office/Common-calc.xcu \
@@ -278,10 +278,10 @@ MY_FILES_main = \
$(MY_XCU)/UserProfile.xcu \
$(MY_XCU)/VCL.xcu \
$(MY_XCU)/ucb/Configuration.xcu \
- $(MY_MOD)/DataAccess/dbase.xcu \
- $(MY_MOD)/DataAccess/flat.xcu \
- $(MY_MOD)/DataAccess/mysql.xcu \
- $(MY_MOD)/DataAccess/odbc.xcu \
+ $(MY_XCU)/Office/DataAccess/dbase.xcu \
+ $(MY_XCU)/Office/DataAccess/flat.xcu \
+ $(MY_XCU)/Office/DataAccess/mysql.xcu \
+ $(MY_XCU)/Office/DataAccess/odbc.xcu \
$(MY_MOD)/fcfg_base_filters.xcu \
$(MY_MOD)/fcfg_base_others.xcu \
$(MY_MOD)/fcfg_base_types.xcu \
@@ -351,9 +351,9 @@ MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
- $(MY_MOD)/DataAccess/hsqldb.xcu \
- $(MY_MOD)/DataAccess/sdbc_jdbc.xcu \
- $(MY_MOD)/DataAccess/sdbc_postgresql.xcu
+ $(MY_XCU)/Office/DataAccess/hsqldb.xcu \
+ $(MY_XCU)/Office/DataAccess/sdbc_jdbc.xcu \
+ $(MY_XCU)/Office/DataAccess/sdbc_postgresql.xcu
.END
.IF "$(SYSTEM_LIBTEXTCAT_DATA)" != ""
@@ -520,8 +520,8 @@ $(MISC)/lang/fcfg_langpack_%.xcd .ERRREMOVE :
$(XSLTPROC) --nonet --stringparam prefix $(PWD)/$(MISC)/ -o $@ \
$(SOLARENV)/bin/packregistry.xslt $(MISC)/$(@:b).list
-$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
- $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
+#$(MISC)/lang/registry_{$(alllangiso)}.xcd : $(SOLARPCKDIR)/$$(@:b).zip \
+# $(SOLARPCKDIR)/fcfg_drivers_$$(@:b:s/registry_//).zip
$(MISC)/lang/registry_%.xcd .ERRREMOVE :
$(MKDIRHIER) $(@:d)
@@ -530,8 +530,9 @@ $(MISC)/lang/registry_%.xcd .ERRREMOVE :
cd $(MISC)/$(@:b).unzip && unzip $(SOLARPCKDIR)/$(@:b).zip
rm -rf $(MISC)/fcfg_drivers_$*.unzip
mkdir $(MISC)/fcfg_drivers_$*.unzip
+ @echo Copy from $(SOLARXMLDIR)/../workdir/XcuResTarget/connectivity/$*/org/openoffice/Office/DataAccess
cd $(MISC)/fcfg_drivers_$*.unzip && \
- unzip $(SOLARPCKDIR)/fcfg_drivers_$*.zip
+ cp $(SOLARXMLDIR)/../workdir/XcuResTarget/connectivity/$*/org/openoffice/Office/DataAccess/* .
- $(RM) $(MISC)/$(@:b).list
# filter out filenames starting with "."
echo '<list>' $(foreach,i,$(shell cd $(MISC) && \
diff --git a/main/solenv/ant/aoo-ant.xml b/main/solenv/ant/aoo-ant.xml
index 7ed043bf6a..643bb70809 100644
--- a/main/solenv/ant/aoo-ant.xml
+++ b/main/solenv/ant/aoo-ant.xml
@@ -217,6 +217,8 @@
<manifest>
<attribute name="Class-Path" value="${jar.classpath}" unless:blank="${jar.classpath}"/>
<attribute name="Solar-Version" value="${RSCREVISION}"/>
+ <attribute name="RegistrationClassName" value="${jar.registration-class-name}" unless:blank="${jar.registration-class-name}"/>
+ <attribute name="Sealed" value="true" if:true="${jar.sealed}"/>
</manifest>
<fileset dir="${main.build.dir}"/>
<!-- Breaks trunk/test/smoketestdoc by packaging different classes with the same name: -->
diff --git a/main/solenv/ant/externals.xml b/main/solenv/ant/externals.xml
index 0dafa89215..42fe5bb6e6 100644
--- a/main/solenv/ant/externals.xml
+++ b/main/solenv/ant/externals.xml
@@ -61,6 +61,12 @@
system-path="${COMMONS_HTTPCLIENT_JAR}"
internal-filename="commons-httpclient-3.1.jar"/>
+ <define-external
+ name="hsqldb"
+ system-test="${SYSTEM_HSQLDB}"
+ system-path="${HSQLDB_JAR}"
+ internal-filename="hsqldb.jar"/>
+
<define-external
name="commons-lang"
system-test="${SYSTEM_APACHE_COMMONS}"
(openoffice) 11/21: Use the gbuild paths to connectivity components.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f1c404e081268d03605aba85f790b819f1cebeea
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 5 14:27:32 2025 +0200
Use the gbuild paths to connectivity components.
Patch by: me
---
main/postprocess/packcomponents/makefile.mk | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/main/postprocess/packcomponents/makefile.mk b/main/postprocess/packcomponents/makefile.mk
index 53c64351e7..7d6169ab18 100644
--- a/main/postprocess/packcomponents/makefile.mk
+++ b/main/postprocess/packcomponents/makefile.mk
@@ -48,7 +48,6 @@ my_components = \
abp \
basprov \
bib \
- calc \
chartcontroller \
chartmodel \
charttools \
@@ -64,6 +63,11 @@ my_components = \
component/canvas/source/vcl/vclcanvas \
component/comphelper/util/comphelp \
component/configmgr/source/configmgr \
+ component/connectivity/source/drivers/calc/calc \
+ component/connectivity/source/drivers/dbase/dbase \
+ component/connectivity/source/drivers/flat/flat \
+ component/connectivity/source/drivers/mysql/mysql \
+ component/connectivity/source/drivers/odbc/odbc \
component/cui/util/cui \
component/drawinglayer/drawinglayer \
component/dbaccess/source/ext/adabas/adabasui \
@@ -151,7 +155,6 @@ my_components = \
component/xmloff/source/transform/xof \
component/xmloff/util/xo \
component/xmlscript/util/xcr \
- dbase \
dbp \
dbpool2 \
dbtools \
@@ -160,15 +163,12 @@ my_components = \
dlgprov \
filterconfig1 \
flash \
- flat \
frm \
localebe1 \
log \
mailmerge \
migrationoo2 \
msfilter \
- mysql \
- odbc \
offacc \
oooimprovecore \
pcr \
@@ -283,8 +283,8 @@ my_components += \
component/wizards/com/sun/star/wizards/agenda/agenda \
component/wizards/com/sun/star/wizards/fax/fax \
component/wizards/com/sun/star/wizards/form/form \
- hsqldb \
- jdbc \
+ component/connectivity/drivers/hsqldb/hsqldb \
+ component/connectivity/drivers/jdbc/jdbc \
postgresql \
component/wizards/com/sun/star/wizards/letter/letter \
component/wizards/com/sun/star/wizards/query/query \
@@ -321,9 +321,9 @@ my_components += \
.IF "$(OS)" == "WNT"
my_components += \
- ado \
component/accessibility/java/java_uno_accessbridge/java_uno_accessbridge \
component/avmedia/source/win/avmediawin \
+ component/connectivity/drivers/ado/ado \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
@@ -360,7 +360,7 @@ my_components += component/canvas/source/directx/directx5canvas
.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
-my_components += adabas
+my_components += component/connectivity/source/drivers/adabas/adabas
.END
.IF "$(OS)" != "MACOSX" && "$(OS)" != "WNT" && "$(OS)" != "OS2"
(openoffice) 06/21: Change the return type of Get10ThSec() to clock_t, so it works regardless of the size of the integer type.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 448dc86220cf9531c9c48d1efc4e906d246b1899
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 07:01:21 2025 +0200
Change the return type of Get10ThSec() to clock_t, so it works
regardless of the size of the integer type.
Patch by: me
---
main/sfx2/source/bastyp/progress.cxx | 3 +--
main/sfx2/source/view/sfxbasecontroller.cxx | 6 +++---
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/main/sfx2/source/bastyp/progress.cxx b/main/sfx2/source/bastyp/progress.cxx
index 3e189c066a..f360c0574a 100644
--- a/main/sfx2/source/bastyp/progress.cxx
+++ b/main/sfx2/source/bastyp/progress.cxx
@@ -110,8 +110,7 @@ struct SfxProgress_Impl
#define aTypeLibInfo aProgressTypeLibImpl
//========================================================================
-extern sal_uInt32 Get10ThSec(); // must match the definition in sfxbasecontroller.cxx
- // (sal_uInt32); sal_uIntPtr diverges from it on x64
+extern clock_t Get10ThSec();
// -----------------------------------------------------------------------
diff --git a/main/sfx2/source/view/sfxbasecontroller.cxx b/main/sfx2/source/view/sfxbasecontroller.cxx
index bb174eeeb6..015084586b 100644
--- a/main/sfx2/source/view/sfxbasecontroller.cxx
+++ b/main/sfx2/source/view/sfxbasecontroller.cxx
@@ -220,9 +220,9 @@ sal_Bool SupportsCommandGroup( sal_Int16 nCommandGroup )
return sal_False;
}
-sal_uInt32 Get10ThSec()
+clock_t Get10ThSec()
{
- sal_uInt32 n10Ticks = 10 * (sal_uInt32)clock();
+ clock_t n10Ticks = 10 * clock();
return n10Ticks / CLOCKS_PER_SEC;
}
@@ -246,7 +246,7 @@ friend class SfxBaseController;
SfxWorkWindow* pWorkWindow;
sal_Int32 _nRange;
sal_Int32 _nValue;
- long _nStartTime;
+ clock_t _nStartTime;
public:
SfxStatusIndicator(SfxBaseController* pController, SfxWorkWindow* pWork)
: xOwner( pController )
(openoffice) 16/21: Update the list of .xcs/.xcu files since the build file was written.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 323ac1e9a60928b5dde21b6f53d4a85089bc76cd
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 12 13:46:39 2025 +0200
Update the list of .xcs/.xcu files since the build file was written.
Patch by: me
---
main/officecfg/Configuration_officecfg.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/main/officecfg/Configuration_officecfg.mk b/main/officecfg/Configuration_officecfg.mk
index 4830bcb38d..450840b06a 100644
--- a/main/officecfg/Configuration_officecfg.mk
+++ b/main/officecfg/Configuration_officecfg.mk
@@ -41,6 +41,7 @@ $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/Draw.xcs \
org/openoffice/Office/Events.xcs \
org/openoffice/Office/Embedding.xcs \
+ org/openoffice/Office/ExtensionDependencies.xcs \
org/openoffice/Office/ExtensionManager.xcs \
org/openoffice/Office/Impress.xcs \
org/openoffice/Office/Java.xcs \
@@ -50,6 +51,7 @@ $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/Logging.xcs \
org/openoffice/Office/Math.xcs \
org/openoffice/Office/OptionsDialog.xcs \
+ org/openoffice/Office/PresenterScreen.xcs \
org/openoffice/Office/ProtocolHandler.xcs \
org/openoffice/Office/SFX.xcs \
org/openoffice/Office/Substitution.xcs \
@@ -85,6 +87,7 @@ $(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
org/openoffice/Office/UI/DrawImpressCommands.xcs \
org/openoffice/Office/UI/GenericCommands.xcs \
org/openoffice/Office/UI/MathCommands.xcs \
+ org/openoffice/Office/UI/Sidebar.xcs \
org/openoffice/Office/UI/StartModuleCommands.xcs \
org/openoffice/Office/UI/WriterCommands.xcs \
org/openoffice/Office/UI/WindowState.xcs \
@@ -132,6 +135,7 @@ $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Calc.xcu \
org/openoffice/Office/Canvas.xcu \
org/openoffice/Office/Compatibility.xcu \
+ org/openoffice/Office/ExtensionDependencies.xcu \
org/openoffice/Office/ExtensionManager.xcu \
org/openoffice/Office/Impress.xcu \
org/openoffice/Office/Jobs.xcu \
@@ -139,6 +143,7 @@ $(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Linguistic.xcu \
org/openoffice/Office/Logging.xcu \
org/openoffice/Office/Math.xcu \
+ org/openoffice/Office/PresenterScreen.xcu \
org/openoffice/Office/ProtocolHandler.xcu \
org/openoffice/Office/Security.xcu \
org/openoffice/Office/Scripting.xcu \
@@ -228,6 +233,7 @@ $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Office/Embedding.xcu \
org/openoffice/Office/WebWizard.xcu \
org/openoffice/Office/FormWizard.xcu \
+ org/openoffice/Office/PresenterScreen.xcu \
org/openoffice/Office/Writer.xcu \
org/openoffice/Office/UI/BasicIDECommands.xcu \
org/openoffice/Office/UI/BibliographyCommands.xcu \
@@ -253,6 +259,7 @@ $(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
org/openoffice/Office/UI/DrawWindowState.xcu \
org/openoffice/Office/UI/ImpressWindowState.xcu \
org/openoffice/Office/UI/MathWindowState.xcu \
+ org/openoffice/Office/UI/Sidebar.xcu \
org/openoffice/Office/UI/StartModuleWindowState.xcu \
org/openoffice/Office/UI/WriterWindowState.xcu \
org/openoffice/Office/UI/XFormsWindowState.xcu \
(openoffice) 01/21: In ImplPreparePolyDraw(), nCurrPoints and nCurrPoint should be sal_uInt32, just like pPoints points to, which they are assigned from or related to. Commit 30f18d3fb8fe7eacd8ee5f353bc7c60bfbf18ac5 didn't fix all the uses of the pointer size change it made.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 48f8cc8f699b12f766e669922446071e6902869c
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 21:59:02 2025 +0200
In ImplPreparePolyDraw(), nCurrPoints and nCurrPoint should be sal_uInt32,
just like pPoints points to, which they are assigned from or related to.
Commit 30f18d3fb8fe7eacd8ee5f353bc7c60bfbf18ac5 didn't fix all the uses
of the pointer size change it made.
Patch by: me
---
main/vcl/win/source/gdi/salgdi.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/vcl/win/source/gdi/salgdi.cxx b/main/vcl/win/source/gdi/salgdi.cxx
index fc033a8844..2aedc1c1fb 100644
--- a/main/vcl/win/source/gdi/salgdi.cxx
+++ b/main/vcl/win/source/gdi/salgdi.cxx
@@ -633,9 +633,9 @@ void ImplPreparePolyDraw( bool bCloseFigures,
{
const POINT* pCurrPoint = reinterpret_cast<const POINT*>( *pPtAry++ );
const BYTE* pCurrFlag = *pFlgAry++;
- const sal_uLong nCurrPoints = *pPoints++;
+ const sal_uInt32 nCurrPoints = *pPoints++;
const bool bHaveFlagArray( pCurrFlag );
- sal_uLong nCurrPoint;
+ sal_uInt32 nCurrPoint;
if( nCurrPoints )
{
(openoffice) 10/21: Preliminary, incomplete port of charts2 to gbuild.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 89e8f0e82d9824d5d288188e0dc720afc6cf9579
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 5 13:20:10 2025 +0200
Preliminary, incomplete port of charts2 to gbuild.
Patch by: me
---
main/Repository.mk | 4 +
main/chart2/Library_chartcontroller.mk | 216 ++++++++++++++++
main/chart2/Library_chartmodel.mk | 115 +++++++++
main/chart2/Library_charttools.mk | 138 +++++++++++
main/chart2/Library_chartview.mk | 120 +++++++++
main/chart2/Makefile | 32 +++
main/chart2/Module_chart2.mk | 35 +++
main/chart2/Package_uiconfig.mk | 35 +++
.../pch/precompiled_chartcontroller.cxx} | 22 +-
.../chart2/inc/pch/precompiled_chartcontroller.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_chartmodel.cxx} | 22 +-
main/chart2/inc/pch/precompiled_chartmodel.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_charttools.cxx} | 22 +-
main/chart2/inc/pch/precompiled_charttools.hxx | 271 +++++++++++++++++++++
.../pch/precompiled_chartview.cxx} | 22 +-
main/chart2/inc/pch/precompiled_chartview.hxx | 271 +++++++++++++++++++++
main/chart2/prj/build.lst | 28 +--
main/chart2/prj/d.lst | 27 --
main/chart2/prj/makefile.mk | 44 ++++
.../accessibility/AccStatisticsObject.cxx | 2 +-
.../controller/accessibility/AccessibleBase.cxx | 2 +-
.../accessibility/AccessibleChartElement.cxx | 2 +-
.../accessibility/AccessibleChartShape.cxx | 2 +-
.../accessibility/AccessibleChartView.cxx | 2 +-
.../accessibility/AccessibleTextHelper.cxx | 2 +-
.../accessibility/AccessibleViewForwarder.cxx | 2 +-
.../accessibility/ChartElementFactory.cxx | 2 +-
.../controller/chartapiwrapper/AreaWrapper.cxx | 2 +-
.../controller/chartapiwrapper/AxisWrapper.cxx | 2 +-
.../chartapiwrapper/Chart2ModelContact.cxx | 2 +-
.../chartapiwrapper/ChartDataWrapper.cxx | 2 +-
.../chartapiwrapper/ChartDocumentWrapper.cxx | 2 +-
.../chartapiwrapper/DataSeriesPointWrapper.cxx | 2 +-
.../controller/chartapiwrapper/DiagramWrapper.cxx | 2 +-
.../controller/chartapiwrapper/GridWrapper.cxx | 2 +-
.../controller/chartapiwrapper/LegendWrapper.cxx | 2 +-
.../chartapiwrapper/MinMaxLineWrapper.cxx | 2 +-
.../controller/chartapiwrapper/TitleWrapper.cxx | 2 +-
.../chartapiwrapper/UpDownBarWrapper.cxx | 2 +-
.../chartapiwrapper/WallFloorWrapper.cxx | 2 +-
.../chartapiwrapper/WrappedAddInProperty.cxx | 2 +-
.../WrappedAutomaticPositionProperties.cxx | 2 +-
.../WrappedAxisAndGridExistenceProperties.cxx | 2 +-
.../WrappedCharacterHeightProperty.cxx | 2 +-
.../WrappedDataCaptionProperties.cxx | 2 +-
.../chartapiwrapper/WrappedGapwidthProperty.cxx | 2 +-
.../WrappedNumberFormatProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleProperty.cxx | 2 +-
.../chartapiwrapper/WrappedScaleTextProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSceneProperty.cxx | 2 +-
.../WrappedSeriesAreaOrLineProperty.cxx | 2 +-
.../chartapiwrapper/WrappedSplineProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStatisticProperties.cxx | 2 +-
.../chartapiwrapper/WrappedStockProperties.cxx | 2 +-
.../chartapiwrapper/WrappedSymbolProperties.cxx | 2 +-
.../WrappedTextRotationProperty.cxx | 2 +-
.../source/controller/dialogs/ChangingResource.cxx | 2 +-
.../dialogs/ChartTypeDialogController.cxx | 2 +-
.../source/controller/dialogs/DataBrowser.cxx | 2 +-
.../source/controller/dialogs/DataBrowserModel.cxx | 2 +-
.../source/controller/dialogs/DialogModel.cxx | 2 +-
.../controller/dialogs/ObjectNameProvider.cxx | 2 +-
.../chart2/source/controller/dialogs/RangeEdit.cxx | 2 +-
.../controller/dialogs/RangeSelectionButton.cxx | 2 +-
.../controller/dialogs/RangeSelectionHelper.cxx | 2 +-
.../controller/dialogs/RangeSelectionListener.cxx | 2 +-
.../controller/dialogs/TextDirectionListBox.cxx | 2 +-
.../dialogs/TimerTriggeredControllerLock.cxx | 2 +-
.../source/controller/dialogs/TitleDialogData.cxx | 2 +-
.../source/controller/dialogs/dlg_ChartType.cxx | 2 +-
.../controller/dialogs/dlg_ChartType_UNO.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard.cxx | 2 +-
.../controller/dialogs/dlg_CreationWizard_UNO.cxx | 2 +-
.../source/controller/dialogs/dlg_DataEditor.cxx | 2 +-
.../source/controller/dialogs/dlg_DataSource.cxx | 2 +-
.../controller/dialogs/dlg_InsertAxis_Grid.cxx | 2 +-
.../controller/dialogs/dlg_InsertDataLabel.cxx | 2 +-
.../controller/dialogs/dlg_InsertErrorBars.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertLegend.cxx | 2 +-
.../source/controller/dialogs/dlg_InsertTitle.cxx | 2 +-
.../controller/dialogs/dlg_InsertTrendline.cxx | 2 +-
.../source/controller/dialogs/dlg_NumberFormat.cxx | 2 +-
.../controller/dialogs/dlg_ObjectProperties.cxx | 2 +-
.../source/controller/dialogs/dlg_ShapeFont.cxx | 2 +-
.../controller/dialogs/dlg_ShapeParagraph.cxx | 2 +-
.../source/controller/dialogs/dlg_View3D.cxx | 2 +-
.../source/controller/dialogs/res_BarGeometry.cxx | 2 +-
.../source/controller/dialogs/res_DataLabel.cxx | 2 +-
.../source/controller/dialogs/res_ErrorBar.cxx | 2 +-
.../controller/dialogs/res_LegendPosition.cxx | 2 +-
.../controller/dialogs/res_TextSeparator.cxx | 2 +-
.../source/controller/dialogs/res_Titles.cxx | 2 +-
.../source/controller/dialogs/res_Trendline.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneAppearance.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneGeometry.cxx | 2 +-
.../controller/dialogs/tp_3D_SceneIllumination.cxx | 2 +-
.../source/controller/dialogs/tp_AxisLabel.cxx | 2 +-
.../source/controller/dialogs/tp_AxisPositions.cxx | 2 +-
.../source/controller/dialogs/tp_ChartType.cxx | 2 +-
.../source/controller/dialogs/tp_DataLabel.cxx | 2 +-
.../source/controller/dialogs/tp_DataSource.cxx | 2 +-
.../controller/dialogs/tp_DataSourceControls.cxx | 2 +-
.../source/controller/dialogs/tp_ErrorBars.cxx | 2 +-
.../controller/dialogs/tp_LegendPosition.cxx | 2 +-
.../source/controller/dialogs/tp_Location.cxx | 2 +-
.../source/controller/dialogs/tp_PointGeometry.cxx | 2 +-
.../source/controller/dialogs/tp_PolarOptions.cxx | 2 +-
.../source/controller/dialogs/tp_RangeChooser.cxx | 2 +-
main/chart2/source/controller/dialogs/tp_Scale.cxx | 2 +-
.../source/controller/dialogs/tp_SeriesToAxis.cxx | 2 +-
.../source/controller/dialogs/tp_TitleRotation.cxx | 2 +-
.../source/controller/dialogs/tp_Trendline.cxx | 2 +-
.../dialogs/tp_Wizard_TitlesAndObjects.cxx | 2 +-
.../controller/drawinglayer/DrawViewWrapper.cxx | 2 +-
.../drawinglayer/ViewElementListProvider.cxx | 2 +-
.../itemsetwrapper/AxisItemConverter.cxx | 2 +-
.../CharacterPropertyItemConverter.cxx | 2 +-
.../itemsetwrapper/DataPointItemConverter.cxx | 2 +-
.../itemsetwrapper/ErrorBarItemConverter.cxx | 2 +-
.../GraphicPropertyItemConverter.cxx | 2 +-
.../controller/itemsetwrapper/ItemConverter.cxx | 2 +-
.../itemsetwrapper/LegendItemConverter.cxx | 2 +-
.../itemsetwrapper/MultipleChartConverters.cxx | 2 +-
.../itemsetwrapper/MultipleItemConverter.cxx | 2 +-
.../RegressionCurveItemConverter.cxx | 2 +-
.../RegressionEquationItemConverter.cxx | 2 +-
.../itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 +-
.../itemsetwrapper/StatisticsItemConverter.cxx | 2 +-
.../itemsetwrapper/TitleItemConverter.cxx | 2 +-
.../source/controller/main/ChartController.cxx | 2 +-
.../controller/main/ChartController_EditData.cxx | 2 +-
.../controller/main/ChartController_Insert.cxx | 2 +-
.../controller/main/ChartController_Position.cxx | 2 +-
.../controller/main/ChartController_Properties.cxx | 2 +-
.../controller/main/ChartController_TextEdit.cxx | 2 +-
.../controller/main/ChartController_Tools.cxx | 2 +-
.../controller/main/ChartController_Window.cxx | 2 +-
.../controller/main/ChartDropTargetHelper.cxx | 2 +-
.../source/controller/main/ChartFrameloader.cxx | 2 +-
.../source/controller/main/ChartModelClone.cxx | 2 +-
.../source/controller/main/ChartTransferable.cxx | 2 +-
main/chart2/source/controller/main/ChartWindow.cxx | 2 +-
.../source/controller/main/CommandDispatch.cxx | 2 +-
.../controller/main/CommandDispatchContainer.cxx | 2 +-
.../source/controller/main/ConfigurationAccess.cxx | 2 +-
.../controller/main/ControllerCommandDispatch.cxx | 2 +-
.../source/controller/main/DragMethod_Base.cxx | 2 +-
.../controller/main/DragMethod_PieSegment.cxx | 2 +-
.../controller/main/DragMethod_RotateDiagram.cxx | 2 +-
.../source/controller/main/DrawCommandDispatch.cxx | 2 +-
.../source/controller/main/ElementSelector.cxx | 2 +-
.../controller/main/FeatureCommandDispatchBase.cxx | 2 +-
.../source/controller/main/ObjectHierarchy.cxx | 2 +-
.../controller/main/PositionAndSizeHelper.cxx | 2 +-
.../source/controller/main/SelectionHelper.cxx | 2 +-
.../source/controller/main/ShapeController.cxx | 2 +-
.../controller/main/ShapeToolbarController.cxx | 2 +-
.../controller/main/StatusBarCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoActions.cxx | 2 +-
.../source/controller/main/UndoCommandDispatch.cxx | 2 +-
main/chart2/source/controller/main/UndoGuard.cxx | 2 +-
.../main/_serviceregistration_controller.cxx | 2 +-
main/chart2/source/model/filter/XMLFilter.cxx | 2 +-
main/chart2/source/model/main/Axis.cxx | 2 +-
.../source/model/main/BaseCoordinateSystem.cxx | 2 +-
.../model/main/CartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/ChartModel.cxx | 2 +-
.../source/model/main/ChartModel_Persistence.cxx | 2 +-
main/chart2/source/model/main/DataPoint.cxx | 2 +-
.../source/model/main/DataPointProperties.cxx | 2 +-
main/chart2/source/model/main/DataSeries.cxx | 2 +-
.../source/model/main/DataSeriesProperties.cxx | 2 +-
main/chart2/source/model/main/Diagram.cxx | 2 +-
main/chart2/source/model/main/FormattedString.cxx | 2 +-
main/chart2/source/model/main/GridProperties.cxx | 2 +-
main/chart2/source/model/main/LayoutContainer.cxx | 2 +-
main/chart2/source/model/main/Legend.cxx | 2 +-
main/chart2/source/model/main/PageBackground.cxx | 2 +-
.../source/model/main/PolarCoordinateSystem.cxx | 2 +-
main/chart2/source/model/main/StockBar.cxx | 2 +-
main/chart2/source/model/main/Title.cxx | 2 +-
main/chart2/source/model/main/UndoManager.cxx | 2 +-
main/chart2/source/model/main/Wall.cxx | 2 +-
.../model/main/_serviceregistration_model.cxx | 2 +-
.../chart2/source/model/template/AreaChartType.cxx | 2 +-
.../model/template/AreaChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/BarChartType.cxx | 2 +-
.../source/model/template/BarChartTypeTemplate.cxx | 2 +-
.../source/model/template/BubbleChartType.cxx | 2 +-
.../model/template/BubbleChartTypeTemplate.cxx | 2 +-
.../model/template/BubbleDataInterpreter.cxx | 2 +-
.../source/model/template/CandleStickChartType.cxx | 2 +-
main/chart2/source/model/template/ChartType.cxx | 2 +-
.../source/model/template/ChartTypeManager.cxx | 2 +-
.../source/model/template/ChartTypeTemplate.cxx | 2 +-
.../source/model/template/ColumnChartType.cxx | 2 +-
.../model/template/ColumnLineChartTypeTemplate.cxx | 2 +-
.../model/template/ColumnLineDataInterpreter.cxx | 2 +-
.../source/model/template/DataInterpreter.cxx | 2 +-
.../source/model/template/FilledNetChartType.cxx | 2 +-
.../chart2/source/model/template/LineChartType.cxx | 2 +-
.../model/template/LineChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/NetChartType.cxx | 2 +-
.../source/model/template/NetChartTypeTemplate.cxx | 2 +-
main/chart2/source/model/template/PieChartType.cxx | 2 +-
.../source/model/template/PieChartTypeTemplate.cxx | 2 +-
.../source/model/template/ScatterChartType.cxx | 2 +-
.../model/template/ScatterChartTypeTemplate.cxx | 2 +-
.../model/template/StockChartTypeTemplate.cxx | 2 +-
.../source/model/template/StockDataInterpreter.cxx | 2 +-
.../source/model/template/XYDataInterpreter.cxx | 2 +-
.../template/_serviceregistration_charttypes.cxx | 2 +-
main/chart2/source/tools/AxisHelper.cxx | 2 +-
main/chart2/source/tools/BaseGFXHelper.cxx | 2 +-
main/chart2/source/tools/CachedDataSequence.cxx | 2 +-
main/chart2/source/tools/CharacterProperties.cxx | 2 +-
main/chart2/source/tools/ChartDebugTrace.cxx | 2 +-
main/chart2/source/tools/ChartModelHelper.cxx | 2 +-
main/chart2/source/tools/ChartTypeHelper.cxx | 2 +-
main/chart2/source/tools/ChartViewHelper.cxx | 2 +-
main/chart2/source/tools/ColorPerPointHelper.cxx | 2 +-
main/chart2/source/tools/CommonConverters.cxx | 2 +-
main/chart2/source/tools/ConfigColorScheme.cxx | 2 +-
main/chart2/source/tools/ControllerLockGuard.cxx | 2 +-
main/chart2/source/tools/DataSeriesHelper.cxx | 2 +-
main/chart2/source/tools/DataSource.cxx | 2 +-
main/chart2/source/tools/DataSourceHelper.cxx | 2 +-
main/chart2/source/tools/DiagramHelper.cxx | 2 +-
main/chart2/source/tools/ErrorBar.cxx | 2 +-
.../source/tools/ExplicitCategoriesProvider.cxx | 2 +-
.../tools/ExponentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/FillProperties.cxx | 2 +-
main/chart2/source/tools/FormattedStringHelper.cxx | 2 +-
main/chart2/source/tools/ImplOPropertySet.cxx | 2 +-
main/chart2/source/tools/InternalData.cxx | 2 +-
main/chart2/source/tools/InternalDataProvider.cxx | 2 +-
main/chart2/source/tools/LabeledDataSequence.cxx | 2 +-
main/chart2/source/tools/LegendHelper.cxx | 2 +-
main/chart2/source/tools/LifeTime.cxx | 2 +-
main/chart2/source/tools/LineProperties.cxx | 2 +-
.../tools/LinearRegressionCurveCalculator.cxx | 2 +-
.../tools/LogarithmicRegressionCurveCalculator.cxx | 2 +-
.../tools/MeanValueRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/MediaDescriptorHelper.cxx | 2 +-
.../chart2/source/tools/ModifyListenerCallBack.cxx | 2 +-
main/chart2/source/tools/ModifyListenerHelper.cxx | 2 +-
main/chart2/source/tools/MutexContainer.cxx | 2 +-
main/chart2/source/tools/NameContainer.cxx | 2 +-
main/chart2/source/tools/NamedFillProperties.cxx | 2 +-
main/chart2/source/tools/NamedLineProperties.cxx | 2 +-
main/chart2/source/tools/NamedProperties.cxx | 2 +-
.../chart2/source/tools/NumberFormatterWrapper.cxx | 2 +-
main/chart2/source/tools/OPropertySet.cxx | 2 +-
main/chart2/source/tools/ObjectIdentifier.cxx | 2 +-
.../tools/PotentialRegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/PropertyHelper.cxx | 2 +-
main/chart2/source/tools/RangeHighlighter.cxx | 2 +-
main/chart2/source/tools/ReferenceSizeProvider.cxx | 2 +-
.../source/tools/RegressionCurveCalculator.cxx | 2 +-
main/chart2/source/tools/RegressionCurveHelper.cxx | 2 +-
main/chart2/source/tools/RegressionCurveModel.cxx | 2 +-
main/chart2/source/tools/RegressionEquation.cxx | 2 +-
.../chart2/source/tools/RelativePositionHelper.cxx | 2 +-
main/chart2/source/tools/RelativeSizeHelper.cxx | 2 +-
main/chart2/source/tools/ResId.cxx | 2 +-
main/chart2/source/tools/RessourceManager.cxx | 2 +-
main/chart2/source/tools/Scaling.cxx | 2 +-
main/chart2/source/tools/SceneProperties.cxx | 2 +-
main/chart2/source/tools/StatisticsHelper.cxx | 2 +-
main/chart2/source/tools/ThreeDHelper.cxx | 2 +-
main/chart2/source/tools/TitleHelper.cxx | 2 +-
main/chart2/source/tools/TrueGuard.cxx | 2 +-
main/chart2/source/tools/UncachedDataSequence.cxx | 2 +-
main/chart2/source/tools/UserDefinedProperties.cxx | 2 +-
main/chart2/source/tools/WeakListenerAdapter.cxx | 2 +-
.../chart2/source/tools/WrappedDefaultProperty.cxx | 2 +-
.../source/tools/WrappedDirectStateProperty.cxx | 2 +-
main/chart2/source/tools/WrappedIgnoreProperty.cxx | 2 +-
main/chart2/source/tools/WrappedProperty.cxx | 2 +-
main/chart2/source/tools/WrappedPropertySet.cxx | 2 +-
main/chart2/source/tools/XMLRangeHelper.cxx | 2 +-
.../source/tools/_serviceregistration_tools.cxx | 2 +-
main/chart2/source/view/axes/DateHelper.cxx | 2 +-
main/chart2/source/view/axes/DateScaling.cxx | 2 +-
.../source/view/axes/MinimumAndMaximumSupplier.cxx | 2 +-
main/chart2/source/view/axes/ScaleAutomatism.cxx | 2 +-
main/chart2/source/view/axes/TickmarkHelper.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks.cxx | 2 +-
main/chart2/source/view/axes/Tickmarks_Dates.cxx | 2 +-
.../source/view/axes/Tickmarks_Equidistant.cxx | 2 +-
main/chart2/source/view/axes/VAxisBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisOrGridBase.cxx | 2 +-
main/chart2/source/view/axes/VAxisProperties.cxx | 2 +-
main/chart2/source/view/axes/VCartesianAxis.cxx | 2 +-
.../view/axes/VCartesianCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VCartesianGrid.cxx | 2 +-
main/chart2/source/view/axes/VCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarAngleAxis.cxx | 2 +-
main/chart2/source/view/axes/VPolarAxis.cxx | 2 +-
.../source/view/axes/VPolarCoordinateSystem.cxx | 2 +-
main/chart2/source/view/axes/VPolarGrid.cxx | 2 +-
main/chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 +-
main/chart2/source/view/charttypes/AreaChart.cxx | 2 +-
main/chart2/source/view/charttypes/BarChart.cxx | 2 +-
.../source/view/charttypes/BarPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/BubbleChart.cxx | 2 +-
.../source/view/charttypes/CandleStickChart.cxx | 2 +-
.../view/charttypes/CategoryPositionHelper.cxx | 2 +-
main/chart2/source/view/charttypes/PieChart.cxx | 2 +-
main/chart2/source/view/charttypes/Splines.cxx | 2 +-
.../source/view/charttypes/VSeriesPlotter.cxx | 2 +-
main/chart2/source/view/diagram/VDiagram.cxx | 2 +-
main/chart2/source/view/main/ChartItemPool.cxx | 2 +-
main/chart2/source/view/main/ChartView.cxx | 2 +-
main/chart2/source/view/main/Clipping.cxx | 2 +-
.../source/view/main/DataPointSymbolSupplier.cxx | 2 +-
main/chart2/source/view/main/DrawModelWrapper.cxx | 2 +-
.../source/view/main/LabelPositionHelper.cxx | 2 +-
.../source/view/main/Linear3DTransformation.cxx | 2 +-
main/chart2/source/view/main/PlotterBase.cxx | 2 +-
.../source/view/main/PlottingPositionHelper.cxx | 2 +-
.../source/view/main/PolarLabelPositionHelper.cxx | 2 +-
main/chart2/source/view/main/PropertyMapper.cxx | 2 +-
main/chart2/source/view/main/ShapeFactory.cxx | 2 +-
main/chart2/source/view/main/Stripe.cxx | 2 +-
main/chart2/source/view/main/VDataSeries.cxx | 2 +-
main/chart2/source/view/main/VLegend.cxx | 2 +-
.../source/view/main/VLegendSymbolFactory.cxx | 2 +-
main/chart2/source/view/main/VLineProperties.cxx | 2 +-
.../source/view/main/VPolarTransformation.cxx | 2 +-
main/chart2/source/view/main/VTitle.cxx | 2 +-
.../source/view/main/_serviceregistration_view.cxx | 2 +-
332 files changed, 2153 insertions(+), 439 deletions(-)
diff --git a/main/Repository.mk b/main/Repository.mk
index 07da7d2dbf..e32ef366be 100644
--- a/main/Repository.mk
+++ b/main/Repository.mk
@@ -87,6 +87,10 @@ $(eval $(call gb_Helper_register_libraries,OOOLIBS, \
cached1 \
calc \
canvastools \
+ chartcontroller \
+ chartmodel \
+ charttools \
+ chartview \
collator_data \
communi \
cppcanvas \
diff --git a/main/chart2/Library_chartcontroller.mk b/main/chart2/Library_chartcontroller.mk
new file mode 100644
index 0000000000..c69c3e7028
--- /dev/null
+++ b/main/chart2/Library_chartcontroller.mk
@@ -0,0 +1,216 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartcontroller))
+
+$(eval $(call gb_Library_add_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chartcontroller))
+
+$(eval $(call gb_Library_set_versionmap,chartcontroller,$(SRCDIR)/solenv/src/component.map))
+
+$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
+
+$(eval $(call gb_Library_set_include,chartcontroller,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/controller/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartcontroller, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartcontroller,\
+ basegfx \
+ charttools \
+ chartview \
+ comphelper \
+ cppu \
+ cppuhelper \
+ drawinglayer \
+ editeng \
+ ootk \
+ sal \
+ sfx \
+ sot \
+ svl \
+ svt \
+ svx \
+ svxcore \
+ tl \
+ utl \
+ vcl \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartcontroller,\
+ chart2/source/controller/accessibility/AccessibleChartView \
+ chart2/source/controller/accessibility/ChartElementFactory \
+ chart2/source/controller/accessibility/AccessibleBase \
+ chart2/source/controller/accessibility/AccessibleChartElement \
+ chart2/source/controller/accessibility/AccessibleChartShape \
+ chart2/source/controller/accessibility/AccessibleTextHelper \
+ chart2/source/controller/accessibility/AccessibleViewForwarder \
+ chart2/source/controller/chartapiwrapper/Chart2ModelContact \
+ chart2/source/controller/chartapiwrapper/AreaWrapper \
+ chart2/source/controller/chartapiwrapper/AxisWrapper \
+ chart2/source/controller/chartapiwrapper/ChartDataWrapper \
+ chart2/source/controller/chartapiwrapper/ChartDocumentWrapper \
+ chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper \
+ chart2/source/controller/chartapiwrapper/DiagramWrapper \
+ chart2/source/controller/chartapiwrapper/GridWrapper \
+ chart2/source/controller/chartapiwrapper/LegendWrapper \
+ chart2/source/controller/chartapiwrapper/TitleWrapper \
+ chart2/source/controller/chartapiwrapper/MinMaxLineWrapper \
+ chart2/source/controller/chartapiwrapper/UpDownBarWrapper \
+ chart2/source/controller/chartapiwrapper/WallFloorWrapper \
+ chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties \
+ chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty \
+ chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties \
+ chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty \
+ chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty \
+ chart2/source/controller/chartapiwrapper/WrappedScaleProperty \
+ chart2/source/controller/chartapiwrapper/WrappedSplineProperties \
+ chart2/source/controller/chartapiwrapper/WrappedStockProperties \
+ chart2/source/controller/chartapiwrapper/WrappedSymbolProperties \
+ chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties \
+ chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty \
+ chart2/source/controller/chartapiwrapper/WrappedStatisticProperties \
+ chart2/source/controller/chartapiwrapper/WrappedSceneProperty \
+ chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty \
+ chart2/source/controller/chartapiwrapper/WrappedAddInProperty \
+ chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties \
+ chart2/source/controller/dialogs/ObjectNameProvider \
+ chart2/source/controller/dialogs/TimerTriggeredControllerLock \
+ chart2/source/controller/dialogs/ChangingResource \
+ chart2/source/controller/dialogs/DataBrowser \
+ chart2/source/controller/dialogs/DataBrowserModel \
+ chart2/source/controller/dialogs/DialogModel \
+ chart2/source/controller/dialogs/TitleDialogData \
+ chart2/source/controller/dialogs/res_Titles \
+ chart2/source/controller/dialogs/res_TextSeparator \
+ chart2/source/controller/dialogs/res_ErrorBar \
+ chart2/source/controller/dialogs/res_Trendline \
+ chart2/source/controller/dialogs/res_BarGeometry \
+ chart2/source/controller/dialogs/res_LegendPosition \
+ chart2/source/controller/dialogs/res_DataLabel \
+ chart2/source/controller/dialogs/ChartTypeDialogController \
+ chart2/source/controller/dialogs/tp_ChartType \
+ chart2/source/controller/dialogs/tp_RangeChooser \
+ chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects \
+ chart2/source/controller/dialogs/tp_Location \
+ chart2/source/controller/dialogs/tp_AxisLabel \
+ chart2/source/controller/dialogs/tp_AxisPositions \
+ chart2/source/controller/dialogs/tp_DataLabel \
+ chart2/source/controller/dialogs/tp_DataSource \
+ chart2/source/controller/dialogs/tp_DataSourceControls \
+ chart2/source/controller/dialogs/tp_LegendPosition \
+ chart2/source/controller/dialogs/tp_PointGeometry \
+ chart2/source/controller/dialogs/tp_Scale \
+ chart2/source/controller/dialogs/tp_Trendline \
+ chart2/source/controller/dialogs/tp_ErrorBars \
+ chart2/source/controller/dialogs/tp_SeriesToAxis \
+ chart2/source/controller/dialogs/tp_TitleRotation \
+ chart2/source/controller/dialogs/tp_3D_SceneGeometry \
+ chart2/source/controller/dialogs/tp_3D_SceneAppearance \
+ chart2/source/controller/dialogs/tp_3D_SceneIllumination \
+ chart2/source/controller/dialogs/tp_PolarOptions \
+ chart2/source/controller/dialogs/dlg_ObjectProperties \
+ chart2/source/controller/dialogs/dlg_DataEditor \
+ chart2/source/controller/dialogs/dlg_DataSource \
+ chart2/source/controller/dialogs/dlg_View3D \
+ chart2/source/controller/dialogs/dlg_InsertAxis_Grid \
+ chart2/source/controller/dialogs/dlg_InsertDataLabel \
+ chart2/source/controller/dialogs/dlg_InsertLegend \
+ chart2/source/controller/dialogs/dlg_InsertTrendline \
+ chart2/source/controller/dialogs/dlg_InsertErrorBars \
+ chart2/source/controller/dialogs/dlg_InsertTitle \
+ chart2/source/controller/dialogs/dlg_CreationWizard \
+ chart2/source/controller/dialogs/dlg_CreationWizard_UNO \
+ chart2/source/controller/dialogs/dlg_ChartType_UNO \
+ chart2/source/controller/dialogs/dlg_ChartType \
+ chart2/source/controller/dialogs/dlg_NumberFormat \
+ chart2/source/controller/dialogs/dlg_ShapeFont \
+ chart2/source/controller/dialogs/dlg_ShapeParagraph \
+ chart2/source/controller/dialogs/RangeSelectionButton \
+ chart2/source/controller/dialogs/RangeSelectionHelper \
+ chart2/source/controller/dialogs/RangeSelectionListener \
+ chart2/source/controller/dialogs/RangeEdit \
+ chart2/source/controller/dialogs/TextDirectionListBox \
+ chart2/source/controller/drawinglayer/DrawViewWrapper \
+ chart2/source/controller/drawinglayer/ViewElementListProvider \
+ chart2/source/controller/itemsetwrapper/ItemConverter \
+ chart2/source/controller/itemsetwrapper/AxisItemConverter \
+ chart2/source/controller/itemsetwrapper/MultipleItemConverter \
+ chart2/source/controller/itemsetwrapper/MultipleChartConverters \
+ chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter \
+ chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter \
+ chart2/source/controller/itemsetwrapper/DataPointItemConverter \
+ chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter \
+ chart2/source/controller/itemsetwrapper/LegendItemConverter \
+ chart2/source/controller/itemsetwrapper/StatisticsItemConverter \
+ chart2/source/controller/itemsetwrapper/TitleItemConverter \
+ chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter \
+ chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter \
+ chart2/source/controller/itemsetwrapper/ErrorBarItemConverter \
+ chart2/source/controller/main/ConfigurationAccess \
+ chart2/source/controller/main/ElementSelector \
+ chart2/source/controller/main/SelectionHelper \
+ chart2/source/controller/main/PositionAndSizeHelper \
+ chart2/source/controller/main/ChartWindow \
+ chart2/source/controller/main/ChartController \
+ chart2/source/controller/main/ChartController_EditData \
+ chart2/source/controller/main/ChartController_Window \
+ chart2/source/controller/main/ChartController_Properties \
+ chart2/source/controller/main/ChartController_Insert \
+ chart2/source/controller/main/ChartController_TextEdit \
+ chart2/source/controller/main/ChartController_Position \
+ chart2/source/controller/main/ChartController_Tools \
+ chart2/source/controller/main/ChartFrameloader \
+ chart2/source/controller/main/CommandDispatchContainer \
+ chart2/source/controller/main/CommandDispatch \
+ chart2/source/controller/main/ControllerCommandDispatch \
+ chart2/source/controller/main/UndoCommandDispatch \
+ chart2/source/controller/main/DragMethod_Base \
+ chart2/source/controller/main/DragMethod_RotateDiagram \
+ chart2/source/controller/main/DragMethod_PieSegment \
+ chart2/source/controller/main/ObjectHierarchy \
+ chart2/source/controller/main/_serviceregistration_controller \
+ chart2/source/controller/main/ChartDropTargetHelper \
+ chart2/source/controller/main/StatusBarCommandDispatch \
+ chart2/source/controller/main/ChartTransferable \
+ chart2/source/controller/main/FeatureCommandDispatchBase \
+ chart2/source/controller/main/DrawCommandDispatch \
+ chart2/source/controller/main/ShapeController \
+ chart2/source/controller/main/ShapeToolbarController \
+ chart2/source/controller/main/UndoActions \
+ chart2/source/controller/main/UndoGuard \
+ chart2/source/controller/main/ChartModelClone \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_chartmodel.mk b/main/chart2/Library_chartmodel.mk
new file mode 100644
index 0000000000..9418ed4332
--- /dev/null
+++ b/main/chart2/Library_chartmodel.mk
@@ -0,0 +1,115 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartmodel))
+
+$(eval $(call gb_Library_add_precompiled_header,chartmodel,$(SRCDIR)/chart2/inc/pch/precompiled_chartmodel))
+
+$(eval $(call gb_Library_set_versionmap,chartmodel,$(SRCDIR)/solenv/src/component.map))
+
+$(eval $(call gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
+
+$(eval $(call gb_Library_set_include,chartmodel,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/model/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartmodel, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartmodel,\
+ charttools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ fwe \
+ sal \
+ svl \
+ svt \
+ ucbhelper \
+ utl \
+ vcl \
+ stl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartmodel,\
+ chart2/source/model/filter/XMLFilter \
+ chart2/source/model/main/Axis \
+ chart2/source/model/main/GridProperties \
+ 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/Diagram \
+ chart2/source/model/main/DataSeriesProperties \
+ chart2/source/model/main/FormattedString \
+ 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/Wall \
+ chart2/source/model/main/UndoManager \
+ chart2/source/model/main/_serviceregistration_model \
+ chart2/source/model/template/AreaChartType \
+ chart2/source/model/template/AreaChartTypeTemplate \
+ chart2/source/model/template/BarChartType \
+ chart2/source/model/template/BarChartTypeTemplate \
+ 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/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/BubbleChartType \
+ chart2/source/model/template/BubbleChartTypeTemplate \
+ chart2/source/model/template/BubbleDataInterpreter \
+ chart2/source/model/template/StockChartTypeTemplate \
+ chart2/source/model/template/StockDataInterpreter \
+ chart2/source/model/template/XYDataInterpreter \
+ chart2/source/model/template/ColumnLineDataInterpreter \
+ chart2/source/model/template/_serviceregistration_charttypes \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_charttools.mk b/main/chart2/Library_charttools.mk
new file mode 100644
index 0000000000..309e11c7ca
--- /dev/null
+++ b/main/chart2/Library_charttools.mk
@@ -0,0 +1,138 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,charttools))
+
+$(eval $(call gb_Library_add_precompiled_header,charttools,$(SRCDIR)/charttools/inc/pch/precompiled_charttools))
+
+$(eval $(call gb_Library_set_componentfile,charttools,chart2/source/tools/charttools))
+
+$(eval $(call gb_Library_set_include,charttools,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,charttools, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,charttools,\
+ -DOOO_DLLIMPLEMENTATION_CHARTTOOLS \
+))
+
+$(eval $(call gb_Library_add_linked_libs,charttools,\
+ basegfx \
+ comphelper \
+ cppu \
+ cppuhelper \
+ i18nisolang1 \
+ sal \
+ stl \
+ svl \
+ tl \
+ vcl \
+ utl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,charttools,\
+ chart2/source/tools/ErrorBar \
+ chart2/source/tools/TrueGuard \
+ chart2/source/tools/LifeTime \
+ chart2/source/tools/MediaDescriptorHelper \
+ chart2/source/tools/ConfigColorScheme \
+ chart2/source/tools/ColorPerPointHelper \
+ chart2/source/tools/ObjectIdentifier \
+ chart2/source/tools/CachedDataSequence \
+ chart2/source/tools/CommonConverters \
+ chart2/source/tools/DataSeriesHelper \
+ chart2/source/tools/DataSource \
+ chart2/source/tools/DataSourceHelper \
+ chart2/source/tools/DiagramHelper \
+ chart2/source/tools/ExponentialRegressionCurveCalculator \
+ chart2/source/tools/ImplOPropertySet \
+ chart2/source/tools/InternalData \
+ chart2/source/tools/InternalDataProvider \
+ chart2/source/tools/LabeledDataSequence \
+ chart2/source/tools/LinearRegressionCurveCalculator \
+ chart2/source/tools/LogarithmicRegressionCurveCalculator \
+ chart2/source/tools/MeanValueRegressionCurveCalculator \
+ chart2/source/tools/NumberFormatterWrapper \
+ chart2/source/tools/OPropertySet \
+ chart2/source/tools/WrappedPropertySet \
+ chart2/source/tools/WrappedProperty \
+ chart2/source/tools/WrappedIgnoreProperty \
+ chart2/source/tools/WrappedDefaultProperty \
+ chart2/source/tools/WrappedDirectStateProperty \
+ chart2/source/tools/PotentialRegressionCurveCalculator \
+ chart2/source/tools/RegressionCurveHelper \
+ chart2/source/tools/RegressionCurveModel \
+ chart2/source/tools/RelativeSizeHelper \
+ chart2/source/tools/RelativePositionHelper \
+ chart2/source/tools/Scaling \
+ chart2/source/tools/SceneProperties \
+ chart2/source/tools/ThreeDHelper \
+ chart2/source/tools/StatisticsHelper \
+ chart2/source/tools/ChartModelHelper \
+ chart2/source/tools/ChartViewHelper \
+ chart2/source/tools/ChartTypeHelper \
+ chart2/source/tools/AxisHelper \
+ chart2/source/tools/MutexContainer \
+ chart2/source/tools/PropertyHelper \
+ chart2/source/tools/FormattedStringHelper \
+ chart2/source/tools/TitleHelper \
+ chart2/source/tools/LegendHelper \
+ chart2/source/tools/CharacterProperties \
+ chart2/source/tools/LineProperties \
+ chart2/source/tools/FillProperties \
+ chart2/source/tools/UserDefinedProperties \
+ chart2/source/tools/NameContainer \
+ chart2/source/tools/ChartDebugTrace \
+ chart2/source/tools/_serviceregistration_tools \
+ chart2/source/tools/UncachedDataSequence \
+ chart2/source/tools/XMLRangeHelper \
+ chart2/source/tools/ModifyListenerHelper \
+ chart2/source/tools/ModifyListenerCallBack \
+ chart2/source/tools/BaseGFXHelper \
+ chart2/source/tools/ControllerLockGuard \
+ chart2/source/tools/WeakListenerAdapter \
+ chart2/source/tools/ResId \
+ chart2/source/tools/RessourceManager \
+ chart2/source/tools/RangeHighlighter \
+ chart2/source/tools/ReferenceSizeProvider \
+ chart2/source/tools/ExplicitCategoriesProvider \
+ chart2/source/tools/RegressionCurveCalculator \
+ chart2/source/tools/RegressionEquation \
+))
+
+# Disabled:
+# chart2/source/tools/NamedFillProperties
+# chart2/source/tools/NamedLineProperties
+# chart2/source/tools/NamedProperties
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Library_chartview.mk b/main/chart2/Library_chartview.mk
new file mode 100644
index 0000000000..92a1daa889
--- /dev/null
+++ b/main/chart2/Library_chartview.mk
@@ -0,0 +1,120 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Library_Library,chartview))
+
+$(eval $(call gb_Library_add_precompiled_header,chartview,$(SRCDIR)/chart2/inc/pch/precompiled_chartview))
+
+$(eval $(call gb_Library_set_componentfile,chartview,chart2/source/view/chartview))
+
+$(eval $(call gb_Library_set_include,chartview,\
+ $$(INCLUDE) \
+ -I$(SRCDIR)/chart2/inc \
+ -I$(SRCDIR)/chart2/inc/pch \
+ -I$(SRCDIR)/chart2/source/inc \
+ -I$(SRCDIR)/chart2/source/view/inc \
+ -I$(OUTDIR)/inc \
+))
+
+$(eval $(call gb_Library_add_api,chartview, \
+ udkapi \
+ offapi \
+))
+
+$(eval $(call gb_Library_add_defs,chartview,\
+ -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+))
+
+$(eval $(call gb_Library_add_linked_libs,chartview,\
+ basegfx \
+ charttools \
+ comphelper \
+ cppu \
+ cppuhelper \
+ editeng \
+ sal \
+ sfx \
+ stl \
+ svl \
+ svt \
+ svxcore \
+ tl \
+ utl \
+ vcl \
+ $(gb_STDLIBS) \
+))
+
+$(eval $(call gb_Library_add_exception_objects,chartview,\
+ chart2/source/view/axes/VAxisOrGridBase \
+ chart2/source/view/axes/VAxisBase \
+ chart2/source/view/axes/DateHelper \
+ chart2/source/view/axes/DateScaling \
+ chart2/source/view/axes/Tickmarks \
+ chart2/source/view/axes/Tickmarks_Equidistant \
+ chart2/source/view/axes/Tickmarks_Dates \
+ chart2/source/view/axes/MinimumAndMaximumSupplier \
+ chart2/source/view/axes/ScaleAutomatism \
+ chart2/source/view/axes/VAxisProperties \
+ chart2/source/view/axes/VCartesianAxis \
+ chart2/source/view/axes/VCartesianGrid \
+ chart2/source/view/axes/VCartesianCoordinateSystem \
+ chart2/source/view/axes/VPolarAxis \
+ chart2/source/view/axes/VPolarAngleAxis \
+ chart2/source/view/axes/VPolarRadiusAxis \
+ chart2/source/view/axes/VPolarGrid \
+ chart2/source/view/axes/VPolarCoordinateSystem \
+ chart2/source/view/axes/VCoordinateSystem \
+ chart2/source/view/charttypes/Splines \
+ chart2/source/view/charttypes/CategoryPositionHelper \
+ chart2/source/view/charttypes/BarPositionHelper \
+ chart2/source/view/charttypes/VSeriesPlotter \
+ chart2/source/view/charttypes/BarChart \
+ chart2/source/view/charttypes/PieChart \
+ chart2/source/view/charttypes/AreaChart \
+ chart2/source/view/charttypes/CandleStickChart \
+ chart2/source/view/charttypes/BubbleChart \
+ chart2/source/view/diagram/VDiagram \
+ chart2/source/view/main/ChartItemPool \
+ chart2/source/view/main/DrawModelWrapper \
+ chart2/source/view/main/PropertyMapper \
+ chart2/source/view/main/Stripe \
+ chart2/source/view/main/VLineProperties \
+ chart2/source/view/main/ShapeFactory \
+ chart2/source/view/main/VLegendSymbolFactory \
+ chart2/source/view/main/DataPointSymbolSupplier \
+ chart2/source/view/main/Linear3DTransformation \
+ chart2/source/view/main/VPolarTransformation \
+ chart2/source/view/main/Clipping \
+ chart2/source/view/main/PlottingPositionHelper \
+ chart2/source/view/main/LabelPositionHelper \
+ chart2/source/view/main/PolarLabelPositionHelper \
+ chart2/source/view/main/PlotterBase \
+ chart2/source/view/main/VDataSeries \
+ chart2/source/view/main/VLegend \
+ chart2/source/view/main/VTitle \
+ chart2/source/view/main/ChartView \
+ chart2/source/view/main/_serviceregistration_view \
+))
+
+# vim: set noet sw=4 ts=4:
+
diff --git a/main/chart2/Makefile b/main/chart2/Makefile
new file mode 100644
index 0000000000..c1d144cbd4
--- /dev/null
+++ b/main/chart2/Makefile
@@ -0,0 +1,32 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/chart2/Module_chart2.mk b/main/chart2/Module_chart2.mk
new file mode 100644
index 0000000000..4c3448ebf0
--- /dev/null
+++ b/main/chart2/Module_chart2.mk
@@ -0,0 +1,35 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+$(eval $(call gb_Module_Module,chart2))
+
+$(eval $(call gb_Module_add_targets,chart2,\
+ Library_chartcontroller \
+ Library_chartmodel \
+ Library_chartview \
+ Library_charttools \
+ Package_uiconfig \
+))
+
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/chart2/Package_uiconfig.mk b/main/chart2/Package_uiconfig.mk
new file mode 100644
index 0000000000..b315dc4390
--- /dev/null
+++ b/main/chart2/Package_uiconfig.mk
@@ -0,0 +1,35 @@
+###############################################################
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+###############################################################
+
+
+
+$(eval $(call gb_Package_Package,chart2_uiconfig,$(SRCDIR)/chart2/uiconfig))
+
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/menubar/menubar.xml,menubar/menubar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/basicshapes.xml,toolbar/basicshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/symbolshapes.xml,toolbar/symbolshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/standardbar.xml,toolbar/standardbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/toolbar.xml,toolbar/toolbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/calloutshapes.xml,toolbar/calloutshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/arrowshapes.xml,toolbar/arrowshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/flowchartshapes.xml,toolbar/flowchartshapes.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/drawbar.xml,toolbar/drawbar.xml))
+$(eval $(call gb_Package_add_file,chart2_uiconfig,xml/uiconfig/modules/schart/toolbar/starshapes.xml,toolbar/starshapes.xml))
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartcontroller.cxx
similarity index 78%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartcontroller.cxx
index 66d80f39f0..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartcontroller.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,33 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartcontroller.hxx b/main/chart2/inc/pch/precompiled_chartcontroller.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartcontroller.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.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/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.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/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.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/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetException.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/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/Type.hxx"
+#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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartmodel.cxx
similarity index 78%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartmodel.cxx
index 66d80f39f0..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartmodel.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,33 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartmodel.hxx b/main/chart2/inc/pch/precompiled_chartmodel.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartmodel.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.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/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.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/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.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/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetException.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/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/Type.hxx"
+#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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_charttools.cxx
similarity index 78%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_charttools.cxx
index 66d80f39f0..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_charttools.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,33 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_charttools.hxx b/main/chart2/inc/pch/precompiled_charttools.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_charttools.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.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/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.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/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.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/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetException.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/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/Type.hxx"
+#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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/inc/pch/precompiled_chartview.cxx
similarity index 78%
copy from main/chart2/source/tools/MutexContainer.cxx
copy to main/chart2/inc/pch/precompiled_chartview.cxx
index 66d80f39f0..a8137d3287 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/inc/pch/precompiled_chartview.cxx
@@ -1,5 +1,5 @@
/**************************************************************
- *
+ *
* 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
@@ -7,33 +7,19 @@
* 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
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*************************************************************/
-// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_chart2.hxx"
-#include "MutexContainer.hxx"
-namespace chart
-{
-
-MutexContainer::~MutexContainer()
-{}
-
-::osl::Mutex & MutexContainer::GetMutex() const
-{
- return m_aMutex;
-}
-
-} // namespace chart
diff --git a/main/chart2/inc/pch/precompiled_chartview.hxx b/main/chart2/inc/pch/precompiled_chartview.hxx
new file mode 100644
index 0000000000..25d5ff2eef
--- /dev/null
+++ b/main/chart2/inc/pch/precompiled_chartview.hxx
@@ -0,0 +1,271 @@
+/**************************************************************
+ *
+ * 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
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ *************************************************************/
+
+
+
+// MARKER(update_precomp.py): Generated on 2006-09-01 17:49:33.249162
+
+#ifdef PRECOMPILED_HEADERS
+//---MARKER---
+#include "sal/config.h"
+#include "sal/types.h"
+
+#include "com/sun/star/awt/CharSet.hpp"
+#include "com/sun/star/awt/FontFamily.hpp"
+#include "com/sun/star/awt/FontPitch.hpp"
+#include "com/sun/star/awt/FontSlant.hpp"
+#include "com/sun/star/awt/FontUnderline.hpp"
+#include "com/sun/star/awt/FontWeight.hpp"
+#include "com/sun/star/awt/Gradient.hpp"
+#include "com/sun/star/awt/Point.hpp"
+#include "com/sun/star/awt/Rectangle.hpp"
+#include "com/sun/star/awt/Size.hpp"
+#include "com/sun/star/awt/XBitmap.hpp"
+#include "com/sun/star/beans/Property.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/PropertyVetoException.hpp"
+#include "com/sun/star/beans/UnknownPropertyException.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/XPropertyChangeListener.hpp"
+#include "com/sun/star/beans/XPropertySet.hpp"
+#include "com/sun/star/beans/XPropertyState.hpp"
+#include "com/sun/star/chart2/data/XDataProvider.hpp"
+#include "com/sun/star/chart2/data/XDataReceiver.hpp"
+#include "com/sun/star/chart2/data/XDataSequence.hpp"
+#include "com/sun/star/chart2/data/XDataSink.hpp"
+#include "com/sun/star/chart2/data/XDataSource.hpp"
+#include "com/sun/star/chart2/data/XNumericalDataSequence.hpp"
+#include "com/sun/star/chart2/data/XTextualDataSequence.hpp"
+#include "com/sun/star/container/NoSuchElementException.hpp"
+#include "com/sun/star/container/XContentEnumerationAccess.hpp"
+#include "com/sun/star/container/XEnumeration.hpp"
+#include "com/sun/star/container/XIndexAccess.hpp"
+#include "com/sun/star/container/XIndexContainer.hpp"
+#include "com/sun/star/container/XNameAccess.hpp"
+#include "com/sun/star/container/XNameContainer.hpp"
+#include "com/sun/star/document/XDocumentInfoSupplier.hpp"
+#include "com/sun/star/document/XEventBroadcaster.hpp"
+#include "com/sun/star/document/XEventsSupplier.hpp"
+#include "com/sun/star/document/XViewDataSupplier.hpp"
+#include "com/sun/star/drawing/BitmapMode.hpp"
+#include "com/sun/star/drawing/CircleKind.hpp"
+#include "com/sun/star/drawing/Direction3D.hpp"
+#include "com/sun/star/drawing/DoubleSequence.hpp"
+#include "com/sun/star/drawing/FillStyle.hpp"
+#include "com/sun/star/drawing/FlagSequence.hpp"
+#include "com/sun/star/drawing/Hatch.hpp"
+#include "com/sun/star/drawing/HomogenMatrix.hpp"
+#include "com/sun/star/drawing/HomogenMatrix3.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/NormalsKind.hpp"
+#include "com/sun/star/drawing/PointSequence.hpp"
+#include "com/sun/star/drawing/PointSequenceSequence.hpp"
+#include "com/sun/star/drawing/PolyPolygonBezierCoords.hpp"
+#include "com/sun/star/drawing/PolyPolygonShape3D.hpp"
+#include "com/sun/star/drawing/PolygonKind.hpp"
+#include "com/sun/star/drawing/Position3D.hpp"
+#include "com/sun/star/drawing/ProjectionMode.hpp"
+#include "com/sun/star/drawing/RectanglePoint.hpp"
+#include "com/sun/star/drawing/ShadeMode.hpp"
+#include "com/sun/star/drawing/TextFitToSizeType.hpp"
+#include "com/sun/star/drawing/TextHorizontalAdjust.hpp"
+#include "com/sun/star/drawing/TextVerticalAdjust.hpp"
+#include "com/sun/star/drawing/XDrawPage.hpp"
+#include "com/sun/star/drawing/XDrawPageSupplier.hpp"
+#include "com/sun/star/drawing/XDrawPagesSupplier.hpp"
+#include "com/sun/star/drawing/XShape.hpp"
+#include "com/sun/star/drawing/XShapes.hpp"
+#include "com/sun/star/embed/Aspects.hpp"
+#include "com/sun/star/embed/EmbedStates.hpp"
+#include "com/sun/star/embed/XComponentSupplier.hpp"
+#include "com/sun/star/embed/XEmbedObjectCreator.hpp"
+#include "com/sun/star/embed/XEmbedPersist.hpp"
+#include "com/sun/star/embed/XEmbeddedClient.hpp"
+#include "com/sun/star/embed/XEmbeddedObject.hpp"
+#include "com/sun/star/embed/XVisualObject.hpp"
+#include "com/sun/star/frame/XController.hpp"
+#include "com/sun/star/frame/XDispatch.hpp"
+#include "com/sun/star/frame/XDispatchProvider.hpp"
+#include "com/sun/star/frame/XLoadable.hpp"
+#include "com/sun/star/frame/XModel.hpp"
+#include "com/sun/star/frame/XStorable.hpp"
+#include "com/sun/star/frame/XSynchronousFrameLoader.hpp"
+#include "com/sun/star/io/XInputStream.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/lang/IllegalArgumentException.hpp"
+#include "com/sun/star/lang/IndexOutOfBoundsException.hpp"
+#include "com/sun/star/lang/Locale.hpp"
+#include "com/sun/star/lang/WrappedTargetException.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/XServiceName.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XTypeProvider.hpp"
+#include "com/sun/star/lang/XUnoTunnel.hpp"
+#include "com/sun/star/sheet/XRangeSelection.hpp"
+#include "com/sun/star/sheet/XSheetCellRangeContainer.hpp"
+#include "com/sun/star/sheet/XSpreadsheet.hpp"
+#include "com/sun/star/sheet/XSpreadsheetDocument.hpp"
+#include "com/sun/star/sheet/XSpreadsheets.hpp"
+#include "com/sun/star/style/CaseMap.hpp"
+#include "com/sun/star/style/ParagraphAdjust.hpp"
+#include "com/sun/star/style/XStyle.hpp"
+#include "com/sun/star/style/XStyleFamiliesSupplier.hpp"
+#include "com/sun/star/text/ControlCharacter.hpp"
+#include "com/sun/star/text/FontEmphasis.hpp"
+#include "com/sun/star/text/FontRelief.hpp"
+#include "com/sun/star/text/RubyAdjust.hpp"
+#include "com/sun/star/text/WritingMode.hpp"
+#include "com/sun/star/text/WritingMode2.hpp"
+#include "com/sun/star/text/XText.hpp"
+#include "com/sun/star/text/XTextCursor.hpp"
+#include "com/sun/star/text/XTextRange.hpp"
+#include "com/sun/star/ui/XContextMenuInterception.hpp"
+#include "com/sun/star/uno/Any.h"
+#include "com/sun/star/uno/Any.hxx"
+#include "com/sun/star/uno/Exception.hpp"
+#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/Type.hxx"
+#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/util/CloseVetoException.hpp"
+#include "com/sun/star/util/URL.hpp"
+#include "com/sun/star/util/XCloneable.hpp"
+#include "com/sun/star/util/XCloseListener.hpp"
+#include "com/sun/star/util/XCloseable.hpp"
+#include "com/sun/star/util/XModifiable.hpp"
+#include "com/sun/star/util/XNumberFormatsSupplier.hpp"
+#include "com/sun/star/util/XURLTransformer.hpp"
+#include "com/sun/star/view/XPrintable.hpp"
+#include "com/sun/star/view/XSelectionSupplier.hpp"
+
+#include "comphelper/broadcasthelper.hxx"
+#include "comphelper/processfactory.hxx"
+#include "comphelper/propertycontainer.hxx"
+#include "comphelper/uno3.hxx"
+
+#include "cppu/macros.hxx"
+#include "cppu/unotype.hxx"
+
+#include "cppuhelper/component_context.hxx"
+#include "cppuhelper/implementationentry.hxx"
+#include "cppuhelper/interfacecontainer.hxx"
+#include "cppuhelper/propshlp.hxx"
+#include "cppuhelper/queryinterface.hxx"
+#include "cppuhelper/weak.hxx"
+#include "cppuhelper/weakref.hxx"
+
+#include "i18npool/mslangid.hxx"
+
+#include "osl/conditn.hxx"
+#include "osl/diagnose.h"
+#include "osl/file.h"
+#include "osl/getglobalmutex.hxx"
+#include "osl/mutex.hxx"
+
+#include "rtl/math.hxx"
+#include "rtl/ustrbuf.hxx"
+#include "rtl/ustring.hxx"
+#include "rtl/uuid.h"
+
+#include "sfx2/sfxdefs.hxx"
+
+#include "sot/clsids.hxx"
+
+#include "svl/eitem.hxx"
+#include "svl/intitem.hxx"
+#include "svl/itemiter.hxx"
+#include "svl/itempool.hxx"
+#include "svl/itemset.hxx"
+#include "unotools/pathoptions.hxx"
+#include "svl/poolitem.hxx"
+#include "svl/stritem.hxx"
+#include "unotools/syslocale.hxx"
+#include "svl/urihelper.hxx"
+#include "svl/whiter.hxx"
+
+#include "editeng/brshitem.hxx"
+#include "editeng/crsditem.hxx"
+#include "editeng/eeitem.hxx"
+#include "editeng/fhgtitem.hxx"
+#include "svx/flagsdef.hxx"
+#include "editeng/flstitem.hxx"
+#include "editeng/forbiddencharacterstable.hxx"
+#include "svx/ofaitem.hxx"
+#include "editeng/postitem.hxx"
+#include "svx/svddef.hxx"
+#include "svx/svditer.hxx"
+#include "svx/svdtypes.hxx"
+#include "editeng/udlnitem.hxx"
+#include "svx/unomodel.hxx"
+#include "editeng/unoprnms.hxx"
+#include "editeng/wghtitem.hxx"
+#include "svx/xdef.hxx"
+#include "svx/xflbmtit.hxx"
+#include "svx/xflbstit.hxx"
+#include "svx/xflclit.hxx"
+#include "svx/xflftrit.hxx"
+#include "svx/xflgrit.hxx"
+#include "svx/xflhtit.hxx"
+#include "svx/xgrscit.hxx"
+#include "svx/xlnclit.hxx"
+#include "svx/xlndsit.hxx"
+#include "editeng/xmlcnitm.hxx"
+#include "svx/xpoly.hxx"
+
+
+#include "tools/color.hxx"
+#include "tools/debug.hxx"
+#include "tools/link.hxx"
+#include "tools/resid.hxx"
+#include "tools/resmgr.hxx"
+#include "tools/solar.h"
+#include "tools/string.hxx"
+#include "tools/table.hxx"
+#include "tools/urlobj.hxx"
+
+#include "typelib/typeclass.h"
+#include "typelib/typedescription.h"
+
+#include "unotools/configitem.hxx"
+#include "unotools/eventlisteneradapter.hxx"
+
+#include "tools/fldunit.hxx"
+
+#include "vos/mutex.hxx"
+//---MARKER---
+#endif
diff --git a/main/chart2/prj/build.lst b/main/chart2/prj/build.lst
index ccf4e1e4e2..46572676b4 100644
--- a/main/chart2/prj/build.lst
+++ b/main/chart2/prj/build.lst
@@ -1,28 +1,2 @@
ch chart2 : offapi offapi L10N:l10n comphelper cppu cppuhelper sal svtools svx tools vcl toolkit unotools sfx2 LIBXSLT:libxslt NULL
-ch chart2 usr1 - all ch_mkout NULL
-ch chart2\inc nmake - all ch_inc NULL
-ch chart2\source\inc get - all ch_source_inc NULL
-ch chart2\source\inc\chartview get - all ch_source_inc_chartview NULL
-ch chart2\source\tools nmake - all ch_source_tools ch_inc NULL
-ch chart2\source\model nmake - all ch_source_model ch_source_tools ch_source_model_main ch_source_model_template ch_source_model_filter ch_inc NULL
-ch chart2\source\model\main nmake - all ch_source_model_main ch_inc NULL
-ch chart2\source\model\template nmake - all ch_source_model_template ch_inc NULL
-ch chart2\source\model\filter nmake - all ch_source_model_filter ch_inc NULL
-ch chart2\source\view nmake - all ch_source_view ch_source_tools ch_source_view_charttypes ch_source_view_axes ch_source_view_diagram ch_source_view_main ch_inc NULL
-ch chart2\source\view\inc get - all ch_source_view_inc NULL
-ch chart2\source\view\axes nmake - all ch_source_view_axes ch_source_tools ch_inc NULL
-ch chart2\source\view\charttypes nmake - all ch_source_view_charttypes ch_inc NULL
-ch chart2\source\view\diagram nmake - all ch_source_view_diagram ch_inc NULL
-ch chart2\source\view\main nmake - all ch_source_view_main ch_inc NULL
-ch chart2\source\controller nmake - all ch_source_controller ch_source_tools ch_source_view ch_source_controller_drawinglayer ch_source_controller_itemsetwrapper ch_source_controller_dialogs ch_source_controller_main ch_source_controller_chartapiwrapper ch_source_controller_accessibility ch_inc ch_source_controller_menus NULL
-ch chart2\source\controller\inc get - all ch_source_controller_inc NULL
-ch chart2\source\controller\accessibility nmake - all ch_source_controller_accessibility ch_inc NULL
-ch chart2\source\controller\dialogs nmake - all ch_source_controller_dialogs ch_inc NULL
-ch chart2\source\controller\drawinglayer nmake - all ch_source_controller_drawinglayer ch_inc NULL
-ch chart2\source\controller\itemsetwrapper nmake - all ch_source_controller_itemsetwrapper ch_inc NULL
-ch chart2\source\controller\chartapiwrapper nmake - all ch_source_controller_chartapiwrapper ch_inc NULL
-ch chart2\source\controller\main nmake - all ch_source_controller_main ch_inc NULL
-ch chart2\source\controller\menus nmake - all ch_source_controller_menus ch_inc NULL
-ch chart2\prj get - all ch_prj NULL
-ch chart2\qa\complex\chart2 nmake - all ch_qa_complex NULL
-ch chart2\qa\unoapi nmake - all ch_qa_unoapi NULL
+ch chart2\prj nmake - all ch_mkout NULL
diff --git a/main/chart2/prj/d.lst b/main/chart2/prj/d.lst
index bf1085336c..e69de29bb2 100644
--- a/main/chart2/prj/d.lst
+++ b/main/chart2/prj/d.lst
@@ -1,27 +0,0 @@
-mkdir: %COMMON_DEST%\bin%_EXT%\hid
-mkdir: %_DEST%\xml%_EXT%\uiconfig
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar
-mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar
-
-..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid
-..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll
-..\%__SRC%\class\*.jar %_DEST%\bin%_EXT%\*.jar
-..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%
-..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib
-..\%__SRC%\lib\*.sl %_DEST%\lib%_EXT%\*.sl
-..\%__SRC%\bin\*.bin %_DEST%\bin%_EXT%\*.bin
-..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\*.res
-..\%__SRC%\bin\*.rdb %_DEST%\rdb%_EXT%\*.rdb
-
-..\uiconfig\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\menubar\*.xml
-..\uiconfig\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\toolbar\*.xml
-..\uiconfig\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\schart\statusbar\*.xml
-
-mkdir: %_DEST%\inc%_EXT%\chart2
-..\%__SRC%\misc\chartcontroller.component %_DEST%\xml%_EXT%\chartcontroller.component
-..\%__SRC%\misc\chartmodel.component %_DEST%\xml%_EXT%\chartmodel.component
-..\%__SRC%\misc\charttools.component %_DEST%\xml%_EXT%\charttools.component
-..\%__SRC%\misc\chartview.component %_DEST%\xml%_EXT%\chartview.component
diff --git a/main/chart2/prj/makefile.mk b/main/chart2/prj/makefile.mk
new file mode 100644
index 0000000000..353f9e0db1
--- /dev/null
+++ b/main/chart2/prj/makefile.mk
@@ -0,0 +1,44 @@
+#**************************************************************
+#
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+#**************************************************************
+
+
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+.IF "$(DEBUG)"!=""
+DEBUG_ARGUMENT=DEBUG=$(DEBUG)
+.ELIF "$(debug)"!=""
+DEBUG_ARGUMENT=debug=$(debug)
+.ELSE
+DEBUG_ARGUMENT=
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) $(DEBUG_ARGUMENT) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx b/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
index b75d845438..01020d3591 100644
--- a/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
+++ b/main/chart2/source/controller/accessibility/AccStatisticsObject.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccStatisticsObject.hxx"
#include <vcl/svapp.hxx>
diff --git a/main/chart2/source/controller/accessibility/AccessibleBase.cxx b/main/chart2/source/controller/accessibility/AccessibleBase.cxx
index 4df31c3eb0..474eb9e68d 100644
--- a/main/chart2/source/controller/accessibility/AccessibleBase.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleBase.hxx"
#include "AccessibleChartShape.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
index c77bbbe730..b85c25c59e 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartElement.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartElement.hxx"
#include "CharacterProperties.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
index c1b519d125..5aa6ee0e60 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartShape.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartShape.hxx"
#include "ObjectHierarchy.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleChartView.cxx b/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
index 4f36e05104..aedc7e679c 100644
--- a/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleChartView.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleChartView.hxx"
#include "chartview/ExplicitValueProvider.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
index f79ad86f58..a702c1fb83 100644
--- a/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleTextHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleTextHelper.hxx"
#include "DrawViewWrapper.hxx"
diff --git a/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx b/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
index 3017d35d88..e21f681778 100644
--- a/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
+++ b/main/chart2/source/controller/accessibility/AccessibleViewForwarder.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AccessibleViewForwarder.hxx"
#include "AccessibleChartView.hxx"
diff --git a/main/chart2/source/controller/accessibility/ChartElementFactory.cxx b/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
index 7df5d0d837..5a0563ef5c 100644
--- a/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
+++ b/main/chart2/source/controller/accessibility/ChartElementFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartElementFactory.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
index 6fba473939..8842f993d6 100644
--- a/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AreaWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
index 636ccc46f7..b5def800b0 100644
--- a/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AxisWrapper.hxx"
#include "AxisHelper.hxx"
#include "TitleHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx b/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
index 4ed51dded4..7f35874fac 100644
--- a/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/Chart2ModelContact.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "Chart2ModelContact.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
index 0a38864f37..1fded38f7c 100644
--- a/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDataWrapper.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
index b4c0030a8a..8a25a2dbdf 100644
--- a/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDocumentWrapper.hxx"
#include "macros.hxx"
#include "servicenames.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
index 54a8d68dc4..14b6e040cd 100644
--- a/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataSeriesPointWrapper.hxx"
#include "macros.hxx"
#include "RegressionCurveHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
index 05394ac503..d610f68048 100644
--- a/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DiagramWrapper.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
index 3fd47d52e9..e44391fbf6 100644
--- a/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/GridWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "GridWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
index 07a54ebe4c..a97c0c8231 100644
--- a/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "LegendWrapper.hxx"
#include "macros.hxx"
#include "Chart2ModelContact.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
index 533d3496d1..18199c881a 100644
--- a/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MinMaxLineWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
index bd1de2fce9..22691c589b 100644
--- a/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleWrapper.hxx"
#include "macros.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
index 8cbbfffe38..9152ea3007 100644
--- a/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UpDownBarWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
index 7c24acb3a7..dd68c6c415 100644
--- a/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WallFloorWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
index 7fa6ac6e53..42aca695e2 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAddInProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
index fa2db3de1e..86d862f061 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAutomaticPositionProperties.hxx"
#include "FastPropertyIdRanges.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
index fb33997908..79b2de5e95 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedAxisAndGridExistenceProperties.hxx"
#include "AxisHelper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
index 7f023bc23f..87ea5ea036 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedCharacterHeightProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
index 1fa6caeb19..a1f751fa35 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedDataCaptionProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedDataCaptionProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
index 5c4a089539..694dd1bbb8 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedGapwidthProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
index fa03b0965e..65418ff652 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedNumberFormatProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
index c0e7fa7b41..8a7bdf4a41 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedScaleProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
index 21fb0118aa..644da12a31 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedScaleTextProperties.hxx"
#include "FastPropertyIdRanges.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
index a40b5d4e71..b78266e5e8 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSceneProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
index c1ff979b06..87a3db32f1 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSeriesAreaOrLineProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSeriesAreaOrLineProperty.hxx"
#include "DataSeriesPointWrapper.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
index ba713ec2f2..3b7083fde1 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSplineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
index 3a1832d63a..0f0b191156 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedStatisticProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedStatisticProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
index 7c8075fb0d..897b7381ce 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedStockProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
index de0c96f973..083cf7524e 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedSymbolProperties.hxx"
#include "WrappedSeriesOrDiagramProperty.hxx"
diff --git a/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
index d245757292..a4ea64a43d 100644
--- a/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
+++ b/main/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "WrappedTextRotationProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/dialogs/ChangingResource.cxx b/main/chart2/source/controller/dialogs/ChangingResource.cxx
index 355c135154..085073ff8c 100644
--- a/main/chart2/source/controller/dialogs/ChangingResource.cxx
+++ b/main/chart2/source/controller/dialogs/ChangingResource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChangingResource.hxx"
diff --git a/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
index a4314c3a72..71ec5878d5 100644
--- a/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
+++ b/main/chart2/source/controller/dialogs/ChartTypeDialogController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartTypeDialogController.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/DataBrowser.cxx b/main/chart2/source/controller/dialogs/DataBrowser.cxx
index 61f19388a1..8bbd1806e5 100644
--- a/main/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/main/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
// header for class SvNumberformat
#ifndef _ZFORMAT_HXX
diff --git a/main/chart2/source/controller/dialogs/DataBrowserModel.cxx b/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
index d3b02ef840..69e82d1a5a 100644
--- a/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
+++ b/main/chart2/source/controller/dialogs/DataBrowserModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataBrowserModel.hxx"
#include "DialogModel.hxx"
diff --git a/main/chart2/source/controller/dialogs/DialogModel.cxx b/main/chart2/source/controller/dialogs/DialogModel.cxx
index 937db26880..6775e93463 100644
--- a/main/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/main/chart2/source/controller/dialogs/DialogModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DialogModel.hxx"
#include "RangeSelectionHelper.hxx"
diff --git a/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx b/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
index d083e1cd42..b09d863954 100644
--- a/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
+++ b/main/chart2/source/controller/dialogs/ObjectNameProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ObjectNameProvider.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeEdit.cxx b/main/chart2/source/controller/dialogs/RangeEdit.cxx
index 8bb4fb309c..d2f8b586aa 100644
--- a/main/chart2/source/controller/dialogs/RangeEdit.cxx
+++ b/main/chart2/source/controller/dialogs/RangeEdit.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeEdit.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx b/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
index f2bf770522..fd661c0ae0 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionButton.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionButton.hxx"
#include "Bitmaps.hrc"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx b/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
index 4d3409216a..dd2e63089b 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionHelper.hxx"
#include "RangeSelectionListener.hxx"
diff --git a/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
index da7b53e1b3..bdcdab4bff 100644
--- a/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
+++ b/main/chart2/source/controller/dialogs/RangeSelectionListener.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RangeSelectionListener.hxx"
diff --git a/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx b/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
index ebb74b99f2..a8a5f3f62d 100644
--- a/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
+++ b/main/chart2/source/controller/dialogs/TextDirectionListBox.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TextDirectionListBox.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx b/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
index 7f688bcd27..3575ee00a1 100644
--- a/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
+++ b/main/chart2/source/controller/dialogs/TimerTriggeredControllerLock.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TimerTriggeredControllerLock.hxx"
diff --git a/main/chart2/source/controller/dialogs/TitleDialogData.cxx b/main/chart2/source/controller/dialogs/TitleDialogData.cxx
index 05c40ff36e..a4f3145768 100644
--- a/main/chart2/source/controller/dialogs/TitleDialogData.cxx
+++ b/main/chart2/source/controller/dialogs/TitleDialogData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleDialogData.hxx"
#include "TitleHelper.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ChartType.cxx b/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
index 6950974a0d..25d9df4b34 100644
--- a/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ChartType.hxx"
#include "dlg_ChartType.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
index c66e979c73..a4561cb0e6 100644
--- a/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ChartType_UNO.hxx"
#include "dlg_ChartType.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx b/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
index d388f7ab93..108fd66788 100644
--- a/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_CreationWizard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_CreationWizard.hxx"
#include "dlg_CreationWizard.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
index d9c2964d5f..207576f13f 100644
--- a/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_CreationWizard_UNO.hxx"
#include "dlg_CreationWizard.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx b/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
index 696e7adaf8..3cc965c9a3 100644
--- a/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_DataEditor.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_DataEditor.hxx"
#include "dlg_DataEditor.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_DataSource.cxx b/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
index ce9a97442d..74efdf96b2 100644
--- a/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_DataSource.hxx"
#include "dlg_DataSource.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx b/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
index 79987a0bfa..e933e9f568 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertAxis_Grid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertAxis_Grid.hxx"
#include "dlg_InsertAxis_Grid.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx b/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
index 60cd4a3d7b..926e7716a1 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertDataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertDataLabel.hxx"
#include "dlg_InsertDataLabel.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx b/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
index cd14904b11..443b829c5e 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertErrorBars.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertErrorBars.hxx"
#include "dlg_InsertErrorBars.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx b/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
index 8a26d23796..becdb81484 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertLegend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertLegend.hxx"
#include "dlg_InsertLegend.hrc"
#include "res_LegendPosition.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx b/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
index 62e2e032a1..8e6d43b60e 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertTitle.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTitle.hxx"
#include "dlg_InsertTitle.hrc"
#include "res_Titles.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx b/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
index a0b37daa8a..b4545b0eae 100644
--- a/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_InsertTrendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTrendline.hxx"
#include "dlg_InsertTrendline.hrc"
diff --git a/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx b/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
index 639e5acf05..51093ab0ac 100644
--- a/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_NumberFormat.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_NumberFormat.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
index 1de42f4a92..f473f1d45c 100644
--- a/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#ifndef _ZFORLIST_HXX
#ifndef _ZFORLIST_DECLARE_TABLE
#define _ZFORLIST_DECLARE_TABLE
diff --git a/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx b/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
index c22ad9a457..fdb53d7831 100644
--- a/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ShapeFont.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ShapeFont.hxx"
#include "ViewElementListProvider.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx b/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
index 8a4477fc25..7b500cfdbc 100644
--- a/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_ShapeParagraph.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_ShapeParagraph.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/dlg_View3D.cxx b/main/chart2/source/controller/dialogs/dlg_View3D.cxx
index 9c3a533c20..826603df85 100644
--- a/main/chart2/source/controller/dialogs/dlg_View3D.cxx
+++ b/main/chart2/source/controller/dialogs/dlg_View3D.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_View3D.hxx"
#include "dlg_View3D.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_BarGeometry.cxx b/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
index ad53bc25eb..9d34af0c46 100644
--- a/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/res_BarGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_BarGeometry.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_DataLabel.cxx b/main/chart2/source/controller/dialogs/res_DataLabel.cxx
index b7bf24aaca..cf6adfb1d7 100644
--- a/main/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_DataLabel.hxx"
#include "res_DataLabel_IDs.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_ErrorBar.cxx b/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
index fc2506308f..f10c8ededb 100644
--- a/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
+++ b/main/chart2/source/controller/dialogs/res_ErrorBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_ErrorBar.hxx"
#include "res_ErrorBar_IDs.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_LegendPosition.cxx b/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
index 387b26faf6..3692bbba78 100644
--- a/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
+++ b/main/chart2/source/controller/dialogs/res_LegendPosition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_LegendPosition.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_TextSeparator.cxx b/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
index e9a16f0a45..20d4d0022d 100644
--- a/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
+++ b/main/chart2/source/controller/dialogs/res_TextSeparator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_TextSeparator.hxx"
#include "ResourceIds.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_Titles.cxx b/main/chart2/source/controller/dialogs/res_Titles.cxx
index 3b6bb8d28e..0dc9bdbf53 100644
--- a/main/chart2/source/controller/dialogs/res_Titles.cxx
+++ b/main/chart2/source/controller/dialogs/res_Titles.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "res_Titles.hxx"
#include "res_Titles.hrc"
diff --git a/main/chart2/source/controller/dialogs/res_Trendline.cxx b/main/chart2/source/controller/dialogs/res_Trendline.cxx
index 51d54291ba..3857819e88 100644
--- a/main/chart2/source/controller/dialogs/res_Trendline.cxx
+++ b/main/chart2/source/controller/dialogs/res_Trendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "dlg_InsertTrendline.hrc"
#include "res_Trendline.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
index 461a01bbe5..f91b90a0c0 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneAppearance.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneAppearance.hxx"
#include "tp_3D_SceneAppearance.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
index 2e87e3d790..657b01ebaa 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneGeometry.hxx"
#include "tp_3D_SceneGeometry.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx b/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 9deb0711f8..c95c72cace 100644
--- a/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/main/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_3D_SceneIllumination.hxx"
#include "tp_3D_SceneIllumination.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
index b9fc879b86..fca6a2a20a 100644
--- a/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
+++ b/main/chart2/source/controller/dialogs/tp_AxisLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_AxisLabel.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx b/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
index 5bc5979612..15444eb99a 100644
--- a/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
+++ b/main/chart2/source/controller/dialogs/tp_AxisPositions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_AxisPositions.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_ChartType.cxx b/main/chart2/source/controller/dialogs/tp_ChartType.cxx
index a6feb5f696..a75231f1fe 100644
--- a/main/chart2/source/controller/dialogs/tp_ChartType.cxx
+++ b/main/chart2/source/controller/dialogs/tp_ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_ChartType.hxx"
#include "tp_ChartType.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataLabel.cxx b/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
index 364f3e0cf6..2455097541 100644
--- a/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataLabel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataLabel.hxx"
#include "TabPages.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataSource.cxx b/main/chart2/source/controller/dialogs/tp_DataSource.cxx
index f4265113be..13fd51a754 100644
--- a/main/chart2/source/controller/dialogs/tp_DataSource.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataSource.hxx"
#include "tp_DataSource.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx b/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
index 965c909602..9380134fa9 100644
--- a/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
+++ b/main/chart2/source/controller/dialogs/tp_DataSourceControls.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_DataSourceControls.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx b/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
index 4310666849..80ea10df2f 100644
--- a/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
+++ b/main/chart2/source/controller/dialogs/tp_ErrorBars.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_ErrorBars.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx b/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
index ba765e0663..ed954ba89d 100644
--- a/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
+++ b/main/chart2/source/controller/dialogs/tp_LegendPosition.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_LegendPosition.hxx"
#include "ResId.hxx"
#include "TabPages.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_Location.cxx b/main/chart2/source/controller/dialogs/tp_Location.cxx
index 6cdd3e53a8..b3e2feeef1 100644
--- a/main/chart2/source/controller/dialogs/tp_Location.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Location.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Location.hxx"
#include "tp_Location.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx b/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
index 13425c8d45..f7b3477877 100644
--- a/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
+++ b/main/chart2/source/controller/dialogs/tp_PointGeometry.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_PointGeometry.hxx"
#include "TabPages.hrc"
#include "res_BarGeometry.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
index cee1c5b311..12e53c649d 100644
--- a/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
+++ b/main/chart2/source/controller/dialogs/tp_PolarOptions.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_PolarOptions.hxx"
#include "tp_PolarOptions.hrc"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx b/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
index 4717773389..8fbd57b658 100644
--- a/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
+++ b/main/chart2/source/controller/dialogs/tp_RangeChooser.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_RangeChooser.hxx"
#include "tp_RangeChooser.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_Scale.cxx b/main/chart2/source/controller/dialogs/tp_Scale.cxx
index d4bd894a30..79b843b364 100644
--- a/main/chart2/source/controller/dialogs/tp_Scale.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Scale.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Scale.hxx"
#include "tp_Scale.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx b/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
index 9bfde2000d..dac6226da6 100644
--- a/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
+++ b/main/chart2/source/controller/dialogs/tp_SeriesToAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_SeriesToAxis.hxx"
#include "tp_SeriesToAxis.hrc"
diff --git a/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
index 9757d3c2c9..a6b794b751 100644
--- a/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
+++ b/main/chart2/source/controller/dialogs/tp_TitleRotation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_TitleRotation.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_Trendline.cxx b/main/chart2/source/controller/dialogs/tp_Trendline.cxx
index eeb6863b07..4111356308 100644
--- a/main/chart2/source/controller/dialogs/tp_Trendline.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Trendline.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Trendline.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx b/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
index 9c16b34ace..64b1e7a6af 100644
--- a/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
+++ b/main/chart2/source/controller/dialogs/tp_Wizard_TitlesAndObjects.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "tp_Wizard_TitlesAndObjects.hxx"
#include "tp_Wizard_TitlesAndObjects.hrc"
diff --git a/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 97eb43123f..20830ce8e5 100644
--- a/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/main/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DrawViewWrapper.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "ConfigurationAccess.hxx"
diff --git a/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx b/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 3754efb9b2..5b7f28fc2d 100644
--- a/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/main/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ViewElementListProvider.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "chartview/DataPointSymbolSupplier.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
index 2eda55cb99..cd7441d321 100644
--- a/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "AxisItemConverter.hxx"
#include "ItemPropertyMap.hxx"
#include "CharacterPropertyItemConverter.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
index a77b39aa81..69803646be 100644
--- a/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CharacterPropertyItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
index 1d54486582..85e685b201 100644
--- a/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DataPointItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
index 8456af2885..a8400b55d4 100644
--- a/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ErrorBarItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
index 63541ce24f..768d97c285 100644
--- a/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "GraphicPropertyItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
index ec2de69b15..640a8b31ec 100644
--- a/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/ItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ItemConverter.hxx"
#include "macros.hxx"
#include <com/sun/star/lang/XComponent.hpp>
diff --git a/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
index 537028dbfc..dc6685120c 100644
--- a/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "LegendItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx b/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
index dcf61e77d7..5b4196aac9 100644
--- a/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/MultipleChartConverters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MultipleChartConverters.hxx"
#include "chartview/ChartSfxItemIds.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
index d292c37890..3416f7ef1c 100644
--- a/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/MultipleItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "MultipleItemConverter.hxx"
#include "ItemPropertyMap.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
index 53ae5da356..22247d0d16 100644
--- a/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RegressionCurveHelper.hxx"
#include "RegressionCurveItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
index c146b2fb61..ca4813587f 100644
--- a/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "RegressionEquationItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
index 5b24c3f4a6..6996ca47c3 100644
--- a/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "SeriesOptionsItemConverter.hxx"
#include "SchWhichPairs.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
index eb49716d32..86cc42e2b6 100644
--- a/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "StatisticsItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
index e73077d92e..39895fc67d 100644
--- a/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
+++ b/main/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "TitleItemConverter.hxx"
#include "SchWhichPairs.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController.cxx b/main/chart2/source/controller/main/ChartController.cxx
index 50a75c1a5f..21ec263a91 100644
--- a/main/chart2/source/controller/main/ChartController.cxx
+++ b/main/chart2/source/controller/main/ChartController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "servicenames.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_EditData.cxx b/main/chart2/source/controller/main/ChartController_EditData.cxx
index e84e7cc3d4..3b503bb1e8 100644
--- a/main/chart2/source/controller/main/ChartController_EditData.cxx
+++ b/main/chart2/source/controller/main/ChartController_EditData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Insert.cxx b/main/chart2/source/controller/main/ChartController_Insert.cxx
index 215bbf5c87..6761f61640 100644
--- a/main/chart2/source/controller/main/ChartController_Insert.cxx
+++ b/main/chart2/source/controller/main/ChartController_Insert.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "dlg_InsertAxis_Grid.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Position.cxx b/main/chart2/source/controller/main/ChartController_Position.cxx
index 5b9d386f71..c7d43b8ae6 100644
--- a/main/chart2/source/controller/main/ChartController_Position.cxx
+++ b/main/chart2/source/controller/main/ChartController_Position.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Properties.cxx b/main/chart2/source/controller/main/ChartController_Properties.cxx
index f8654f73bf..a0bab18799 100644
--- a/main/chart2/source/controller/main/ChartController_Properties.cxx
+++ b/main/chart2/source/controller/main/ChartController_Properties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartWindow.hxx"
#include "chartview/DrawModelWrapper.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_TextEdit.cxx b/main/chart2/source/controller/main/ChartController_TextEdit.cxx
index 1e3e59cd70..f68941b3ea 100644
--- a/main/chart2/source/controller/main/ChartController_TextEdit.cxx
+++ b/main/chart2/source/controller/main/ChartController_TextEdit.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Tools.cxx b/main/chart2/source/controller/main/ChartController_Tools.cxx
index 633e719c96..137efa143d 100644
--- a/main/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/main/chart2/source/controller/main/ChartController_Tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartWindow.hxx"
diff --git a/main/chart2/source/controller/main/ChartController_Window.cxx b/main/chart2/source/controller/main/ChartController_Window.cxx
index 4534cbe39a..f95a3c02f8 100644
--- a/main/chart2/source/controller/main/ChartController_Window.cxx
+++ b/main/chart2/source/controller/main/ChartController_Window.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "PositionAndSizeHelper.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/main/ChartDropTargetHelper.cxx b/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
index 04dcaac0dd..6000e5cc04 100644
--- a/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
+++ b/main/chart2/source/controller/main/ChartDropTargetHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartDropTargetHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartFrameloader.cxx b/main/chart2/source/controller/main/ChartFrameloader.cxx
index 4fb0d8fe77..eec196790a 100644
--- a/main/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/main/chart2/source/controller/main/ChartFrameloader.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartFrameloader.hxx"
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartModelClone.cxx b/main/chart2/source/controller/main/ChartModelClone.cxx
index ef072b2077..76b74174d6 100644
--- a/main/chart2/source/controller/main/ChartModelClone.cxx
+++ b/main/chart2/source/controller/main/ChartModelClone.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartModelClone.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/main/ChartTransferable.cxx b/main/chart2/source/controller/main/ChartTransferable.cxx
index 82401f32e9..89b4703366 100644
--- a/main/chart2/source/controller/main/ChartTransferable.cxx
+++ b/main/chart2/source/controller/main/ChartTransferable.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartTransferable.hxx"
diff --git a/main/chart2/source/controller/main/ChartWindow.cxx b/main/chart2/source/controller/main/ChartWindow.cxx
index 795cb2a355..a83e08d938 100644
--- a/main/chart2/source/controller/main/ChartWindow.cxx
+++ b/main/chart2/source/controller/main/ChartWindow.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartWindow.hxx"
#include "ChartController.hxx"
#include "HelpIds.hrc"
diff --git a/main/chart2/source/controller/main/CommandDispatch.cxx b/main/chart2/source/controller/main/CommandDispatch.cxx
index 1419d4e5d1..c8f69d83d9 100644
--- a/main/chart2/source/controller/main/CommandDispatch.cxx
+++ b/main/chart2/source/controller/main/CommandDispatch.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CommandDispatch.hxx"
#include "CommonFunctors.hxx"
diff --git a/main/chart2/source/controller/main/CommandDispatchContainer.cxx b/main/chart2/source/controller/main/CommandDispatchContainer.cxx
index dc43726aeb..7a7493a3ed 100644
--- a/main/chart2/source/controller/main/CommandDispatchContainer.cxx
+++ b/main/chart2/source/controller/main/CommandDispatchContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "CommandDispatchContainer.hxx"
#include "UndoCommandDispatch.hxx"
diff --git a/main/chart2/source/controller/main/ConfigurationAccess.cxx b/main/chart2/source/controller/main/ConfigurationAccess.cxx
index 32d4dfa5eb..6fc76ecc39 100644
--- a/main/chart2/source/controller/main/ConfigurationAccess.cxx
+++ b/main/chart2/source/controller/main/ConfigurationAccess.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ConfigurationAccess.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/ControllerCommandDispatch.cxx b/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
index 35556cac30..892c60e387 100644
--- a/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/ControllerCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ControllerCommandDispatch.hxx"
#include "ChartModelHelper.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_Base.cxx b/main/chart2/source/controller/main/DragMethod_Base.cxx
index 8095da02b0..c7667bfd76 100644
--- a/main/chart2/source/controller/main/DragMethod_Base.cxx
+++ b/main/chart2/source/controller/main/DragMethod_Base.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_Base.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_PieSegment.cxx b/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
index 8bb7ee5767..6c75c49859 100644
--- a/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
+++ b/main/chart2/source/controller/main/DragMethod_PieSegment.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_PieSegment.hxx"
diff --git a/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx b/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
index 7ba5b28ff5..7258d97c01 100644
--- a/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
+++ b/main/chart2/source/controller/main/DragMethod_RotateDiagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DragMethod_RotateDiagram.hxx"
#include "SelectionHelper.hxx"
diff --git a/main/chart2/source/controller/main/DrawCommandDispatch.cxx b/main/chart2/source/controller/main/DrawCommandDispatch.cxx
index 9402ed1e49..a1b386179a 100644
--- a/main/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "DrawCommandDispatch.hxx"
#include "DrawCommandDispatch.hrc"
diff --git a/main/chart2/source/controller/main/ElementSelector.cxx b/main/chart2/source/controller/main/ElementSelector.cxx
index bc509ff26e..e339f5b28d 100644
--- a/main/chart2/source/controller/main/ElementSelector.cxx
+++ b/main/chart2/source/controller/main/ElementSelector.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ElementSelector.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
index 5f6f306bba..b04602db7a 100644
--- a/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
+++ b/main/chart2/source/controller/main/FeatureCommandDispatchBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "FeatureCommandDispatchBase.hxx"
diff --git a/main/chart2/source/controller/main/ObjectHierarchy.cxx b/main/chart2/source/controller/main/ObjectHierarchy.cxx
index d92d737328..f5c1610a7a 100644
--- a/main/chart2/source/controller/main/ObjectHierarchy.cxx
+++ b/main/chart2/source/controller/main/ObjectHierarchy.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ObjectHierarchy.hxx"
#include "ObjectIdentifier.hxx"
diff --git a/main/chart2/source/controller/main/PositionAndSizeHelper.cxx b/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
index 54ee659b85..ae964df7c9 100644
--- a/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
+++ b/main/chart2/source/controller/main/PositionAndSizeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "PositionAndSizeHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/controller/main/SelectionHelper.cxx b/main/chart2/source/controller/main/SelectionHelper.cxx
index 15ce0de45a..a349b04a77 100644
--- a/main/chart2/source/controller/main/SelectionHelper.cxx
+++ b/main/chart2/source/controller/main/SelectionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "SelectionHelper.hxx"
#include "ObjectIdentifier.hxx"
//for C2U
diff --git a/main/chart2/source/controller/main/ShapeController.cxx b/main/chart2/source/controller/main/ShapeController.cxx
index 86ed3a0f11..4a6b594fd8 100644
--- a/main/chart2/source/controller/main/ShapeController.cxx
+++ b/main/chart2/source/controller/main/ShapeController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ShapeController.hxx"
#include "ShapeController.hrc"
diff --git a/main/chart2/source/controller/main/ShapeToolbarController.cxx b/main/chart2/source/controller/main/ShapeToolbarController.cxx
index 67fcd018d3..069dca260b 100644
--- a/main/chart2/source/controller/main/ShapeToolbarController.cxx
+++ b/main/chart2/source/controller/main/ShapeToolbarController.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ShapeToolbarController.hxx"
diff --git a/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
index 6411fc3e6a..f701fa45e0 100644
--- a/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/StatusBarCommandDispatch.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "StatusBarCommandDispatch.hxx"
#include "ObjectNameProvider.hxx"
diff --git a/main/chart2/source/controller/main/UndoActions.cxx b/main/chart2/source/controller/main/UndoActions.cxx
index 6d2cb17fe4..cb5b222ba8 100644
--- a/main/chart2/source/controller/main/UndoActions.cxx
+++ b/main/chart2/source/controller/main/UndoActions.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoActions.hxx"
#include "DisposeHelper.hxx"
diff --git a/main/chart2/source/controller/main/UndoCommandDispatch.cxx b/main/chart2/source/controller/main/UndoCommandDispatch.cxx
index f18e070b99..d402814887 100644
--- a/main/chart2/source/controller/main/UndoCommandDispatch.cxx
+++ b/main/chart2/source/controller/main/UndoCommandDispatch.cxx
@@ -20,7 +20,7 @@
*************************************************************/
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoCommandDispatch.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/controller/main/UndoGuard.cxx b/main/chart2/source/controller/main/UndoGuard.cxx
index 12a50cb4c1..3abc7e76fa 100644
--- a/main/chart2/source/controller/main/UndoGuard.cxx
+++ b/main/chart2/source/controller/main/UndoGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "UndoGuard.hxx"
#include "ChartModelClone.hxx"
diff --git a/main/chart2/source/controller/main/_serviceregistration_controller.cxx b/main/chart2/source/controller/main/_serviceregistration_controller.cxx
index c492dc4b83..1701afd352 100644
--- a/main/chart2/source/controller/main/_serviceregistration_controller.cxx
+++ b/main/chart2/source/controller/main/_serviceregistration_controller.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartcontroller.hxx"
#include "ChartController.hxx"
#include "ChartFrameloader.hxx"
#include "dlg_CreationWizard_UNO.hxx"
diff --git a/main/chart2/source/model/filter/XMLFilter.cxx b/main/chart2/source/model/filter/XMLFilter.cxx
index a5fbc27fd8..6ea6056f9d 100644
--- a/main/chart2/source/model/filter/XMLFilter.cxx
+++ b/main/chart2/source/model/filter/XMLFilter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "XMLFilter.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/Axis.cxx b/main/chart2/source/model/main/Axis.cxx
index 5c99ded4bd..31b5d17c99 100644
--- a/main/chart2/source/model/main/Axis.cxx
+++ b/main/chart2/source/model/main/Axis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Axis.hxx"
#include "GridProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/BaseCoordinateSystem.cxx b/main/chart2/source/model/main/BaseCoordinateSystem.cxx
index 53c9ea94da..6df7662c71 100644
--- a/main/chart2/source/model/main/BaseCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/BaseCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BaseCoordinateSystem.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/main/CartesianCoordinateSystem.cxx b/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
index e2b1a6f93d..72bcae66f0 100644
--- a/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/CartesianCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "CartesianCoordinateSystem.hxx"
#include "macros.hxx"
#include "servicenames_coosystems.hxx"
diff --git a/main/chart2/source/model/main/ChartModel.cxx b/main/chart2/source/model/main/ChartModel.cxx
index 1296ee7d77..314b874a8f 100644
--- a/main/chart2/source/model/main/ChartModel.cxx
+++ b/main/chart2/source/model/main/ChartModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartModel.hxx"
#include "servicenames.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/model/main/ChartModel_Persistence.cxx b/main/chart2/source/model/main/ChartModel_Persistence.cxx
index 682100ebce..a3f2f741c4 100644
--- a/main/chart2/source/model/main/ChartModel_Persistence.cxx
+++ b/main/chart2/source/model/main/ChartModel_Persistence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartModel.hxx"
#include "MediaDescriptorHelper.hxx"
diff --git a/main/chart2/source/model/main/DataPoint.cxx b/main/chart2/source/model/main/DataPoint.cxx
index 542ad01935..ae1c2e3094 100644
--- a/main/chart2/source/model/main/DataPoint.cxx
+++ b/main/chart2/source/model/main/DataPoint.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataPoint.hxx"
#include "DataPointProperties.hxx"
#include "CharacterProperties.hxx"
diff --git a/main/chart2/source/model/main/DataPointProperties.cxx b/main/chart2/source/model/main/DataPointProperties.cxx
index f9c2c5fd49..03cf54bbf5 100644
--- a/main/chart2/source/model/main/DataPointProperties.cxx
+++ b/main/chart2/source/model/main/DataPointProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataPointProperties.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/DataSeries.cxx b/main/chart2/source/model/main/DataSeries.cxx
index e03d6054e7..83793c6734 100644
--- a/main/chart2/source/model/main/DataSeries.cxx
+++ b/main/chart2/source/model/main/DataSeries.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataSeries.hxx"
#include "DataSeriesProperties.hxx"
#include "DataPointProperties.hxx"
diff --git a/main/chart2/source/model/main/DataSeriesProperties.cxx b/main/chart2/source/model/main/DataSeriesProperties.cxx
index 63f616470b..95822fa24e 100644
--- a/main/chart2/source/model/main/DataSeriesProperties.cxx
+++ b/main/chart2/source/model/main/DataSeriesProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataSeriesProperties.hxx"
#include "DataPointProperties.hxx"
#include "DataPoint.hxx"
diff --git a/main/chart2/source/model/main/Diagram.cxx b/main/chart2/source/model/main/Diagram.cxx
index 7b9d4b333f..b19205dd06 100644
--- a/main/chart2/source/model/main/Diagram.cxx
+++ b/main/chart2/source/model/main/Diagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Diagram.hxx"
#include "macros.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/model/main/FormattedString.cxx b/main/chart2/source/model/main/FormattedString.cxx
index bfdd7a743e..835d68e15b 100644
--- a/main/chart2/source/model/main/FormattedString.cxx
+++ b/main/chart2/source/model/main/FormattedString.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "FormattedString.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/model/main/GridProperties.cxx b/main/chart2/source/model/main/GridProperties.cxx
index 9a98ba488a..d6e47ad4d9 100644
--- a/main/chart2/source/model/main/GridProperties.cxx
+++ b/main/chart2/source/model/main/GridProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "GridProperties.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/LayoutContainer.cxx b/main/chart2/source/model/main/LayoutContainer.cxx
index 1754b8edc4..b1b9c38839 100644
--- a/main/chart2/source/model/main/LayoutContainer.cxx
+++ b/main/chart2/source/model/main/LayoutContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LayoutContainer.hxx"
#include "macros.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/model/main/Legend.cxx b/main/chart2/source/model/main/Legend.cxx
index 2f92c9c45b..19925971bc 100644
--- a/main/chart2/source/model/main/Legend.cxx
+++ b/main/chart2/source/model/main/Legend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Legend.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/PageBackground.cxx b/main/chart2/source/model/main/PageBackground.cxx
index 58bf42c96a..5b1fff22b1 100644
--- a/main/chart2/source/model/main/PageBackground.cxx
+++ b/main/chart2/source/model/main/PageBackground.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PageBackground.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/PolarCoordinateSystem.cxx b/main/chart2/source/model/main/PolarCoordinateSystem.cxx
index 66431cbdf1..dc5d19e477 100644
--- a/main/chart2/source/model/main/PolarCoordinateSystem.cxx
+++ b/main/chart2/source/model/main/PolarCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PolarCoordinateSystem.hxx"
#include "macros.hxx"
#include "servicenames_coosystems.hxx"
diff --git a/main/chart2/source/model/main/StockBar.cxx b/main/chart2/source/model/main/StockBar.cxx
index a09a5ffc1b..643184cfb8 100644
--- a/main/chart2/source/model/main/StockBar.cxx
+++ b/main/chart2/source/model/main/StockBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockBar.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/Title.cxx b/main/chart2/source/model/main/Title.cxx
index a93376d99c..16ce611e77 100644
--- a/main/chart2/source/model/main/Title.cxx
+++ b/main/chart2/source/model/main/Title.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Title.hxx"
#include "macros.hxx"
#include "FormattedString.hxx"
diff --git a/main/chart2/source/model/main/UndoManager.cxx b/main/chart2/source/model/main/UndoManager.cxx
index a6b2f8480a..fd1034b674 100644
--- a/main/chart2/source/model/main/UndoManager.cxx
+++ b/main/chart2/source/model/main/UndoManager.cxx
@@ -21,7 +21,7 @@
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "UndoManager.hxx"
#include "ChartViewHelper.hxx"
diff --git a/main/chart2/source/model/main/Wall.cxx b/main/chart2/source/model/main/Wall.cxx
index 5f6eed7010..e6053c77c5 100644
--- a/main/chart2/source/model/main/Wall.cxx
+++ b/main/chart2/source/model/main/Wall.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "Wall.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/model/main/_serviceregistration_model.cxx b/main/chart2/source/model/main/_serviceregistration_model.cxx
index 4bb151f602..3fa4d6a728 100644
--- a/main/chart2/source/model/main/_serviceregistration_model.cxx
+++ b/main/chart2/source/model/main/_serviceregistration_model.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include <cppuhelper/implementationentry.hxx>
#ifndef _CHARTMODEL_HXX
#include "ChartModel.hxx"
diff --git a/main/chart2/source/model/template/AreaChartType.cxx b/main/chart2/source/model/template/AreaChartType.cxx
index 1833a6dc71..6259580428 100644
--- a/main/chart2/source/model/template/AreaChartType.cxx
+++ b/main/chart2/source/model/template/AreaChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "AreaChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/AreaChartTypeTemplate.cxx b/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
index 3be25e6afd..695b85d8a2 100644
--- a/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/AreaChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "AreaChartTypeTemplate.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/BarChartType.cxx b/main/chart2/source/model/template/BarChartType.cxx
index da32f48ff4..0c0744d9ed 100644
--- a/main/chart2/source/model/template/BarChartType.cxx
+++ b/main/chart2/source/model/template/BarChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BarChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/BarChartTypeTemplate.cxx b/main/chart2/source/model/template/BarChartTypeTemplate.cxx
index a445e53b85..b56f8aba04 100644
--- a/main/chart2/source/model/template/BarChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/BarChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BarChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/model/template/BubbleChartType.cxx b/main/chart2/source/model/template/BubbleChartType.cxx
index 71853bfd72..d385344c1c 100644
--- a/main/chart2/source/model/template/BubbleChartType.cxx
+++ b/main/chart2/source/model/template/BubbleChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
index 39ac21c75e..6134c608c5 100644
--- a/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/BubbleChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleChartTypeTemplate.hxx"
#include "macros.hxx"
#include "BubbleDataInterpreter.hxx"
diff --git a/main/chart2/source/model/template/BubbleDataInterpreter.cxx b/main/chart2/source/model/template/BubbleDataInterpreter.cxx
index 7cbccf24cc..e4f4b62100 100644
--- a/main/chart2/source/model/template/BubbleDataInterpreter.cxx
+++ b/main/chart2/source/model/template/BubbleDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "BubbleDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/CandleStickChartType.cxx b/main/chart2/source/model/template/CandleStickChartType.cxx
index 97de4342b9..7b752de6cc 100644
--- a/main/chart2/source/model/template/CandleStickChartType.cxx
+++ b/main/chart2/source/model/template/CandleStickChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "CandleStickChartType.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/model/template/ChartType.cxx b/main/chart2/source/model/template/ChartType.cxx
index 77730a7dc7..57e8b026e6 100644
--- a/main/chart2/source/model/template/ChartType.cxx
+++ b/main/chart2/source/model/template/ChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartType.hxx"
#include "PropertyHelper.hxx"
#include "CommonFunctors.hxx"
diff --git a/main/chart2/source/model/template/ChartTypeManager.cxx b/main/chart2/source/model/template/ChartTypeManager.cxx
index 8c71918eb8..6a0e16c383 100644
--- a/main/chart2/source/model/template/ChartTypeManager.cxx
+++ b/main/chart2/source/model/template/ChartTypeManager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartTypeManager.hxx"
#include "macros.hxx"
#include "StackMode.hxx"
diff --git a/main/chart2/source/model/template/ChartTypeTemplate.cxx b/main/chart2/source/model/template/ChartTypeTemplate.cxx
index 29ae56cd99..67df171491 100644
--- a/main/chart2/source/model/template/ChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ChartTypeTemplate.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/ColumnChartType.cxx b/main/chart2/source/model/template/ColumnChartType.cxx
index 5946b7e356..c634c47d1c 100644
--- a/main/chart2/source/model/template/ColumnChartType.cxx
+++ b/main/chart2/source/model/template/ColumnChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnChartType.hxx"
#include "macros.hxx"
#include "servicenames_charttypes.hxx"
diff --git a/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
index cee05a90d4..9c1199ca93 100644
--- a/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnLineChartTypeTemplate.hxx"
#include "macros.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
index 714111d2d1..1939fcf9e0 100644
--- a/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
+++ b/main/chart2/source/model/template/ColumnLineDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ColumnLineDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/DataInterpreter.cxx b/main/chart2/source/model/template/DataInterpreter.cxx
index 55bdd7aabe..803231c3e4 100644
--- a/main/chart2/source/model/template/DataInterpreter.cxx
+++ b/main/chart2/source/model/template/DataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "DataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/FilledNetChartType.cxx b/main/chart2/source/model/template/FilledNetChartType.cxx
index f2b19afcc2..7bc2403a6a 100644
--- a/main/chart2/source/model/template/FilledNetChartType.cxx
+++ b/main/chart2/source/model/template/FilledNetChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "FilledNetChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/LineChartType.cxx b/main/chart2/source/model/template/LineChartType.cxx
index 1ecc60ec1c..75a46656e3 100644
--- a/main/chart2/source/model/template/LineChartType.cxx
+++ b/main/chart2/source/model/template/LineChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LineChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/LineChartTypeTemplate.cxx b/main/chart2/source/model/template/LineChartTypeTemplate.cxx
index 269702be1a..091de42b0b 100644
--- a/main/chart2/source/model/template/LineChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/LineChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "LineChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/model/template/NetChartType.cxx b/main/chart2/source/model/template/NetChartType.cxx
index 70bbf40553..2f02202c80 100644
--- a/main/chart2/source/model/template/NetChartType.cxx
+++ b/main/chart2/source/model/template/NetChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "NetChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/NetChartTypeTemplate.cxx b/main/chart2/source/model/template/NetChartTypeTemplate.cxx
index 6efcb98d7c..18e932c406 100644
--- a/main/chart2/source/model/template/NetChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/NetChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "NetChartTypeTemplate.hxx"
#include "macros.hxx"
#include "PolarCoordinateSystem.hxx"
diff --git a/main/chart2/source/model/template/PieChartType.cxx b/main/chart2/source/model/template/PieChartType.cxx
index d5edbf6cb9..d1b9c066f1 100644
--- a/main/chart2/source/model/template/PieChartType.cxx
+++ b/main/chart2/source/model/template/PieChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PieChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/PieChartTypeTemplate.cxx b/main/chart2/source/model/template/PieChartTypeTemplate.cxx
index a080259036..d28d510398 100644
--- a/main/chart2/source/model/template/PieChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/PieChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "PieChartTypeTemplate.hxx"
#include "macros.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/model/template/ScatterChartType.cxx b/main/chart2/source/model/template/ScatterChartType.cxx
index 37641d0139..7743e95c61 100644
--- a/main/chart2/source/model/template/ScatterChartType.cxx
+++ b/main/chart2/source/model/template/ScatterChartType.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ScatterChartType.hxx"
#include "PropertyHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
index 2096b06966..f0ef5eac24 100644
--- a/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/ScatterChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "ScatterChartTypeTemplate.hxx"
#include "macros.hxx"
#include "XYDataInterpreter.hxx"
diff --git a/main/chart2/source/model/template/StockChartTypeTemplate.cxx b/main/chart2/source/model/template/StockChartTypeTemplate.cxx
index d9efb9084f..455fc9c8ea 100644
--- a/main/chart2/source/model/template/StockChartTypeTemplate.cxx
+++ b/main/chart2/source/model/template/StockChartTypeTemplate.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockChartTypeTemplate.hxx"
#include "macros.hxx"
#include "DataSeriesHelper.hxx"
diff --git a/main/chart2/source/model/template/StockDataInterpreter.cxx b/main/chart2/source/model/template/StockDataInterpreter.cxx
index f560650687..3347aed11b 100644
--- a/main/chart2/source/model/template/StockDataInterpreter.cxx
+++ b/main/chart2/source/model/template/StockDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "StockDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/XYDataInterpreter.cxx b/main/chart2/source/model/template/XYDataInterpreter.cxx
index 78f9eb28e5..da7ea94140 100644
--- a/main/chart2/source/model/template/XYDataInterpreter.cxx
+++ b/main/chart2/source/model/template/XYDataInterpreter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "XYDataInterpreter.hxx"
#include "DataSeries.hxx"
diff --git a/main/chart2/source/model/template/_serviceregistration_charttypes.cxx b/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
index ebc0678a3e..7a76da8e1c 100644
--- a/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
+++ b/main/chart2/source/model/template/_serviceregistration_charttypes.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartmodel.hxx"
#include "_serviceregistration_charttypes.hxx"
diff --git a/main/chart2/source/tools/AxisHelper.cxx b/main/chart2/source/tools/AxisHelper.cxx
index 0e0553d295..b3521a84dd 100644
--- a/main/chart2/source/tools/AxisHelper.cxx
+++ b/main/chart2/source/tools/AxisHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "AxisHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/BaseGFXHelper.cxx b/main/chart2/source/tools/BaseGFXHelper.cxx
index 63bf5fe8e9..aa24747b1b 100644
--- a/main/chart2/source/tools/BaseGFXHelper.cxx
+++ b/main/chart2/source/tools/BaseGFXHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "BaseGFXHelper.hxx"
#include <com/sun/star/drawing/DoubleSequence.hpp>
diff --git a/main/chart2/source/tools/CachedDataSequence.cxx b/main/chart2/source/tools/CachedDataSequence.cxx
index e529e47ca5..1e24c25fc5 100644
--- a/main/chart2/source/tools/CachedDataSequence.cxx
+++ b/main/chart2/source/tools/CachedDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CachedDataSequence.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/CharacterProperties.cxx b/main/chart2/source/tools/CharacterProperties.cxx
index b8f9187d32..59476809ea 100644
--- a/main/chart2/source/tools/CharacterProperties.cxx
+++ b/main/chart2/source/tools/CharacterProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CharacterProperties.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ChartDebugTrace.cxx b/main/chart2/source/tools/ChartDebugTrace.cxx
index 84b6b57739..6b9500796b 100644
--- a/main/chart2/source/tools/ChartDebugTrace.cxx
+++ b/main/chart2/source/tools/ChartDebugTrace.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartDebugTrace.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ChartModelHelper.cxx b/main/chart2/source/tools/ChartModelHelper.cxx
index c75771752d..d9cf01b8eb 100644
--- a/main/chart2/source/tools/ChartModelHelper.cxx
+++ b/main/chart2/source/tools/ChartModelHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartModelHelper.hxx"
#include "macros.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ChartTypeHelper.cxx b/main/chart2/source/tools/ChartTypeHelper.cxx
index 412e3afdc6..0ad0f7dc5e 100644
--- a/main/chart2/source/tools/ChartTypeHelper.cxx
+++ b/main/chart2/source/tools/ChartTypeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartTypeHelper.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ChartViewHelper.cxx b/main/chart2/source/tools/ChartViewHelper.cxx
index 03d3fdc1a5..3bba43c11a 100644
--- a/main/chart2/source/tools/ChartViewHelper.cxx
+++ b/main/chart2/source/tools/ChartViewHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ChartViewHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ColorPerPointHelper.cxx b/main/chart2/source/tools/ColorPerPointHelper.cxx
index a53e9d676a..78cf8a736b 100644
--- a/main/chart2/source/tools/ColorPerPointHelper.cxx
+++ b/main/chart2/source/tools/ColorPerPointHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ColorPerPointHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/CommonConverters.cxx b/main/chart2/source/tools/CommonConverters.cxx
index 440a4326ce..d49afb3f5f 100644
--- a/main/chart2/source/tools/CommonConverters.cxx
+++ b/main/chart2/source/tools/CommonConverters.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "CommonConverters.hxx"
#include <com/sun/star/drawing/DoubleSequence.hpp>
#include <com/sun/star/text/WritingMode2.hpp>
diff --git a/main/chart2/source/tools/ConfigColorScheme.cxx b/main/chart2/source/tools/ConfigColorScheme.cxx
index 4f0a9bd32d..f4f287be51 100644
--- a/main/chart2/source/tools/ConfigColorScheme.cxx
+++ b/main/chart2/source/tools/ConfigColorScheme.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ConfigColorScheme.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/tools/ControllerLockGuard.cxx b/main/chart2/source/tools/ControllerLockGuard.cxx
index 5a0baf90b0..db5a9b30b6 100644
--- a/main/chart2/source/tools/ControllerLockGuard.cxx
+++ b/main/chart2/source/tools/ControllerLockGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ControllerLockGuard.hxx"
diff --git a/main/chart2/source/tools/DataSeriesHelper.cxx b/main/chart2/source/tools/DataSeriesHelper.cxx
index cda479e604..2b07975fa4 100644
--- a/main/chart2/source/tools/DataSeriesHelper.cxx
+++ b/main/chart2/source/tools/DataSeriesHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSeriesHelper.hxx"
#include "DiagramHelper.hxx"
#include "DataSource.hxx"
diff --git a/main/chart2/source/tools/DataSource.cxx b/main/chart2/source/tools/DataSource.cxx
index d759a5af95..c14ad71ad8 100644
--- a/main/chart2/source/tools/DataSource.cxx
+++ b/main/chart2/source/tools/DataSource.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSource.hxx"
#include "LabeledDataSequence.hxx"
diff --git a/main/chart2/source/tools/DataSourceHelper.cxx b/main/chart2/source/tools/DataSourceHelper.cxx
index 2bcd666c36..3bac241533 100644
--- a/main/chart2/source/tools/DataSourceHelper.cxx
+++ b/main/chart2/source/tools/DataSourceHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DataSourceHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/DiagramHelper.cxx b/main/chart2/source/tools/DiagramHelper.cxx
index ec09b6a984..9ead49af38 100644
--- a/main/chart2/source/tools/DiagramHelper.cxx
+++ b/main/chart2/source/tools/DiagramHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "DiagramHelper.hxx"
#include "LegendHelper.hxx"
#include "PropertyHelper.hxx"
diff --git a/main/chart2/source/tools/ErrorBar.cxx b/main/chart2/source/tools/ErrorBar.cxx
index 03f49d0afb..249396a961 100644
--- a/main/chart2/source/tools/ErrorBar.cxx
+++ b/main/chart2/source/tools/ErrorBar.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ErrorBar.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/ExplicitCategoriesProvider.cxx b/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
index 92e595691c..3f43ed5ab5 100644
--- a/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
+++ b/main/chart2/source/tools/ExplicitCategoriesProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ExplicitCategoriesProvider.hxx"
#include "DiagramHelper.hxx"
diff --git a/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
index 2dc03f47dc..00fa196a5e 100644
--- a/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ExponentialRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/FillProperties.cxx b/main/chart2/source/tools/FillProperties.cxx
index c9886a9253..2a7154f41c 100644
--- a/main/chart2/source/tools/FillProperties.cxx
+++ b/main/chart2/source/tools/FillProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "FillProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/FormattedStringHelper.cxx b/main/chart2/source/tools/FormattedStringHelper.cxx
index c1b61251da..a89268059f 100644
--- a/main/chart2/source/tools/FormattedStringHelper.cxx
+++ b/main/chart2/source/tools/FormattedStringHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "FormattedStringHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ImplOPropertySet.cxx b/main/chart2/source/tools/ImplOPropertySet.cxx
index 043b3a89fe..641b14d61d 100644
--- a/main/chart2/source/tools/ImplOPropertySet.cxx
+++ b/main/chart2/source/tools/ImplOPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ImplOPropertySet.hxx"
#include "CloneHelper.hxx"
diff --git a/main/chart2/source/tools/InternalData.cxx b/main/chart2/source/tools/InternalData.cxx
index 5008c0ec8a..6bcd1bd051 100644
--- a/main/chart2/source/tools/InternalData.cxx
+++ b/main/chart2/source/tools/InternalData.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "InternalData.hxx"
#include "ResId.hxx"
diff --git a/main/chart2/source/tools/InternalDataProvider.cxx b/main/chart2/source/tools/InternalDataProvider.cxx
index de93c1e02b..d58bec677e 100644
--- a/main/chart2/source/tools/InternalDataProvider.cxx
+++ b/main/chart2/source/tools/InternalDataProvider.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include <rtl/math.hxx>
#include <valarray>
diff --git a/main/chart2/source/tools/LabeledDataSequence.cxx b/main/chart2/source/tools/LabeledDataSequence.cxx
index ac9ca3157b..cae38f31de 100644
--- a/main/chart2/source/tools/LabeledDataSequence.cxx
+++ b/main/chart2/source/tools/LabeledDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LabeledDataSequence.hxx"
#include "ModifyListenerHelper.hxx"
diff --git a/main/chart2/source/tools/LegendHelper.cxx b/main/chart2/source/tools/LegendHelper.cxx
index 94b70e9145..ef020e71af 100644
--- a/main/chart2/source/tools/LegendHelper.cxx
+++ b/main/chart2/source/tools/LegendHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LegendHelper.hxx"
#include "macros.hxx"
#include <com/sun/star/chart/ChartLegendExpansion.hpp>
diff --git a/main/chart2/source/tools/LifeTime.cxx b/main/chart2/source/tools/LifeTime.cxx
index 23c0be0ad9..4a24831f2a 100644
--- a/main/chart2/source/tools/LifeTime.cxx
+++ b/main/chart2/source/tools/LifeTime.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LifeTime.hxx"
#include "macros.hxx"
#include <osl/diagnose.h>
diff --git a/main/chart2/source/tools/LineProperties.cxx b/main/chart2/source/tools/LineProperties.cxx
index 447ae37a1f..b1da820fed 100644
--- a/main/chart2/source/tools/LineProperties.cxx
+++ b/main/chart2/source/tools/LineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LineProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
index 5492bf83f6..8c6887465e 100644
--- a/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/LinearRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LinearRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
index 3b89d50a8b..7a987ac6bc 100644
--- a/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "LogarithmicRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
index b5048ed9e2..00c19a95d8 100644
--- a/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MeanValueRegressionCurveCalculator.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/MediaDescriptorHelper.cxx b/main/chart2/source/tools/MediaDescriptorHelper.cxx
index 9836c32f40..36727cfe08 100644
--- a/main/chart2/source/tools/MediaDescriptorHelper.cxx
+++ b/main/chart2/source/tools/MediaDescriptorHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MediaDescriptorHelper.hxx"
using namespace ::com::sun::star;
diff --git a/main/chart2/source/tools/ModifyListenerCallBack.cxx b/main/chart2/source/tools/ModifyListenerCallBack.cxx
index 12ffed119c..4ee71433ea 100644
--- a/main/chart2/source/tools/ModifyListenerCallBack.cxx
+++ b/main/chart2/source/tools/ModifyListenerCallBack.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ModifyListenerCallBack.hxx"
#include "MutexContainer.hxx"
diff --git a/main/chart2/source/tools/ModifyListenerHelper.cxx b/main/chart2/source/tools/ModifyListenerHelper.cxx
index 417e46b130..93e8d7ca38 100644
--- a/main/chart2/source/tools/ModifyListenerHelper.cxx
+++ b/main/chart2/source/tools/ModifyListenerHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ModifyListenerHelper.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/MutexContainer.cxx b/main/chart2/source/tools/MutexContainer.cxx
index 66d80f39f0..33cc9c95b1 100644
--- a/main/chart2/source/tools/MutexContainer.cxx
+++ b/main/chart2/source/tools/MutexContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "MutexContainer.hxx"
namespace chart
diff --git a/main/chart2/source/tools/NameContainer.cxx b/main/chart2/source/tools/NameContainer.cxx
index b9f2283efd..8ee3b39df0 100644
--- a/main/chart2/source/tools/NameContainer.cxx
+++ b/main/chart2/source/tools/NameContainer.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NameContainer.hxx"
diff --git a/main/chart2/source/tools/NamedFillProperties.cxx b/main/chart2/source/tools/NamedFillProperties.cxx
index 57ebfcef32..4b25a0e7e2 100644
--- a/main/chart2/source/tools/NamedFillProperties.cxx
+++ b/main/chart2/source/tools/NamedFillProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedFillProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NamedLineProperties.cxx b/main/chart2/source/tools/NamedLineProperties.cxx
index 7361e3a95b..e0a7b6d716 100644
--- a/main/chart2/source/tools/NamedLineProperties.cxx
+++ b/main/chart2/source/tools/NamedLineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedLineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NamedProperties.cxx b/main/chart2/source/tools/NamedProperties.cxx
index a8b99d0ffc..f6b45134fd 100644
--- a/main/chart2/source/tools/NamedProperties.cxx
+++ b/main/chart2/source/tools/NamedProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NamedProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/NumberFormatterWrapper.cxx b/main/chart2/source/tools/NumberFormatterWrapper.cxx
index e7ce7d1f5b..9fea3d35eb 100644
--- a/main/chart2/source/tools/NumberFormatterWrapper.cxx
+++ b/main/chart2/source/tools/NumberFormatterWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "NumberFormatterWrapper.hxx"
#include "macros.hxx"
#include <comphelper/processfactory.hxx>
diff --git a/main/chart2/source/tools/OPropertySet.cxx b/main/chart2/source/tools/OPropertySet.cxx
index cfced14993..be98ee1c09 100644
--- a/main/chart2/source/tools/OPropertySet.cxx
+++ b/main/chart2/source/tools/OPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "OPropertySet.hxx"
#include "ImplOPropertySet.hxx"
#include "ContainerHelper.hxx"
diff --git a/main/chart2/source/tools/ObjectIdentifier.cxx b/main/chart2/source/tools/ObjectIdentifier.cxx
index 5539b08c5e..cbe6357f07 100644
--- a/main/chart2/source/tools/ObjectIdentifier.cxx
+++ b/main/chart2/source/tools/ObjectIdentifier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ObjectIdentifier.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
index 6e0aa6271e..88218cb8a0 100644
--- a/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/PotentialRegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "PotentialRegressionCurveCalculator.hxx"
#include "macros.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/PropertyHelper.cxx b/main/chart2/source/tools/PropertyHelper.cxx
index 27b2ab0c87..cc52434810 100644
--- a/main/chart2/source/tools/PropertyHelper.cxx
+++ b/main/chart2/source/tools/PropertyHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "PropertyHelper.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/RangeHighlighter.cxx b/main/chart2/source/tools/RangeHighlighter.cxx
index d8e844d636..7baba7b312 100644
--- a/main/chart2/source/tools/RangeHighlighter.cxx
+++ b/main/chart2/source/tools/RangeHighlighter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RangeHighlighter.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/ReferenceSizeProvider.cxx b/main/chart2/source/tools/ReferenceSizeProvider.cxx
index c0239c07a3..22c6badbee 100644
--- a/main/chart2/source/tools/ReferenceSizeProvider.cxx
+++ b/main/chart2/source/tools/ReferenceSizeProvider.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ReferenceSizeProvider.hxx"
#include "RelativeSizeHelper.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveCalculator.cxx b/main/chart2/source/tools/RegressionCurveCalculator.cxx
index 82e6c6a753..c323c8e647 100644
--- a/main/chart2/source/tools/RegressionCurveCalculator.cxx
+++ b/main/chart2/source/tools/RegressionCurveCalculator.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveCalculator.hxx"
#include "RegressionCalculationHelper.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveHelper.cxx b/main/chart2/source/tools/RegressionCurveHelper.cxx
index 7fd70f4ec7..90a9b70a77 100644
--- a/main/chart2/source/tools/RegressionCurveHelper.cxx
+++ b/main/chart2/source/tools/RegressionCurveHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveHelper.hxx"
#include "MeanValueRegressionCurveCalculator.hxx"
#include "LinearRegressionCurveCalculator.hxx"
diff --git a/main/chart2/source/tools/RegressionCurveModel.cxx b/main/chart2/source/tools/RegressionCurveModel.cxx
index 77e580955a..cfc5c9c192 100644
--- a/main/chart2/source/tools/RegressionCurveModel.cxx
+++ b/main/chart2/source/tools/RegressionCurveModel.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionCurveModel.hxx"
#include "macros.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/RegressionEquation.cxx b/main/chart2/source/tools/RegressionEquation.cxx
index 3779f45708..cfb4d071f6 100644
--- a/main/chart2/source/tools/RegressionEquation.cxx
+++ b/main/chart2/source/tools/RegressionEquation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RegressionEquation.hxx"
#include "LineProperties.hxx"
diff --git a/main/chart2/source/tools/RelativePositionHelper.cxx b/main/chart2/source/tools/RelativePositionHelper.cxx
index fa73b4957b..2e5b2a5ec5 100644
--- a/main/chart2/source/tools/RelativePositionHelper.cxx
+++ b/main/chart2/source/tools/RelativePositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RelativePositionHelper.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/tools/RelativeSizeHelper.cxx b/main/chart2/source/tools/RelativeSizeHelper.cxx
index 84fed3ebfc..f1546ebc6c 100644
--- a/main/chart2/source/tools/RelativeSizeHelper.cxx
+++ b/main/chart2/source/tools/RelativeSizeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RelativeSizeHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/ResId.cxx b/main/chart2/source/tools/ResId.cxx
index 80670c37cf..d132718234 100644
--- a/main/chart2/source/tools/ResId.cxx
+++ b/main/chart2/source/tools/ResId.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ResId.hxx"
#include "RessourceManager.hxx"
diff --git a/main/chart2/source/tools/RessourceManager.cxx b/main/chart2/source/tools/RessourceManager.cxx
index 4a0da6707e..2d9437e616 100644
--- a/main/chart2/source/tools/RessourceManager.cxx
+++ b/main/chart2/source/tools/RessourceManager.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "RessourceManager.hxx"
diff --git a/main/chart2/source/tools/Scaling.cxx b/main/chart2/source/tools/Scaling.cxx
index 4d494b5bc1..49295399dd 100644
--- a/main/chart2/source/tools/Scaling.cxx
+++ b/main/chart2/source/tools/Scaling.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "Scaling.hxx"
#include <rtl/math.hxx>
#include "com/sun/star/uno/RuntimeException.hpp"
diff --git a/main/chart2/source/tools/SceneProperties.cxx b/main/chart2/source/tools/SceneProperties.cxx
index d62881ee5a..bfe2a78e50 100644
--- a/main/chart2/source/tools/SceneProperties.cxx
+++ b/main/chart2/source/tools/SceneProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "SceneProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/StatisticsHelper.cxx b/main/chart2/source/tools/StatisticsHelper.cxx
index 1aa6e416c6..0a0c3de8c9 100644
--- a/main/chart2/source/tools/StatisticsHelper.cxx
+++ b/main/chart2/source/tools/StatisticsHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "StatisticsHelper.hxx"
#include "DataSeriesHelper.hxx"
#include "ErrorBar.hxx"
diff --git a/main/chart2/source/tools/ThreeDHelper.cxx b/main/chart2/source/tools/ThreeDHelper.cxx
index c643c7e3ad..f3b2c9c32b 100644
--- a/main/chart2/source/tools/ThreeDHelper.cxx
+++ b/main/chart2/source/tools/ThreeDHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "ThreeDHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/TitleHelper.cxx b/main/chart2/source/tools/TitleHelper.cxx
index 2576a8b1ca..cdec845632 100644
--- a/main/chart2/source/tools/TitleHelper.cxx
+++ b/main/chart2/source/tools/TitleHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "TitleHelper.hxx"
#include "ChartModelHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/TrueGuard.cxx b/main/chart2/source/tools/TrueGuard.cxx
index 0697034b2a..8e5e4b7f33 100644
--- a/main/chart2/source/tools/TrueGuard.cxx
+++ b/main/chart2/source/tools/TrueGuard.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "TrueGuard.hxx"
diff --git a/main/chart2/source/tools/UncachedDataSequence.cxx b/main/chart2/source/tools/UncachedDataSequence.cxx
index f6acc6ff76..43446df651 100644
--- a/main/chart2/source/tools/UncachedDataSequence.cxx
+++ b/main/chart2/source/tools/UncachedDataSequence.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "UncachedDataSequence.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/UserDefinedProperties.cxx b/main/chart2/source/tools/UserDefinedProperties.cxx
index 508f60ec23..66d0dd63ec 100644
--- a/main/chart2/source/tools/UserDefinedProperties.cxx
+++ b/main/chart2/source/tools/UserDefinedProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "UserDefinedProperties.hxx"
#include "macros.hxx"
#include <com/sun/star/beans/PropertyAttribute.hpp>
diff --git a/main/chart2/source/tools/WeakListenerAdapter.cxx b/main/chart2/source/tools/WeakListenerAdapter.cxx
index eedcee821c..71ee53bdcc 100644
--- a/main/chart2/source/tools/WeakListenerAdapter.cxx
+++ b/main/chart2/source/tools/WeakListenerAdapter.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WeakListenerAdapter.hxx"
diff --git a/main/chart2/source/tools/WrappedDefaultProperty.cxx b/main/chart2/source/tools/WrappedDefaultProperty.cxx
index a06d8d01db..9e1cf9766b 100644
--- a/main/chart2/source/tools/WrappedDefaultProperty.cxx
+++ b/main/chart2/source/tools/WrappedDefaultProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedDefaultProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedDirectStateProperty.cxx b/main/chart2/source/tools/WrappedDirectStateProperty.cxx
index 7b93d51cc3..72ec20cf57 100644
--- a/main/chart2/source/tools/WrappedDirectStateProperty.cxx
+++ b/main/chart2/source/tools/WrappedDirectStateProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedDirectStateProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedIgnoreProperty.cxx b/main/chart2/source/tools/WrappedIgnoreProperty.cxx
index 3552ab8040..9469171f2a 100644
--- a/main/chart2/source/tools/WrappedIgnoreProperty.cxx
+++ b/main/chart2/source/tools/WrappedIgnoreProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedIgnoreProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedProperty.cxx b/main/chart2/source/tools/WrappedProperty.cxx
index 03d0456028..f52cb98efe 100644
--- a/main/chart2/source/tools/WrappedProperty.cxx
+++ b/main/chart2/source/tools/WrappedProperty.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedProperty.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/WrappedPropertySet.cxx b/main/chart2/source/tools/WrappedPropertySet.cxx
index 2ee5c1b12e..4f09d26841 100644
--- a/main/chart2/source/tools/WrappedPropertySet.cxx
+++ b/main/chart2/source/tools/WrappedPropertySet.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "WrappedPropertySet.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/tools/XMLRangeHelper.cxx b/main/chart2/source/tools/XMLRangeHelper.cxx
index ea6032d0cc..a3bd597f57 100644
--- a/main/chart2/source/tools/XMLRangeHelper.cxx
+++ b/main/chart2/source/tools/XMLRangeHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include "XMLRangeHelper.hxx"
#include <unotools/charclass.hxx>
diff --git a/main/chart2/source/tools/_serviceregistration_tools.cxx b/main/chart2/source/tools/_serviceregistration_tools.cxx
index d3b35f3c2c..9807a381de 100644
--- a/main/chart2/source/tools/_serviceregistration_tools.cxx
+++ b/main/chart2/source/tools/_serviceregistration_tools.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_charttools.hxx"
#include <cppuhelper/implementationentry.hxx>
#include "LabeledDataSequence.hxx"
#include "CachedDataSequence.hxx"
diff --git a/main/chart2/source/view/axes/DateHelper.cxx b/main/chart2/source/view/axes/DateHelper.cxx
index 5ea6f488eb..f0589dfe60 100644
--- a/main/chart2/source/view/axes/DateHelper.cxx
+++ b/main/chart2/source/view/axes/DateHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "DateHelper.hxx"
#include "DateScaling.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/DateScaling.cxx b/main/chart2/source/view/axes/DateScaling.cxx
index b44c85d4bf..d2bf3ce159 100644
--- a/main/chart2/source/view/axes/DateScaling.cxx
+++ b/main/chart2/source/view/axes/DateScaling.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "DateScaling.hxx"
#include <com/sun/star/chart/TimeUnit.hpp>
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx b/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
index cbc903e466..3b8f583dc2 100644
--- a/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
+++ b/main/chart2/source/view/axes/MinimumAndMaximumSupplier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "MinimumAndMaximumSupplier.hxx"
diff --git a/main/chart2/source/view/axes/ScaleAutomatism.cxx b/main/chart2/source/view/axes/ScaleAutomatism.cxx
index 823be39b63..478b9228ba 100644
--- a/main/chart2/source/view/axes/ScaleAutomatism.cxx
+++ b/main/chart2/source/view/axes/ScaleAutomatism.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ScaleAutomatism.hxx"
#include "macros.hxx"
#include "Tickmarks_Equidistant.hxx"
diff --git a/main/chart2/source/view/axes/TickmarkHelper.cxx b/main/chart2/source/view/axes/TickmarkHelper.cxx
index 2a7ea5978f..e8e975a8b7 100644
--- a/main/chart2/source/view/axes/TickmarkHelper.cxx
+++ b/main/chart2/source/view/axes/TickmarkHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "TickmarkHelper.hxx"
#include "ViewDefines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/Tickmarks.cxx b/main/chart2/source/view/axes/Tickmarks.cxx
index 3d9dcfb837..622d23b103 100644
--- a/main/chart2/source/view/axes/Tickmarks.cxx
+++ b/main/chart2/source/view/axes/Tickmarks.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks.hxx"
#include "Tickmarks_Equidistant.hxx"
#include "Tickmarks_Dates.hxx"
diff --git a/main/chart2/source/view/axes/Tickmarks_Dates.cxx b/main/chart2/source/view/axes/Tickmarks_Dates.cxx
index 749a7be2d2..e672c30437 100644
--- a/main/chart2/source/view/axes/Tickmarks_Dates.cxx
+++ b/main/chart2/source/view/axes/Tickmarks_Dates.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks_Dates.hxx"
#include "DateScaling.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx b/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
index e741488f6e..f5b4bbd258 100644
--- a/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
+++ b/main/chart2/source/view/axes/Tickmarks_Equidistant.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Tickmarks_Equidistant.hxx"
#include "ViewDefines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/axes/VAxisBase.cxx b/main/chart2/source/view/axes/VAxisBase.cxx
index 18603d1328..91eb40027a 100644
--- a/main/chart2/source/view/axes/VAxisBase.cxx
+++ b/main/chart2/source/view/axes/VAxisBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisBase.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/axes/VAxisOrGridBase.cxx b/main/chart2/source/view/axes/VAxisOrGridBase.cxx
index bc27050225..c441d2e294 100644
--- a/main/chart2/source/view/axes/VAxisOrGridBase.cxx
+++ b/main/chart2/source/view/axes/VAxisOrGridBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisOrGridBase.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/axes/VAxisProperties.cxx b/main/chart2/source/view/axes/VAxisProperties.cxx
index b5430078ca..fb44d62698 100644
--- a/main/chart2/source/view/axes/VAxisProperties.cxx
+++ b/main/chart2/source/view/axes/VAxisProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VAxisProperties.hxx"
#include "macros.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianAxis.cxx b/main/chart2/source/view/axes/VCartesianAxis.cxx
index a4187d5990..7530b94192 100644
--- a/main/chart2/source/view/axes/VCartesianAxis.cxx
+++ b/main/chart2/source/view/axes/VCartesianAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <basegfx/numeric/ftools.hxx>
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
index a91a9f4e9d..33118fdb30 100644
--- a/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VCartesianCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCartesianCoordinateSystem.hxx"
#include "VCartesianGrid.hxx"
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/axes/VCartesianGrid.cxx b/main/chart2/source/view/axes/VCartesianGrid.cxx
index 291aef4785..721fcc617f 100644
--- a/main/chart2/source/view/axes/VCartesianGrid.cxx
+++ b/main/chart2/source/view/axes/VCartesianGrid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCartesianGrid.hxx"
#include "Tickmarks.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/axes/VCoordinateSystem.cxx b/main/chart2/source/view/axes/VCoordinateSystem.cxx
index 7414d75fbf..94eb7db841 100644
--- a/main/chart2/source/view/axes/VCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VCoordinateSystem.hxx"
#include "VCartesianCoordinateSystem.hxx"
#include "VPolarCoordinateSystem.hxx"
diff --git a/main/chart2/source/view/axes/VPolarAngleAxis.cxx b/main/chart2/source/view/axes/VPolarAngleAxis.cxx
index 00505959b9..ed27d03f88 100644
--- a/main/chart2/source/view/axes/VPolarAngleAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarAngleAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <basegfx/numeric/ftools.hxx>
#include "VPolarAngleAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarAxis.cxx b/main/chart2/source/view/axes/VPolarAxis.cxx
index 8dbfccc857..96cb3d4acd 100644
--- a/main/chart2/source/view/axes/VPolarAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarAxis.hxx"
#include "VPolarAngleAxis.hxx"
#include "VPolarRadiusAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx b/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
index 5fe6e93a02..c75ce6c05d 100644
--- a/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
+++ b/main/chart2/source/view/axes/VPolarCoordinateSystem.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarCoordinateSystem.hxx"
#include "VPolarGrid.hxx"
#include "VPolarAxis.hxx"
diff --git a/main/chart2/source/view/axes/VPolarGrid.cxx b/main/chart2/source/view/axes/VPolarGrid.cxx
index 295a93eab4..9aa8d424ba 100644
--- a/main/chart2/source/view/axes/VPolarGrid.cxx
+++ b/main/chart2/source/view/axes/VPolarGrid.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarGrid.hxx"
#include "VCartesianGrid.hxx"
#include "Tickmarks.hxx"
diff --git a/main/chart2/source/view/axes/VPolarRadiusAxis.cxx b/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
index 3f241ed12c..357822d0aa 100644
--- a/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
+++ b/main/chart2/source/view/axes/VPolarRadiusAxis.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarRadiusAxis.hxx"
#include "VCartesianAxis.hxx"
diff --git a/main/chart2/source/view/charttypes/AreaChart.cxx b/main/chart2/source/view/charttypes/AreaChart.cxx
index 1b2282c543..19b0b2edf1 100644
--- a/main/chart2/source/view/charttypes/AreaChart.cxx
+++ b/main/chart2/source/view/charttypes/AreaChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "AreaChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/BarChart.cxx b/main/chart2/source/view/charttypes/BarChart.cxx
index ca2a5bb37f..dc34a2749c 100644
--- a/main/chart2/source/view/charttypes/BarChart.cxx
+++ b/main/chart2/source/view/charttypes/BarChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BarChart.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/charttypes/BarPositionHelper.cxx b/main/chart2/source/view/charttypes/BarPositionHelper.cxx
index 65910897fb..afb14db0b3 100644
--- a/main/chart2/source/view/charttypes/BarPositionHelper.cxx
+++ b/main/chart2/source/view/charttypes/BarPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BarPositionHelper.hxx"
#include "Linear3DTransformation.hxx"
diff --git a/main/chart2/source/view/charttypes/BubbleChart.cxx b/main/chart2/source/view/charttypes/BubbleChart.cxx
index aa6db7c463..28a68fc04b 100644
--- a/main/chart2/source/view/charttypes/BubbleChart.cxx
+++ b/main/chart2/source/view/charttypes/BubbleChart.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "BubbleChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/CandleStickChart.cxx b/main/chart2/source/view/charttypes/CandleStickChart.cxx
index 82328401ea..76f94c77dc 100644
--- a/main/chart2/source/view/charttypes/CandleStickChart.cxx
+++ b/main/chart2/source/view/charttypes/CandleStickChart.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "CandleStickChart.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx b/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
index 177c9c45e5..3b99d62f2a 100644
--- a/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
+++ b/main/chart2/source/view/charttypes/CategoryPositionHelper.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "CategoryPositionHelper.hxx"
//.............................................................................
diff --git a/main/chart2/source/view/charttypes/PieChart.cxx b/main/chart2/source/view/charttypes/PieChart.cxx
index bffdff9e4b..b20ab3f532 100644
--- a/main/chart2/source/view/charttypes/PieChart.cxx
+++ b/main/chart2/source/view/charttypes/PieChart.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PieChart.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/charttypes/Splines.cxx b/main/chart2/source/view/charttypes/Splines.cxx
index 518fd15983..36c8ca6741 100644
--- a/main/chart2/source/view/charttypes/Splines.cxx
+++ b/main/chart2/source/view/charttypes/Splines.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Splines.hxx"
#include <rtl/math.hxx>
diff --git a/main/chart2/source/view/charttypes/VSeriesPlotter.cxx b/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
index 6e60edd5be..07585b7486 100644
--- a/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
+++ b/main/chart2/source/view/charttypes/VSeriesPlotter.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VSeriesPlotter.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/diagram/VDiagram.cxx b/main/chart2/source/view/diagram/VDiagram.cxx
index 2931c51ddc..98616b6f46 100644
--- a/main/chart2/source/view/diagram/VDiagram.cxx
+++ b/main/chart2/source/view/diagram/VDiagram.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VDiagram.hxx"
#include "PropertyMapper.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/ChartItemPool.cxx b/main/chart2/source/view/main/ChartItemPool.cxx
index 35978a8403..2deeca1658 100644
--- a/main/chart2/source/view/main/ChartItemPool.cxx
+++ b/main/chart2/source/view/main/ChartItemPool.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ChartItemPool.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/ChartView.cxx b/main/chart2/source/view/main/ChartView.cxx
index fc2ebdc524..453b7ed52a 100644
--- a/main/chart2/source/view/main/ChartView.cxx
+++ b/main/chart2/source/view/main/ChartView.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ChartView.hxx"
#include "chartview/DrawModelWrapper.hxx"
diff --git a/main/chart2/source/view/main/Clipping.cxx b/main/chart2/source/view/main/Clipping.cxx
index 6bdcff24a7..e76f9f887c 100644
--- a/main/chart2/source/view/main/Clipping.cxx
+++ b/main/chart2/source/view/main/Clipping.cxx
@@ -23,7 +23,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Clipping.hxx"
#include "CommonConverters.hxx"
diff --git a/main/chart2/source/view/main/DataPointSymbolSupplier.cxx b/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
index ba23bf510b..9286577846 100644
--- a/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
+++ b/main/chart2/source/view/main/DataPointSymbolSupplier.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "chartview/DataPointSymbolSupplier.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/main/DrawModelWrapper.cxx b/main/chart2/source/view/main/DrawModelWrapper.cxx
index 8085fe886f..741233a3ed 100644
--- a/main/chart2/source/view/main/DrawModelWrapper.cxx
+++ b/main/chart2/source/view/main/DrawModelWrapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "chartview/DrawModelWrapper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/LabelPositionHelper.cxx b/main/chart2/source/view/main/LabelPositionHelper.cxx
index 6f3b7ed27d..c50b0ebd01 100644
--- a/main/chart2/source/view/main/LabelPositionHelper.cxx
+++ b/main/chart2/source/view/main/LabelPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "LabelPositionHelper.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/main/Linear3DTransformation.cxx b/main/chart2/source/view/main/Linear3DTransformation.cxx
index 4518f2e0c5..92793ef8af 100644
--- a/main/chart2/source/view/main/Linear3DTransformation.cxx
+++ b/main/chart2/source/view/main/Linear3DTransformation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Linear3DTransformation.hxx"
#include <algorithm>
diff --git a/main/chart2/source/view/main/PlotterBase.cxx b/main/chart2/source/view/main/PlotterBase.cxx
index b9acf284d2..28fb15bfdd 100644
--- a/main/chart2/source/view/main/PlotterBase.cxx
+++ b/main/chart2/source/view/main/PlotterBase.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PlotterBase.hxx"
#include "PlottingPositionHelper.hxx"
#include "ShapeFactory.hxx"
diff --git a/main/chart2/source/view/main/PlottingPositionHelper.cxx b/main/chart2/source/view/main/PlottingPositionHelper.cxx
index fd71c32bac..e1b1159d15 100644
--- a/main/chart2/source/view/main/PlottingPositionHelper.cxx
+++ b/main/chart2/source/view/main/PlottingPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PlottingPositionHelper.hxx"
#include "CommonConverters.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/PolarLabelPositionHelper.cxx b/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
index b29fa38b4f..f5beaf3efc 100644
--- a/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
+++ b/main/chart2/source/view/main/PolarLabelPositionHelper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PolarLabelPositionHelper.hxx"
#include "PlottingPositionHelper.hxx"
diff --git a/main/chart2/source/view/main/PropertyMapper.cxx b/main/chart2/source/view/main/PropertyMapper.cxx
index 015a33deae..391211dd37 100644
--- a/main/chart2/source/view/main/PropertyMapper.cxx
+++ b/main/chart2/source/view/main/PropertyMapper.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "PropertyMapper.hxx"
#include "ContainerHelper.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/ShapeFactory.cxx b/main/chart2/source/view/main/ShapeFactory.cxx
index d416a7556a..319e4d0179 100644
--- a/main/chart2/source/view/main/ShapeFactory.cxx
+++ b/main/chart2/source/view/main/ShapeFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "ShapeFactory.hxx"
#include "ViewDefines.hxx"
#include "Stripe.hxx"
diff --git a/main/chart2/source/view/main/Stripe.cxx b/main/chart2/source/view/main/Stripe.cxx
index aab540a764..a491df1bfb 100644
--- a/main/chart2/source/view/main/Stripe.cxx
+++ b/main/chart2/source/view/main/Stripe.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "Stripe.hxx"
#include "CommonConverters.hxx"
#include <com/sun/star/drawing/PolyPolygonShape3D.hpp>
diff --git a/main/chart2/source/view/main/VDataSeries.cxx b/main/chart2/source/view/main/VDataSeries.cxx
index 2cb5069003..3ac00e82fa 100644
--- a/main/chart2/source/view/main/VDataSeries.cxx
+++ b/main/chart2/source/view/main/VDataSeries.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VDataSeries.hxx"
#include "ObjectIdentifier.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/VLegend.cxx b/main/chart2/source/view/main/VLegend.cxx
index fa67a5f18d..003da791af 100644
--- a/main/chart2/source/view/main/VLegend.cxx
+++ b/main/chart2/source/view/main/VLegend.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLegend.hxx"
#include "macros.hxx"
#include "PropertyMapper.hxx"
diff --git a/main/chart2/source/view/main/VLegendSymbolFactory.cxx b/main/chart2/source/view/main/VLegendSymbolFactory.cxx
index f753df61ab..42217dbd48 100644
--- a/main/chart2/source/view/main/VLegendSymbolFactory.cxx
+++ b/main/chart2/source/view/main/VLegendSymbolFactory.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLegendSymbolFactory.hxx"
#include "macros.hxx"
#include "PropertyMapper.hxx"
diff --git a/main/chart2/source/view/main/VLineProperties.cxx b/main/chart2/source/view/main/VLineProperties.cxx
index efebeff0b6..2fff36e617 100644
--- a/main/chart2/source/view/main/VLineProperties.cxx
+++ b/main/chart2/source/view/main/VLineProperties.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VLineProperties.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/VPolarTransformation.cxx b/main/chart2/source/view/main/VPolarTransformation.cxx
index 0c944e14e8..17f6e63000 100644
--- a/main/chart2/source/view/main/VPolarTransformation.cxx
+++ b/main/chart2/source/view/main/VPolarTransformation.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VPolarTransformation.hxx"
#include "ViewDefines.hxx"
diff --git a/main/chart2/source/view/main/VTitle.cxx b/main/chart2/source/view/main/VTitle.cxx
index ce3577f5da..bb35f6d16e 100644
--- a/main/chart2/source/view/main/VTitle.cxx
+++ b/main/chart2/source/view/main/VTitle.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include "VTitle.hxx"
#include "CommonConverters.hxx"
#include "macros.hxx"
diff --git a/main/chart2/source/view/main/_serviceregistration_view.cxx b/main/chart2/source/view/main/_serviceregistration_view.cxx
index a88291b218..95b0a9e7b1 100644
--- a/main/chart2/source/view/main/_serviceregistration_view.cxx
+++ b/main/chart2/source/view/main/_serviceregistration_view.cxx
@@ -22,7 +22,7 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
-#include "precompiled_chart2.hxx"
+#include "precompiled_chartview.hxx"
#include <cppuhelper/implementationentry.hxx>
#include "ChartView.hxx"
(openoffice) 04/21: Use the right entrypoint name for X86-64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 25912db7455cd3d29b7bc29e06765cc84aed18c9
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 00:44:19 2025 +0200
Use the right entrypoint name for X86-64.
Patch by: me
---
main/vcl/Library_vcl.mk | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/main/vcl/Library_vcl.mk b/main/vcl/Library_vcl.mk
index 48d28c22e6..186fa9aa1d 100644
--- a/main/vcl/Library_vcl.mk
+++ b/main/vcl/Library_vcl.mk
@@ -514,10 +514,17 @@ endif
ifeq ($(OS),WNT)
ifeq ($(USE_MINGW),)
+ifeq ($(CPUNAME),INTEL)
$(eval $(call gb_Library_add_ldflags,vcl,\
/ENTRY:LibMain@12 \
))
endif
+ifeq ($(CPUNAME),X86-64)
+$(eval $(call gb_Library_add_ldflags,vcl,\
+ /ENTRY:LibMain@16 \
+))
+endif
+endif
$(eval $(call gb_Library_add_linked_libs,vcl,\
advapi32 \
gdi32 \
(openoffice) 13/21: Add gbuild targets for Configuration (*.xcs, *.xcu).
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 431aafefb5bdb19fae32da47b9fa65201b369d1e
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 12 11:30:44 2025 +0200
Add gbuild targets for Configuration (*.xcs, *.xcu).
Partially fixes: https://bz.apache.org/ooo/show_bug.cgi?id=118386
Patch by: Michael Stahl <ms...@...>
Review by: me
---
main/solenv/gbuild/Configuration.mk | 445 ++++++++++++++++++++++++++++++++
main/solenv/gbuild/TargetLocations.mk | 22 ++
main/solenv/gbuild/gbuild.mk | 1 +
main/solenv/gbuild/platform/linux.mk | 3 +
main/solenv/gbuild/platform/macosx.mk | 3 +
main/solenv/gbuild/platform/solaris.mk | 3 +
main/solenv/gbuild/platform/windows.mk | 3 +
main/solenv/gbuild/platform/winmingw.mk | 3 +
8 files changed, 483 insertions(+)
diff --git a/main/solenv/gbuild/Configuration.mk b/main/solenv/gbuild/Configuration.mk
new file mode 100644
index 0000000000..59b78cd439
--- /dev/null
+++ b/main/solenv/gbuild/Configuration.mk
@@ -0,0 +1,445 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+# Configuration files: a bit of an overview of the targets:
+#
+# Configuration
+# => XcsTarget: schemas
+# => buildtools
+# => Xcs source
+# => XcuDataTarget: data
+# => buildtools
+# => XcsTarget (schema)
+# => Xcu data source
+# => XcuModuleTaret: modules
+# => buildtools
+# => Xcu data source
+# => XcuLangpackTarget: langpack (per lang)
+# => buildtools
+# => Xcu data source
+# => zip (per lang)
+# => XcuResTarget: resources (per lang)
+# => buildtools
+# => XcuMergeTarget: merge
+# => buildtools (cfgex)
+# => Xcu data source
+# => localize.sdf
+# => XcsTarget (schema)
+
+# Per-repo pattern rules for each repository do not work for all targets
+# because the prerequisites of some targets need to have the stem mangled
+# and this does not seem to be possible in GNU make because when the stem is
+# matched variables have already been expanded (this was possible in dmake).
+#
+# So to keep things consistent the Configuration takes a parameter for the
+# repository and all targets use that to find the source file.
+#
+# Targets where % rule per repo works: XcsTarget XcuDataTarget XcuMergeTarget
+# fails: XcuModuleTarget XcuLangpackTarget XcuResTarget
+#
+gb_Configuration__get_source = $($(gb_Configuration_REPO_$(1)))/$(2)
+
+
+# XcsTarget class
+
+# need to locate a schema file corresponding to some XCU file in the outdir
+define gb_XcsTarget_for_XcuTarget
+$(call gb_XcsTarget_get_outdir_target,$(basename $(1)).xcs)
+endef
+
+gb_Configuration_LANGS := en-US $(filter-out en-US,$(gb_WITH_LANG))
+gb_Configuration_REPOSITORYNAMES := $(gb_Helper_REPOSITORYNAMES)
+
+gb_XcsTarget_XSLT_SchemaVal := $(OUTDIR)/xml/processing/schema_val.xsl
+gb_XcsTarget_XSLT_Sanity := $(OUTDIR)/xml/processing/sanity.xsl
+gb_XcsTarget_XSLT_SchemaTrim := $(OUTDIR)/xml/processing/schema_trim.xsl
+gb_XcsTarget_DTD_Schema := $(OUTDIR)/xml/registry/component-schema.dtd
+
+define gb_XcsTarget__command
+$(call gb_Output_announce,$(2),$(true),XCS,1)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).val \
+ --stringparam componentName $(subst /,.,$(basename $(XCSFILE))) \
+ --stringparam root $(subst $(XCSFILE),,$(3)) \
+ $(gb_XcsTarget_XSLT_SchemaVal) \
+ $(3) \
+ && rm $(1).val && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).sanity \
+ $(gb_XcsTarget_XSLT_Sanity) \
+ $(3) \
+ && rm $(1).sanity && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ $(gb_XcsTarget_XSLT_SchemaTrim) \
+ $(3))
+endef
+
+$(call gb_XcsTarget_get_target,%) : \
+ $(gb_XcsTarget_XSLT_SchemaVal) $(gb_XcsTarget_XSLT_Sanity) \
+ $(gb_XcsTarget_XSLT_SchemaTrim) $(gb_XcsTarget_DTD_Schema)
+ $(call gb_XcsTarget__command,$@,$*,$(filter %.xcs,$^))
+
+$(call gb_XcsTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCS,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcsTarget_get_target,$*) \
+ $(call gb_XcsTarget_get_outdir_target,$(XCSFILE)))
+
+$(call gb_XcsTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuDataTarget class
+
+gb_XcuTarget_XSLT_AllLang := $(OUTDIR)/xml/processing/alllang.xsl
+gb_XcuDataTarget_XSLT_DataVal := $(OUTDIR)/xml/processing/data_val.xsl
+gb_XcuDataTarget_DTD_ComponentUpdate := $(OUTDIR)/xml/registry/component-update.dtd
+
+define gb_XcuDataTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,2)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1).val \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuDataTarget_XSLT_DataVal) \
+ $(3) \
+ && rm -f $(1).val && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuDataTarget_get_target,%) : $(gb_XcuDataTarget_XSLT_DataVal) \
+ $(gb_XcuTarget_XSLT_AllLang) $(gb_XcuDataTarget_DTD_ComponentUpdate)
+ $(call gb_XcuDataTarget__command,$@,$*,$(filter %.xcu,$^))
+
+$(call gb_XcuDataTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,2)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuDataTarget_get_target,$*) \
+ $(call gb_XcuDataTarget_get_outdir_target,$(XCUFILE)))
+
+$(call gb_XcuDataTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuModuleTarget class
+
+define gb_XcuDataSource_for_XcuModuleTarget
+$(call gb_Configuration__get_source,$(1),$(basename $(subst -,.,$(basename $(2)))).xcu)
+endef
+
+define gb_XcsTarget_for_XcuModuleTarget
+$(call gb_XcsTarget_get_outdir_target,$(basename $(subst -,.,$(basename $(1)))).xcs)
+endef
+
+define gb_XcuModuleTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,3)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(4) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --stringparam module $(notdir $(subst -,/,$(basename $(notdir $(2))))) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuModuleTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
+ $(call gb_XcuModuleTarget__command,$@,$*,$(filter %.xcu,$^),$(filter %.xcs,$^))
+
+$(call gb_XcuModuleTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,3)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuModuleTarget_get_target,$*) \
+ $(call gb_XcuModuleTarget_get_outdir_target,$(XCUFILE)))
+
+$(call gb_XcuModuleTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuLangpackTarget class
+
+gb_XcuLangpackTarget__get_outdir_target_with_lang = \
+ $(call gb_XcuLangpackTarget_get_outdir_target,$(basename $(1))-$(2)$(suffix $(1)))
+gb_XcuLangpackTarget__get_target_with_lang = \
+ $(call gb_XcuLangpackTarget_get_target,$(basename $(1))-$(2)$(suffix $(1)))
+
+gb_XcuLangpackTarget_SED_delcomment := $(OUTDIR)/xml/processing/delcomment.sed
+
+define gb_XcuLangpackTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,4)
+$(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $(1)) && \
+ sed -e "s/__LANGUAGE__/$(LANG)/" -f $(gb_XcuLangpackTarget_SED_delcomment)\
+ $(3) > $(1))
+endef
+
+$(call gb_XcuLangpackTarget_get_target,%) : \
+ $(gb_XcuLangpackTarget_SED_delcomment)
+ $(call gb_XcuLangpackTarget__command,$@,$*,$(filter %.tmpl,$^))
+
+$(call gb_XcuLangpackTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,4)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(foreach lang,$(gb_Configuration_LANGS),\
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$*,$(lang)) \
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(XCUFILE),$(lang))))
+
+$(call gb_XcuLangpackTarget_get_outdir_target,%) :
+ $(call gb_Helper_abbreviate_dirs,\
+ $(call gb_Deliver_deliver,$<,$@))
+
+
+# XcuMergeTarget class
+
+gb_XcuMergeTarget_CFGEXTARGET := $(call gb_Executable_get_target,cfgex)
+gb_XcuMergeTarget_CFGEXCOMMAND := \
+ $(gb_CFGEXPRECOMMAND) $(gb_XcuMergeTarget_CFGEXTARGET)
+gb_XcuMergeTarget_SDFLOCATION := $(LOCDIR)/l10n/$(INPATH)/misc/sdf/
+
+# PRJNAME is computed from the stem (parameter $(2))
+define gb_XcuMergeTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,5)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XcuMergeTarget_CFGEXCOMMAND) \
+ -p $(firstword $(subst /, ,$(2))) \
+ -i $(3) \
+ -o $(1) \
+ -m $(SDF) \
+ -l all)
+endef
+
+$(call gb_XcuMergeTarget_get_target,%) : | $(gb_XcuMergeTarget_CFGEXTARGET)
+ $(if $(SDF),$(call gb_XcuMergeTarget__command,$@,$*,$(filter %.xcu,$^)),mkdir -p $(dir $@) && cp $(filter %.xcu,$^) $@)
+
+$(call gb_XcuMergeTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,5)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuMergeTarget_get_target,$*))
+
+# $(call gb_XcuMergeTarget_XcuMergeTarget,target,zipfile,prefix,xcufile)
+define gb_XcuMergeTarget_XcuMergeTarget
+$(call gb_XcuMergeTarget_get_target,$(1)) : \
+ $(call gb_Configuration__get_source,$(2),$(3)/$(4)) \
+ $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+$(call gb_XcuMergeTarget_get_target,$(1)) : \
+ SDF := $(realpath $(gb_XcuMergeTarget_SDFLOCATION)$(dir $(1))localize.sdf)
+endef
+
+
+# XcuResTarget class
+
+# locale is extracted from the stem (parameter $(2))
+define gb_XcuResTarget__command
+$(call gb_Output_announce,$(2),$(true),XCU,6)
+$(call gb_Helper_abbreviate_dirs_native,\
+ mkdir -p $(dir $(1)) && \
+ $(gb_XSLTPROC) --nonet \
+ -o $(1) \
+ --stringparam xcs $(call gb_XcsTarget_for_XcuTarget,$(XCUFILE)) \
+ --stringparam schemaRoot $(call gb_XcsTarget_get_outdir_target,) \
+ --stringparam locale $(word 2,$(subst /, ,$(2))) \
+ --path $(gb_Configuration_registry) \
+ $(gb_XcuTarget_XSLT_AllLang) \
+ $(3))
+endef
+
+$(call gb_XcuResTarget_get_target,%) : $(gb_XcuTarget_XSLT_AllLang)
+ $(call gb_XcuResTarget__command,$@,$*,$(filter %.xcu,$^))
+
+$(call gb_XcuResTarget_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),XCU,6)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_XcuResTarget_get_target,$*))
+
+# $(call gb_XcuResTarget_XcuResTarget,target,zipfile,prefix,xcufile,lang)
+# this depends either on the source or on the merge target (if WITH_LANG)
+define gb_XcuResTarget_XcuResTarget
+ifeq ($(strip $(gb_WITH_LANG)),)
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_Configuration__get_source,$(2),$(3)/$(4))
+else
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_XcuMergeTarget_get_target,$(3)/$(4))
+endif
+$(call gb_XcuResTarget_get_target,$(1)) : \
+ $(call gb_XcsTarget_for_XcuTarget,$(4))
+$(call gb_XcuResTarget_get_target,$(1)) : XCUFILE := $(4)
+endef
+
+
+# Configuration class
+
+$(call gb_Configuration_get_clean_target,%) :
+ $(call gb_Output_announce,$*,$(false),CFG,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ rm -f $(call gb_Configuration_get_target,$*))
+
+$(call gb_Configuration_get_target,%) :
+ $(call gb_Output_announce,$*,$(true),CFG,1)
+ $(call gb_Helper_abbreviate_dirs,\
+ mkdir -p $(dir $@) && touch $@)
+
+# $(call gb_Configuration_Configuration,zipfile,repo)
+# cannot use target local variable for REPO because it's needed in prereq
+define gb_Configuration_Configuration
+$(if $(filter $(2),$(gb_Configuration_REPOSITORYNAMES)),,\
+ $(error Configuration: no or invalid repository given; known repositories: \
+ $(gb_Configuration_REPOSITORYNAMES)))
+$(eval gb_Configuration_REPO_$(1) := $(2))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Zip_Zip,$(1)_$(lang),$(call gb_XcuResTarget_get_target,$(1)/$(lang)))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_Zip_get_final_target,$(1)_$(lang))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_Zip_get_clean_target,$(1)_$(lang))))
+$$(eval $$(call gb_Module_register_target,$(call gb_Configuration_get_target,$(1)),$(call gb_Configuration_get_clean_target,$(1))))
+endef
+
+# $(call gb_Configuration_add_schema,zipfile,prefix,xcsfile)
+define gb_Configuration_add_schema
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcsTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcsTarget_get_outdir_target,$(3))
+$(call gb_XcsTarget_get_target,$(2)/$(3)) : \
+ $(call gb_Configuration__get_source,$(1),$(2)/$(3))
+$(call gb_XcsTarget_get_target,$(2)/$(3)) : XCSFILE := $(3)
+$(call gb_XcsTarget_get_clean_target,$(2)/$(3)) : XCSFILE := $(3)
+$(call gb_XcsTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcsTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,$(call gb_XcsTarget_get_outdir_target,$(3)),\
+ $(call gb_XcsTarget_get_target,$(2)/$(3)))
+endef
+
+#$(call gb_Configuration_add_schemas,zipfile,prefix,xcsfiles)
+define gb_Configuration_add_schemas
+$(foreach xcs,$(3),$(eval $(call gb_Configuration_add_schema,$(1),$(2),$(xcs))))
+endef
+
+# $(call gb_Configuration_add_data,zipfile,prefix,xcufile)
+define gb_Configuration_add_data
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuDataTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuDataTarget_get_outdir_target,$(3))
+$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : \
+ $(call gb_Configuration__get_source,$(1),$(2)/$(3)) \
+ $(call gb_XcsTarget_for_XcuTarget,$(3))
+$(call gb_XcuDataTarget_get_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuDataTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuDataTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuDataTarget_get_outdir_target,$(3)),\
+ $(call gb_XcuDataTarget_get_target,$(2)/$(3)))
+endef
+
+#$(call gb_Configuration_add_schemas,zipfile,prefix,xcufiles)
+define gb_Configuration_add_datas
+$(foreach xcu,$(3),$(eval $(call gb_Configuration_add_data,$(1),$(2),$(xcu))))
+endef
+
+# $(call gb_Configuration_add_spool_module,zipfile,prefix,xcufile)
+define gb_Configuration_add_spool_module
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuModuleTarget_get_outdir_target,$(3))
+$(call gb_XcuModuleTarget_get_target,$(2)/$(3)) : \
+ $(call gb_XcuDataSource_for_XcuModuleTarget,$(1),$(2)/$(3)) \
+ $(call gb_XcsTarget_for_XcuModuleTarget,$(3))
+$(call gb_XcuModuleTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuModuleTarget_get_outdir_target,$(3)) : \
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuModuleTarget_get_outdir_target,$(3)),\
+ $(call gb_XcuModuleTarget_get_target,$(2)/$(3)))
+endef
+
+# $(call gb_Configuration_add_spool_modules,zipfile,prefix,xcufiles)
+define gb_Configuration_add_spool_modules
+$(foreach xcu,$(3),$(eval \
+ $(call gb_Configuration_add_spool_module,$(1),$(2),$(xcu))))
+endef
+
+define gb_Configuration__add_langpack
+$(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3))
+$(call gb_Configuration_get_target,$(1)) : \
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4))
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : \
+ $($(gb_Configuration_REPO_$(1)))/$(2)/$(3).tmpl
+$(call gb_XcuLangpackTarget_get_clean_target,$(2)/$(3)) : XCUFILE := $(3)
+$(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)) : LANG := $(4)
+$(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)) : \
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4))
+$(call gb_Deliver_add_deliverable,\
+ $(call gb_XcuLangpackTarget__get_outdir_target_with_lang,$(3),$(4)),\
+ $(call gb_XcuLangpackTarget__get_target_with_lang,$(2)/$(3),$(4)))
+endef
+
+# $(call gb_Configuration_add_spool_langpack,zipfile,prefix,xcufile)
+define gb_Configuration_add_spool_langpack
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration__add_langpack,$(1),$(2),$(strip $(3)),$(lang))))
+endef
+
+# $(call gb_Configuration_add_localized_data,zipfile,prefix,xcufile)
+define gb_Configuration_add_localized_data
+$(eval $(call gb_Configuration_add_data,$(1),$(2),$(3)))
+ifneq ($(strip $(gb_WITH_LANG)),)
+$(eval $(call gb_XcuMergeTarget_XcuMergeTarget,$(2)/$(3),$(1),$(2),$(3)))
+$(eval $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuMergeTarget_get_clean_target,$(2)/$(3)))
+endif
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_XcuResTarget_XcuResTarget,$(1)/$(lang)/$(3),$(1),$(2),$(3),$(lang))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Zip_add_file,$(1)_$(lang),$(3))))
+$(foreach lang,$(gb_Configuration_LANGS),$(eval \
+ $(call gb_Configuration_get_clean_target,$(1)) : \
+ $(call gb_XcuResTarget_get_clean_target,$(1)/$(lang)/$(3))))
+endef
+
+# $(call gb_Configuration_add_localized_datas,zipfile,prefix,xcufile)
+define gb_Configuration_add_localized_datas
+$(foreach xcu,$(3),$(eval \
+ $(call gb_Configuration_add_localized_data,$(1),$(2),$(xcu))))
+endef
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/solenv/gbuild/TargetLocations.mk b/main/solenv/gbuild/TargetLocations.mk
index 2ded1b9795..96b9aad120 100644
--- a/main/solenv/gbuild/TargetLocations.mk
+++ b/main/solenv/gbuild/TargetLocations.mk
@@ -32,6 +32,13 @@ gb_ResTarget_get_outdir_imagelist_target = $(OUTDIR)/res/img/$(1).ilst
gb_ResTarget_get_outdir_target = $(OUTDIR)/bin/$(1).res
gb_Jar_get_outdir_target = $(OUTDIR)/bin/$(1).jar
gb_Zip_get_outdir_target = $(OUTDIR)/pck/$(1).zip
+# outdir targets: $(1) is path
+gb_Configuration_registry = $(OUTDIR)/xml/registry
+gb_XcsTarget_get_outdir_target = $(gb_Configuration_registry)/schema/$(1)
+gb_XcuDataTarget_get_outdir_target = $(gb_Configuration_registry)/data/$(1)
+gb_XcuLangpackTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
+gb_XcuModuleTarget_get_outdir_target = $(gb_Configuration_registry)/spool/$(1)
+
define gb_Library_get_target
$(patsubst $(1):%,$(gb_Library_OUTDIRLOCATION)/%,$(filter $(filter $(1),$(gb_Library_TARGETS)):%,$(gb_Library_FILENAMES)))
@@ -96,6 +103,14 @@ gb_SrsPartMergeTarget_get_target = $(WORKDIR)/SrsPartMergeTarget/$(1)
gb_SrsPartTarget_get_target = $(WORKDIR)/SrsPartTarget/$(1)
gb_SrsTarget_get_target = $(WORKDIR)/SrsTarget/$(1).srs
gb_WinResTarget_get_target = $(WORKDIR)/WinResTarget/$(1)$(gb_WinResTarget_POSTFIX)
+# workdir targets: $(1) is prefix/path
+gb_Configuration_get_target = $(WORKDIR)/Configuration/$(1).done
+gb_XcsTarget_get_target = $(WORKDIR)/XcsTarget/$(1)
+gb_XcuDataTarget_get_target = $(WORKDIR)/XcuDataTarget/$(1)
+gb_XcuLangpackTarget_get_target = $(WORKDIR)/XcuLangpackTarget/$(1)
+gb_XcuModuleTarget_get_target = $(WORKDIR)/XcuModuleTarget/$(1)
+gb_XcuMergeTarget_get_target = $(WORKDIR)/XcuMergeTarget/$(1)
+gb_XcuResTarget_get_target = $(WORKDIR)/XcuResTarget/$(1)
gb_Zip_get_target = $(WORKDIR)/Zip/$(1).zip
gb_Zip_get_final_target = $(WORKDIR)/Zip/$(1).done
@@ -135,6 +150,13 @@ $(eval $(call gb_Helper_make_clean_targets,\
CustomTarget \
UnoApiTarget \
Zip \
+ XcsTarget \
+ XcuDataTarget \
+ XcuModuleTarget \
+ XcuLangpackTarget \
+ XcuMergeTarget \
+ XcuResTarget \
+ Configuration \
))
$(eval $(call gb_Helper_make_outdir_clean_targets,\
diff --git a/main/solenv/gbuild/gbuild.mk b/main/solenv/gbuild/gbuild.mk
index 147a9085cc..708bd96ecd 100644
--- a/main/solenv/gbuild/gbuild.mk
+++ b/main/solenv/gbuild/gbuild.mk
@@ -266,6 +266,7 @@ include $(foreach class, \
Module \
UnoApiTarget \
Zip \
+ Configuration \
,$(GBUILDDIR)/$(class).mk)
# optional extensions that should never be essential
diff --git a/main/solenv/gbuild/platform/linux.mk b/main/solenv/gbuild/platform/linux.mk
index 9e48a0b6dc..80db86837a 100644
--- a/main/solenv/gbuild/platform/linux.mk
+++ b/main/solenv/gbuild/platform/linux.mk
@@ -489,6 +489,9 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
diff --git a/main/solenv/gbuild/platform/macosx.mk b/main/solenv/gbuild/platform/macosx.mk
index cd4953fcd3..2c67a83b24 100644
--- a/main/solenv/gbuild/platform/macosx.mk
+++ b/main/solenv/gbuild/platform/macosx.mk
@@ -527,6 +527,9 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := DYLD_LIBRARY_PATH=$(OUTDIR)/lib
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
diff --git a/main/solenv/gbuild/platform/solaris.mk b/main/solenv/gbuild/platform/solaris.mk
index 5114e99103..c82e2f0f46 100644
--- a/main/solenv/gbuild/platform/solaris.mk
+++ b/main/solenv/gbuild/platform/solaris.mk
@@ -455,6 +455,9 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := LD_LIBRARY_PATH=$(OUTDIR)/lib
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc
diff --git a/main/solenv/gbuild/platform/windows.mk b/main/solenv/gbuild/platform/windows.mk
index dda9ad2ffd..526c4d2c62 100644
--- a/main/solenv/gbuild/platform/windows.mk
+++ b/main/solenv/gbuild/platform/windows.mk
@@ -809,6 +809,9 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
diff --git a/main/solenv/gbuild/platform/winmingw.mk b/main/solenv/gbuild/platform/winmingw.mk
index 82c4fbc45c..30db7e3d10 100644
--- a/main/solenv/gbuild/platform/winmingw.mk
+++ b/main/solenv/gbuild/platform/winmingw.mk
@@ -734,6 +734,9 @@ gb_Library_COMPONENTPREFIXES := \
URELIB:vnd.sun.star.expand:\dURE_INTERNAL_LIB_DIR/ \
NONE:vnd.sun.star.expand:\dOOO_INBUILD_SHAREDLIB_DIR/ \
+# Configuration
+gb_CFGEXPRECOMMAND := PATH="$${PATH}:$(OUTDIR)/bin"
+
# UnoApiTarget
gb_UnoApiTarget_IDLCTARGET := $(OUTDIR)/bin/idlc.exe
(openoffice) 20/21: Fix supported platforms for the ADABAS connectivity driver. Fix configuration packaging for several Windows and Mac connectivity drivers.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 70996efe0599de144d254e6d226bd9adcce49930
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 19 04:30:29 2025 +0200
Fix supported platforms for the ADABAS connectivity driver.
Fix configuration packaging for several Windows and Mac
connectivity drivers.
Patch by: me
---
main/connectivity/source/drivers/adabas/BFunctions.cxx | 8 ++++----
main/postprocess/packregistry/makefile.mk | 12 ++++++------
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/main/connectivity/source/drivers/adabas/BFunctions.cxx b/main/connectivity/source/drivers/adabas/BFunctions.cxx
index c9d90b789c..dbfacac888 100644
--- a/main/connectivity/source/drivers/adabas/BFunctions.cxx
+++ b/main/connectivity/source/drivers/adabas/BFunctions.cxx
@@ -111,8 +111,8 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
::rtl::OUString sTemp(RTL_CONSTASCII_USTRINGPARAM("DBROOT"));
if ( osl_getEnvironment(sTemp.pData,&pPath) == osl_Process_E_None && pPath )
{
-
-#if ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX) || defined(MACOSX)
+
+#if defined(UNX)
_rPath = ::rtl::OUString(pPath);
_rPath += ::rtl::OUString::createFromAscii("/lib/");
#endif
@@ -127,10 +127,10 @@ sal_Bool LoadLibrary_ADABAS(::rtl::OUString &_rPath)
#if defined(WNT)
pLibraryAsciiName = "SQLOD32.DLL";
-#elif ( defined(SOLARIS) && defined(SPARC)) || defined(LINUX)
- pLibraryAsciiName = "odbclib.so";
#elif defined(MACOSX)
pLibraryAsciiName = "odbclib.dylib";
+#elif defined(UNX)
+ pLibraryAsciiName = "odbclib.so";
#endif
if ( !pLibraryAsciiName )
return sal_False;
diff --git a/main/postprocess/packregistry/makefile.mk b/main/postprocess/packregistry/makefile.mk
index 983385e916..be449e30c9 100644
--- a/main/postprocess/packregistry/makefile.mk
+++ b/main/postprocess/packregistry/makefile.mk
@@ -306,7 +306,7 @@ MY_FILES_main += \
.END
.IF "$(GUIBASE)" == "aqua"
MY_FILES_main += \
- $(MY_MOD)/DataAccess/macab.xcu \
+ $(MY_XCU)/Office/DataAccess/macab.xcu \
$(MY_MOD)/org/openoffice/Inet-macosx.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-macosx.xcu \
$(MY_MOD)/org/openoffice/Office/Common-macosx.xcu \
@@ -326,7 +326,7 @@ MY_FILES_main += \
# VCL-unixdesktop.xcu must come after VCL.xcu
.ELIF "$(GUIBASE)" == "WIN"
MY_FILES_main += \
- $(MY_MOD)/DataAccess/ado.xcu \
+ $(MY_XCU)/Office/DataAccess/ado.xcu \
$(MY_MOD)/org/openoffice/Inet-wnt.xcu \
$(MY_MOD)/org/openoffice/Office/Accelerators-unxwnt.xcu \
$(MY_MOD)/org/openoffice/Office/Common-wnt.xcu \
@@ -342,12 +342,12 @@ MY_FILES_main += \
.ELSE
ERROR : unknown-GUIBASE
.END
-.IF "$(OS)" == "WNT" || "$(OS)" == "LINUX" || "$(OS)" == "OS2" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "NETBSD"
-MY_FILES_main += $(MY_MOD)/DataAccess/adabas.xcu
+.IF "$(OS)" == "WNT" || "$(GUIBASE)" == "aqua" ||\
+ "$(GUIBASE)" == "unx"
+MY_FILES_main += $(MY_XCU)/Office/DataAccess/adabas.xcu
.END
.IF "$(ENABLE_EVOAB2)" == "TRUE"
-MY_FILES_main += $(MY_MOD)/DataAccess/evoab2.xcu
+MY_FILES_main += $(MY_XCU)/Office/DataAccess/evoab2.xcu
.END
.IF "$(SOLAR_JAVA)" == "TRUE"
MY_FILES_main += \
(openoffice) 21/21: In postprocess/packcomponents, fix supported platforms for the ADABAS connectivity driver, and fix the path to the ADO component.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f116fde0f61f62a93d8497b5463b450ee4bab721
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 19 04:39:18 2025 +0200
In postprocess/packcomponents, fix supported platforms for
the ADABAS connectivity driver, and fix the path to the
ADO component.
Patch by: me
---
main/postprocess/packcomponents/makefile.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/postprocess/packcomponents/makefile.mk b/main/postprocess/packcomponents/makefile.mk
index 174ba90822..366e9a8743 100644
--- a/main/postprocess/packcomponents/makefile.mk
+++ b/main/postprocess/packcomponents/makefile.mk
@@ -323,7 +323,7 @@ my_components += \
my_components += \
component/accessibility/java/java_uno_accessbridge/java_uno_accessbridge \
component/avmedia/source/win/avmediawin \
- component/connectivity/drivers/ado/ado \
+ component/connectivity/source/drivers/ado/ado \
component/dtrans/source/generic/dtrans \
component/dtrans/util/dnd \
component/dtrans/util/ftransl \
@@ -358,8 +358,8 @@ my_components += \
my_components += component/canvas/source/directx/directx5canvas
.END
-.IF "$(OS)" == "LINUX" || "$(OS)" == "NETBSD" || \
- ("$(OS)" == "SOLARIS" && "$(CPU)" == "S") || "$(OS)" == "WNT"
+.IF "$(OS)" == "WNT" || "$(GUIBASE)" == "aqua" ||\
+ "$(GUIBASE)" == "unx"
my_components += component/connectivity/source/drivers/adabas/adabas
.END
(openoffice) 02/21: wParam is already a UINT_PTR, an integer type, so no need to cast it.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 1e5d8e72b5147bf84598caafc702eb279f3a8b41
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Thu Jan 2 22:14:16 2025 +0200
wParam is already a UINT_PTR, an integer type, so no need to cast it.
Patch by: me
---
main/vcl/win/source/window/salframe.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/vcl/win/source/window/salframe.cxx b/main/vcl/win/source/window/salframe.cxx
index f89993b898..4c8efb706e 100644
--- a/main/vcl/win/source/window/salframe.cxx
+++ b/main/vcl/win/source/window/salframe.cxx
@@ -6249,12 +6249,12 @@ LRESULT CALLBACK SalFrameWndProc( HWND hWnd, UINT nMsg, WPARAM wParam, LPARAM lP
break;
#if WINVER >= 0x0500
case WM_IME_REQUEST:
- if ( static_cast<int>( wParam ) == IMR_RECONVERTSTRING )
+ if ( wParam == IMR_RECONVERTSTRING )
{
nRet = ImplHandleIMEReconvertString( hWnd, lParam );
rDef = FALSE;
}
- else if( static_cast<int>( wParam ) == IMR_CONFIRMRECONVERTSTRING )
+ else if( wParam == IMR_CONFIRMRECONVERTSTRING )
{
nRet = ImplHandleIMEConfirmReconvertString( hWnd, lParam );
rDef = FALSE;
(openoffice) 09/21: Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit d50e6300ed5b8be0550f94083e200ad57701b168
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 19:49:58 2025 +0200
Try not setting "-Xbootclasspath", as it doesn't work on Java > 8.
Patch by: me
---
main/scripting/java/build.xml | 2 --
1 file changed, 2 deletions(-)
diff --git a/main/scripting/java/build.xml b/main/scripting/java/build.xml
index 1d2a3dd4a4..4b2bd27139 100644
--- a/main/scripting/java/build.xml
+++ b/main/scripting/java/build.xml
@@ -124,12 +124,10 @@
debug="${debug}" optimize="${optimize}" deprecation="off">
<exclude name="**/provider/javascript/*.java" unless="with_rhino" />
<exclude name="**/provider/beanshell/*.java" unless="with_beanshell" />
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
<javac srcdir="Framework/" destdir="${jardir}"
includes="**/*.java" classpathref="idlclasspath" debug="${debug}"
optimize="${optimize}" deprecation="off" includeantruntime="false">
- <compilerarg value="-Xbootclasspath:${toString:my.bootstrap.classpath}"/>
</javac>
</target>
(openoffice) 03/21: Add "version" as a library on Windows, and link to it so we can find functions like VerQueryValueW() on Win64.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 29ca9883b9ac0322aa31cde268e099f436837510
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Fri Jan 3 00:36:02 2025 +0200
Add "version" as a library on Windows, and link to it so we
can find functions like VerQueryValueW() on Win64.
Patch by: me
---
main/solenv/gbuild/platform/windows.mk | 1 +
main/vcl/Library_vcl.mk | 1 +
2 files changed, 2 insertions(+)
diff --git a/main/solenv/gbuild/platform/windows.mk b/main/solenv/gbuild/platform/windows.mk
index 13f38aa3c7..dda9ad2ffd 100644
--- a/main/solenv/gbuild/platform/windows.mk
+++ b/main/solenv/gbuild/platform/windows.mk
@@ -531,6 +531,7 @@ gb_Library_PLAINLIBS_NONE += \
user32 \
uuid \
uwinapi \
+ version \
winmm \
winspool \
ws2_32 \
diff --git a/main/vcl/Library_vcl.mk b/main/vcl/Library_vcl.mk
index 2cf3b5c7c1..48d28c22e6 100644
--- a/main/vcl/Library_vcl.mk
+++ b/main/vcl/Library_vcl.mk
@@ -529,6 +529,7 @@ $(eval $(call gb_Library_add_linked_libs,vcl,\
shell32 \
user32 \
uuid \
+ version \
winspool \
$(gb_STDLIBS) \
))
(openoffice) 08/21: Fix a path to FileSystemRuntimeException.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 5db65c3a88e32b3c01e3751510fabae80c384bbb
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 4 15:11:34 2025 +0200
Fix a path to FileSystemRuntimeException.
Patch by: me
---
main/connectivity/Jar_sdbc_hsqldb.mk | 1 +
1 file changed, 1 insertion(+)
diff --git a/main/connectivity/Jar_sdbc_hsqldb.mk b/main/connectivity/Jar_sdbc_hsqldb.mk
index 0a48734715..4bae2ec6ce 100644
--- a/main/connectivity/Jar_sdbc_hsqldb.mk
+++ b/main/connectivity/Jar_sdbc_hsqldb.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Jar_set_jarclasspath,sdbc_hsqldb,\
))
$(eval $(call gb_Jar_add_sourcefiles,sdbc_hsqldb,\
+ connectivity/org/hsqldb/lib/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/FileSystemRuntimeException \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeInputStreamHelper \
connectivity/com/sun/star/sdbcx/comp/hsqldb/NativeLibraries \
(openoffice) 14/21: Convert officecfg module to gbuild.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit ef5605361abbb46c07a03e7ad113406d4e5be8fe
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sun Jan 12 12:32:13 2025 +0200
Convert officecfg module to gbuild.
The patch is mostly by Michael Stahl; hunks that
failed to apply were patched by me.
Partially fixes: https://bz.apache.org/ooo/show_bug.cgi?id=118386
Patch by: Michael Stahl <ms...@...>
Reviewed by: me
---
main/Module_ooo.mk | 1 +
main/officecfg/Configuration_officecfg.mk | 264 +++++++++++++++++++++
main/officecfg/Makefile | 30 +++
main/officecfg/Module_officecfg.mk | 28 +++
main/officecfg/Package_misc.mk | 29 +++
main/officecfg/Package_tools.mk | 36 +++
main/officecfg/prj/build.lst | 17 +-
main/officecfg/prj/d.lst | 68 ------
main/officecfg/prj/makefile.mk | 32 +++
.../data/org/openoffice/Office/UI/makefile.mk | 77 ------
.../data/org/openoffice/Office/makefile.mk | 117 ---------
.../data/org/openoffice/TypeDetection/makefile.mk | 46 ----
.../registry/data/org/openoffice/makefile.mk | 67 ------
.../registry/data/org/openoffice/ucb/makefile.mk | 40 ----
main/officecfg/registry/makefile.mk | 39 ---
main/officecfg/registry/schema/makefile.mk | 42 ----
.../org/openoffice/Office/DataAccess/makefile.mk | 37 ---
.../openoffice/Office/OOoImprovement/makefile.mk | 37 ---
.../schema/org/openoffice/Office/UI/makefile.mk | 76 ------
.../schema/org/openoffice/Office/makefile.mk | 79 ------
.../org/openoffice/TypeDetection/makefile.mk | 41 ----
.../registry/schema/org/openoffice/makefile.mk | 44 ----
.../registry/schema/org/openoffice/ucb/makefile.mk | 40 ----
main/officecfg/util/makefile.mk | 43 ----
main/officecfg/util/makefile.pmk | 29 ---
25 files changed, 421 insertions(+), 938 deletions(-)
diff --git a/main/Module_ooo.mk b/main/Module_ooo.mk
index 4f27bf82db..7a346b2d63 100644
--- a/main/Module_ooo.mk
+++ b/main/Module_ooo.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,ooo,\
linguistic \
o3tl \
offapi \
+ officecfg \
oovbaapi \
oox \
package \
diff --git a/main/officecfg/Configuration_officecfg.mk b/main/officecfg/Configuration_officecfg.mk
new file mode 100644
index 0000000000..4830bcb38d
--- /dev/null
+++ b/main/officecfg/Configuration_officecfg.mk
@@ -0,0 +1,264 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Configuration_Configuration,registry,SRCDIR))
+
+$(call gb_Configuration_add_schemas,registry,officecfg/registry/schema,\
+ org/openoffice/LDAP.xcs \
+ org/openoffice/Inet.xcs \
+ org/openoffice/Setup.xcs \
+ org/openoffice/System.xcs \
+ org/openoffice/UserProfile.xcs \
+ org/openoffice/VCL.xcs \
+ org/openoffice/FirstStartWizard.xcs \
+ org/openoffice/Interaction.xcs \
+ org/openoffice/Office/Accelerators.xcs \
+ org/openoffice/Office/Addons.xcs \
+ org/openoffice/Office/Calc.xcs \
+ org/openoffice/Office/CalcAddIns.xcs \
+ org/openoffice/Office/Canvas.xcs \
+ org/openoffice/Office/Chart.xcs \
+ org/openoffice/Office/Commands.xcs \
+ org/openoffice/Office/Common.xcs \
+ org/openoffice/Office/Compatibility.xcs \
+ org/openoffice/Office/DataAccess.xcs \
+ org/openoffice/Office/Draw.xcs \
+ org/openoffice/Office/Events.xcs \
+ org/openoffice/Office/Embedding.xcs \
+ org/openoffice/Office/ExtensionManager.xcs \
+ org/openoffice/Office/Impress.xcs \
+ org/openoffice/Office/Java.xcs \
+ org/openoffice/Office/Jobs.xcs \
+ org/openoffice/Office/Labels.xcs \
+ org/openoffice/Office/Linguistic.xcs \
+ org/openoffice/Office/Logging.xcs \
+ org/openoffice/Office/Math.xcs \
+ org/openoffice/Office/OptionsDialog.xcs \
+ org/openoffice/Office/ProtocolHandler.xcs \
+ org/openoffice/Office/SFX.xcs \
+ org/openoffice/Office/Substitution.xcs \
+ org/openoffice/Office/TableWizard.xcs \
+ org/openoffice/Office/UI.xcs \
+ org/openoffice/Office/Views.xcs \
+ org/openoffice/Office/Writer.xcs \
+ org/openoffice/Office/WriterWeb.xcs \
+ org/openoffice/Office/Scripting.xcs \
+ org/openoffice/Office/Security.xcs \
+ org/openoffice/Office/WebWizard.xcs \
+ org/openoffice/Office/Recovery.xcs \
+ org/openoffice/Office/FormWizard.xcs \
+ org/openoffice/Office/ExtendedColorScheme.xcs \
+ org/openoffice/Office/TypeDetection.xcs \
+ org/openoffice/Office/TabBrowse.xcs \
+ org/openoffice/Office/Paths.xcs \
+ org/openoffice/Office/Histories.xcs \
+ org/openoffice/Office/PresenterScreen.xcs \
+ org/openoffice/Office/UI/Controller.xcs \
+ org/openoffice/Office/UI/Factories.xcs \
+ org/openoffice/Office/UI/Commands.xcs \
+ org/openoffice/Office/UI/BasicIDECommands.xcs \
+ org/openoffice/Office/UI/BibliographyCommands.xcs \
+ org/openoffice/Office/UI/CalcCommands.xcs \
+ org/openoffice/Office/UI/ChartCommands.xcs \
+ org/openoffice/Office/UI/DbuCommands.xcs \
+ org/openoffice/Office/UI/BaseWindowState.xcs \
+ org/openoffice/Office/UI/WriterFormWindowState.xcs \
+ org/openoffice/Office/UI/WriterReportWindowState.xcs \
+ org/openoffice/Office/UI/DbBrowserWindowState.xcs \
+ org/openoffice/Office/UI/DbTableDataWindowState.xcs \
+ org/openoffice/Office/UI/DrawImpressCommands.xcs \
+ org/openoffice/Office/UI/GenericCommands.xcs \
+ org/openoffice/Office/UI/MathCommands.xcs \
+ org/openoffice/Office/UI/StartModuleCommands.xcs \
+ org/openoffice/Office/UI/WriterCommands.xcs \
+ org/openoffice/Office/UI/WindowState.xcs \
+ org/openoffice/Office/UI/BasicIDEWindowState.xcs \
+ org/openoffice/Office/UI/BibliographyWindowState.xcs \
+ org/openoffice/Office/UI/CalcWindowState.xcs \
+ org/openoffice/Office/UI/ChartWindowState.xcs \
+ org/openoffice/Office/UI/DbQueryWindowState.xcs \
+ org/openoffice/Office/UI/DbRelationWindowState.xcs \
+ org/openoffice/Office/UI/DbTableWindowState.xcs \
+ org/openoffice/Office/UI/DrawWindowState.xcs \
+ org/openoffice/Office/UI/ImpressWindowState.xcs \
+ org/openoffice/Office/UI/MathWindowState.xcs \
+ org/openoffice/Office/UI/StartModuleWindowState.xcs \
+ org/openoffice/Office/UI/WriterWindowState.xcs \
+ org/openoffice/Office/UI/XFormsWindowState.xcs \
+ org/openoffice/Office/UI/WriterGlobalWindowState.xcs \
+ org/openoffice/Office/UI/WriterWebWindowState.xcs \
+ org/openoffice/Office/UI/Effects.xcs \
+ org/openoffice/Office/UI/Category.xcs \
+ org/openoffice/Office/UI/GenericCategories.xcs \
+ org/openoffice/Office/UI/GlobalSettings.xcs \
+ org/openoffice/Office/UI/Sidebar.xcs \
+ org/openoffice/Office/UI/WindowContentFactories.xcs \
+ org/openoffice/Office/DataAccess/Drivers.xcs \
+ org/openoffice/Office/OOoImprovement/Settings.xcs \
+ org/openoffice/TypeDetection/Types.xcs \
+ org/openoffice/TypeDetection/Filter.xcs \
+ org/openoffice/TypeDetection/GraphicFilter.xcs \
+ org/openoffice/TypeDetection/Misc.xcs \
+ org/openoffice/TypeDetection/UISort.xcs \
+ org/openoffice/ucb/Configuration.xcs \
+ org/openoffice/ucb/Hierarchy.xcs \
+ org/openoffice/ucb/InteractionHandler.xcs \
+ org/openoffice/ucb/Store.xcs \
+)
+
+$(call gb_Configuration_add_datas,registry,officecfg/registry/data,\
+ org/openoffice/Inet.xcu \
+ org/openoffice/System.xcu \
+ org/openoffice/UserProfile.xcu \
+ org/openoffice/VCL.xcu \
+ org/openoffice/FirstStartWizard.xcu \
+ org/openoffice/Interaction.xcu \
+ org/openoffice/Office/Calc.xcu \
+ org/openoffice/Office/Canvas.xcu \
+ org/openoffice/Office/Compatibility.xcu \
+ org/openoffice/Office/ExtensionManager.xcu \
+ org/openoffice/Office/Impress.xcu \
+ org/openoffice/Office/Jobs.xcu \
+ org/openoffice/Office/Labels.xcu \
+ org/openoffice/Office/Linguistic.xcu \
+ org/openoffice/Office/Logging.xcu \
+ org/openoffice/Office/Math.xcu \
+ org/openoffice/Office/ProtocolHandler.xcu \
+ org/openoffice/Office/Security.xcu \
+ org/openoffice/Office/Scripting.xcu \
+ org/openoffice/Office/SFX.xcu \
+ org/openoffice/Office/Views.xcu \
+ org/openoffice/Office/Paths.xcu \
+ org/openoffice/Office/Histories.xcu \
+ org/openoffice/Office/UI/Controller.xcu \
+ org/openoffice/Office/UI/Factories.xcu \
+ org/openoffice/TypeDetection/UISort.xcu \
+ org/openoffice/ucb/Configuration.xcu \
+)
+
+$(call gb_Configuration_add_spool_modules,registry,officecfg/registry/data,\
+ org/openoffice/Inet-macosx.xcu \
+ org/openoffice/Inet-unixdesktop.xcu \
+ org/openoffice/Inet-wnt.xcu \
+ org/openoffice/Setup-brand.xcu \
+ org/openoffice/Setup-writer.xcu \
+ org/openoffice/Setup-calc.xcu \
+ org/openoffice/Setup-draw.xcu \
+ org/openoffice/Setup-impress.xcu \
+ org/openoffice/Setup-base.xcu \
+ org/openoffice/Setup-math.xcu \
+ org/openoffice/Setup-report.xcu \
+ org/openoffice/Setup-start.xcu \
+ org/openoffice/UserProfile-gconflockdown.xcu \
+ org/openoffice/VCL-gconflockdown.xcu \
+ org/openoffice/VCL-unixdesktop.xcu \
+ org/openoffice/Office/Accelerators-macosx.xcu \
+ org/openoffice/Office/Accelerators-unxwnt.xcu \
+ org/openoffice/Office/Common-brand.xcu \
+ org/openoffice/Office/Common-writer.xcu \
+ org/openoffice/Office/Common-calc.xcu \
+ org/openoffice/Office/Common-draw.xcu \
+ org/openoffice/Office/Common-impress.xcu \
+ org/openoffice/Office/Common-base.xcu \
+ org/openoffice/Office/Common-math.xcu \
+ org/openoffice/Office/Common-unx.xcu \
+ org/openoffice/Office/Common-unixdesktop.xcu \
+ org/openoffice/Office/Common-gconflockdown.xcu \
+ org/openoffice/Office/Common-macosx.xcu \
+ org/openoffice/Office/Common-wnt.xcu \
+ org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
+ org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
+ org/openoffice/Office/Scripting-python.xcu \
+ org/openoffice/Office/Common-cjk.xcu \
+ org/openoffice/Office/Common-ctl.xcu \
+ org/openoffice/Office/Common-korea.xcu \
+ org/openoffice/Office/Paths-macosx.xcu \
+ org/openoffice/Office/Paths-unxwnt.xcu \
+ org/openoffice/Office/Paths-unixdesktop.xcu \
+ org/openoffice/Office/Paths-internallibtextcatdata.xcu \
+ org/openoffice/Office/Paths-externallibtextcatdata.xcu \
+ org/openoffice/Office/Writer-cjk.xcu \
+ org/openoffice/Office/Impress-ogltrans.xcu \
+ org/openoffice/Office/Embedding-calc.xcu \
+ org/openoffice/Office/Embedding-chart.xcu \
+ org/openoffice/Office/Embedding-draw.xcu \
+ org/openoffice/Office/Embedding-impress.xcu \
+ org/openoffice/Office/Embedding-math.xcu \
+ org/openoffice/Office/Embedding-base.xcu \
+ org/openoffice/Office/Embedding-writer.xcu \
+ org/openoffice/Office/UI-brand.xcu \
+ org/openoffice/Office/Recovery-gconflockdown.xcu \
+ org/openoffice/TypeDetection/UISort-writer.xcu \
+ org/openoffice/TypeDetection/UISort-calc.xcu \
+ org/openoffice/TypeDetection/UISort-draw.xcu \
+ org/openoffice/TypeDetection/UISort-impress.xcu \
+ org/openoffice/TypeDetection/UISort-math.xcu \
+ org/openoffice/ucb/Configuration-gio.xcu \
+)
+
+# perhaps this file should be moved 2 levels up?
+$(call gb_Configuration_add_spool_langpack,registry,officecfg/registry/data/org/openoffice,\
+ Langpack.xcu \
+)
+
+$(call gb_Configuration_add_localized_datas,registry,officecfg/registry/data,\
+ org/openoffice/Setup.xcu \
+ org/openoffice/Office/Accelerators.xcu \
+ org/openoffice/Office/Common.xcu \
+ org/openoffice/Office/SFX.xcu \
+ org/openoffice/Office/DataAccess.xcu \
+ org/openoffice/Office/TableWizard.xcu \
+ org/openoffice/Office/UI.xcu \
+ org/openoffice/Office/Embedding.xcu \
+ org/openoffice/Office/WebWizard.xcu \
+ org/openoffice/Office/FormWizard.xcu \
+ org/openoffice/Office/Writer.xcu \
+ org/openoffice/Office/UI/BasicIDECommands.xcu \
+ org/openoffice/Office/UI/BibliographyCommands.xcu \
+ org/openoffice/Office/UI/CalcCommands.xcu \
+ org/openoffice/Office/UI/ChartCommands.xcu \
+ org/openoffice/Office/UI/ChartWindowState.xcu \
+ org/openoffice/Office/UI/DbuCommands.xcu \
+ org/openoffice/Office/UI/BaseWindowState.xcu \
+ org/openoffice/Office/UI/WriterFormWindowState.xcu \
+ org/openoffice/Office/UI/WriterReportWindowState.xcu \
+ org/openoffice/Office/UI/DbQueryWindowState.xcu \
+ org/openoffice/Office/UI/DbTableWindowState.xcu \
+ org/openoffice/Office/UI/DbRelationWindowState.xcu \
+ org/openoffice/Office/UI/DbBrowserWindowState.xcu \
+ org/openoffice/Office/UI/DbTableDataWindowState.xcu \
+ org/openoffice/Office/UI/DrawImpressCommands.xcu \
+ org/openoffice/Office/UI/Effects.xcu \
+ org/openoffice/Office/UI/GenericCommands.xcu \
+ org/openoffice/Office/UI/MathCommands.xcu \
+ org/openoffice/Office/UI/StartModuleCommands.xcu \
+ org/openoffice/Office/UI/BasicIDEWindowState.xcu \
+ org/openoffice/Office/UI/CalcWindowState.xcu \
+ org/openoffice/Office/UI/DrawWindowState.xcu \
+ org/openoffice/Office/UI/ImpressWindowState.xcu \
+ org/openoffice/Office/UI/MathWindowState.xcu \
+ org/openoffice/Office/UI/StartModuleWindowState.xcu \
+ org/openoffice/Office/UI/WriterWindowState.xcu \
+ org/openoffice/Office/UI/XFormsWindowState.xcu \
+ org/openoffice/Office/UI/WriterGlobalWindowState.xcu \
+ org/openoffice/Office/UI/WriterWebWindowState.xcu \
+ org/openoffice/Office/UI/WriterCommands.xcu \
+ org/openoffice/Office/UI/GenericCategories.xcu \
+)
+
diff --git a/main/officecfg/Makefile b/main/officecfg/Makefile
new file mode 100644
index 0000000000..3ac357a971
--- /dev/null
+++ b/main/officecfg/Makefile
@@ -0,0 +1,30 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+ifeq ($(strip $(SOLARENV)),)
+$(error No environment set!)
+endif
+
+gb_PARTIALBUILD := T
+GBUILDDIR := $(SOLARENV)/gbuild
+include $(GBUILDDIR)/gbuild.mk
+
+$(eval $(call gb_Module_make_global_targets,$(shell ls $(dir $(realpath $(firstword $(MAKEFILE_LIST))))/Module*.mk)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/Module_officecfg.mk b/main/officecfg/Module_officecfg.mk
new file mode 100644
index 0000000000..22d91c9692
--- /dev/null
+++ b/main/officecfg/Module_officecfg.mk
@@ -0,0 +1,28 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Module_Module,officecfg))
+
+$(eval $(call gb_Module_add_targets,officecfg,\
+ Package_misc \
+ Package_tools \
+ Configuration_officecfg \
+))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/Package_misc.mk b/main/officecfg/Package_misc.mk
new file mode 100644
index 0000000000..c4240696ae
--- /dev/null
+++ b/main/officecfg/Package_misc.mk
@@ -0,0 +1,29 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+$(eval $(call gb_Package_Package,officecfg_misc,$(SRCDIR)/officecfg))
+
+$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ldap.xcd.sample,registry/schema/oo-ldap.xcd.sample))
+$(eval $(call gb_Package_add_file,officecfg_misc,xml/oo-ad-ldap.xcd.sample,registry/schema/oo-ad-ldap.xcd.sample))
+$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-ldap-attr-map.properties,registry/schema/oo-ldap-attr-map.properties))
+$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-org-map.properties,registry/schema/oo-org-map.properties))
+$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common.ldif,registry/schema/oo-common.ldif))
+$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common-ad.ldf,registry/schema/oo-common-ad.ldf))
+$(eval $(call gb_Package_add_file,officecfg_misc,pck/oo-common.conf,registry/schema/oo-common.conf))
+
diff --git a/main/officecfg/Package_tools.mk b/main/officecfg/Package_tools.mk
new file mode 100644
index 0000000000..7d7e2a42b7
--- /dev/null
+++ b/main/officecfg/Package_tools.mk
@@ -0,0 +1,36 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+# this package contains stuff that is used during the build
+
+$(eval $(call gb_Package_Package,officecfg_tools,$(SRCDIR)/officecfg))
+
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/alllang.xsl,util/alllang.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_val.xsl,util/schema_val.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/schema_trim.xsl,util/schema_trim.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/resource.xsl,util/resource.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/sanity.xsl,util/sanity.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/data_val.xsl,util/data_val.xsl))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/processing/delcomment.sed,util/delcomment.sed))
+
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/data.dtd,registry/data.dtd))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-update.dtd,registry/component-update.dtd))
+$(eval $(call gb_Package_add_file,officecfg_tools,xml/registry/component-schema.dtd,registry/component-schema.dtd))
+
+# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/prj/build.lst b/main/officecfg/prj/build.lst
index b07a34aee9..a0704e5983 100644
--- a/main/officecfg/prj/build.lst
+++ b/main/officecfg/prj/build.lst
@@ -1,17 +1,2 @@
oc officecfg : L10N:l10n soltools solenv LIBXSLT:libxslt NULL
-oc officecfg usr1 - all oc_mkout NULL
-oc officecfg\registry\schema nmake - all oc_reg_schema NULL
-oc officecfg\registry nmake - all oc_reg NULL
-oc officecfg\registry\schema\org\openoffice nmake - all oc_reg_schema_ooo NULL
-oc officecfg\registry\schema\org\openoffice\Office nmake - all oc_reg_schema_ooo_office NULL
-oc officecfg\registry\schema\org\openoffice\Office\UI nmake - all oc_reg_schema_ooo_office_ui NULL
-oc officecfg\registry\schema\org\openoffice\Office\DataAccess nmake - all oc_reg_schema_ooo_office_dataaccess NULL
-oc officecfg\registry\schema\org\openoffice\Office\OOoImprovement nmake - all oc_reg_schema_ooo_office_oooimprovement NULL
-oc officecfg\registry\schema\org\openoffice\TypeDetection nmake - all oc_reg_schema_ooo_td NULL
-oc officecfg\registry\schema\org\openoffice\ucb nmake - all oc_reg_schema_ooo_ucb NULL
-oc officecfg\registry\data\org\openoffice nmake - all oc_reg_data_ooo oc_reg NULL
-oc officecfg\registry\data\org\openoffice\Office nmake - all oc_reg_data_ooo_office oc_reg NULL
-oc officecfg\registry\data\org\openoffice\Office\UI nmake - all oc_reg_data_ooo_office_ui oc_reg NULL
-oc officecfg\registry\data\org\openoffice\TypeDetection nmake - all oc_reg_data_ooo_td oc_reg NULL
-oc officecfg\registry\data\org\openoffice\ucb nmake - all oc_reg_data_ooo_ucb oc_reg NULL
-oc officecfg\util nmake - all oc_util oc_reg_schema oc_reg_schema_ooo oc_reg_schema_ooo_office oc_reg_schema_ooo_office_ui oc_reg_schema_ooo_office_dataaccess oc_reg_schema_ooo_office_oooimprovement oc_reg_schema_ooo_td oc_reg_schema_ooo_ucb oc_reg_data_ooo oc_reg_data_ooo_office oc_reg_data_ooo_office_ui oc_reg_data_ooo_td oc_reg_data_ooo_ucb NULL
+oc officecfg\prj nmake - all oc_prj NULL
diff --git a/main/officecfg/prj/d.lst b/main/officecfg/prj/d.lst
deleted file mode 100644
index 099c005e5e..0000000000
--- a/main/officecfg/prj/d.lst
+++ /dev/null
@@ -1,68 +0,0 @@
-mkdir: %_DEST%\xml%_EXT%\registry
-mkdir: %_DEST%\xml%_EXT%\registry\schema
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\schema\org\openoffice\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\UI\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\DataAccess\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\schema\org\openoffice\Office\OOoImprovement\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\Office\OOoImprovement
-..\%__SRC%\misc\registry\schema\org\openoffice\ucb\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\ucb
-..\%__SRC%\misc\registry\schema\org\openoffice\TypeDetection\*.xcs %_DEST%\xml%_EXT%\registry\schema\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml%_EXT%\registry\data
-mkdir: %_DEST%\xml%_EXT%\registry\data\org
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\OOoImprovement
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
-
-..\registry\schema\oo-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ldap.xcd.sample
-..\registry\schema\oo-ad-ldap.xcd.sample %_DEST%\xml%_EXT%\oo-ad-ldap.xcd.sample
-
-..\%__SRC%\misc\registry\data\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice
-..\%__SRC%\misc\registry\data\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office
-..\%__SRC%\misc\registry\data\org\openoffice\Office\UI\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\data\org\openoffice\Office\DataAccess\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\Office\DataAccess
-..\%__SRC%\misc\registry\data\org\openoffice\ucb\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\ucb
-..\%__SRC%\misc\registry\data\org\openoffice\TypeDetection\*.xcu %_DEST%\xml%_EXT%\registry\data\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\xml%_EXT%\registry\spool
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-mkdir: %_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
-
-..\%__SRC%\misc\registry\spool\*.xcu %_DEST%\xml%_EXT%\registry\spool
-..\%__SRC%\misc\registry\spool\org\openoffice\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office
-..\%__SRC%\misc\registry\spool\org\openoffice\Office\UI\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\Office\UI
-..\%__SRC%\misc\registry\spool\org\openoffice\ucb\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\ucb
-..\%__SRC%\misc\registry\spool\org\openoffice\TypeDetection\*.xcu %_DEST%\xml%_EXT%\registry\spool\org\openoffice\TypeDetection
-
-mkdir: %_DEST%\pck%_EXT%
-
-..\%__SRC%\misc\*.properties %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldif %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.ldf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.conf %_DEST%\pck%_EXT%
-..\%__SRC%\misc\*.map %_DEST%\pck%_EXT%
-
-..\%__SRC%\bin\*.zip %_DEST%\pck%_EXT%
-
-mkdir: %_DEST%\xml%_EXT%\processing
-
-..\util\*.xsl %_DEST%\xml%_EXT%\processing
-..\registry\*.dtd %_DEST%\xml%_EXT%\registry
diff --git a/main/officecfg/prj/makefile.mk b/main/officecfg/prj/makefile.mk
new file mode 100644
index 0000000000..d30a7dd4f0
--- /dev/null
+++ b/main/officecfg/prj/makefile.mk
@@ -0,0 +1,32 @@
+#***************************************************************
+# 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
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#***************************************************************
+
+PRJ=..
+TARGET=prj
+
+.INCLUDE : settings.mk
+
+.IF "$(VERBOSE)"!=""
+VERBOSEFLAG :=
+.ELSE
+VERBOSEFLAG := -s
+.ENDIF
+
+all:
+ cd $(PRJ) && $(GNUMAKE) $(VERBOSEFLAG) -r -j$(MAXPROCESS) $(gb_MAKETARGET) && $(GNUMAKE) $(VERBOSEFLAG) -r deliverlog
diff --git a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk b/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index b3ee3e0dd4..0000000000
--- a/main/officecfg/registry/data/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,77 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-LOCALIZEDFILES= \
- BasicIDECommands.xcu \
- BibliographyCommands.xcu \
- CalcCommands.xcu \
- ChartCommands.xcu \
- ChartWindowState.xcu \
- DbuCommands.xcu \
- BaseWindowState.xcu \
- WriterFormWindowState.xcu \
- WriterReportWindowState.xcu \
- DbQueryWindowState.xcu \
- DbTableWindowState.xcu \
- DbRelationWindowState.xcu \
- DbBrowserWindowState.xcu \
- DbTableDataWindowState.xcu \
- DrawImpressCommands.xcu \
- Effects.xcu \
- GenericCommands.xcu \
- MathCommands.xcu \
- StartModuleCommands.xcu \
- BasicIDEWindowState.xcu \
- CalcWindowState.xcu \
- DrawWindowState.xcu \
- ImpressWindowState.xcu \
- MathWindowState.xcu \
- StartModuleWindowState.xcu \
- WriterWindowState.xcu \
- XFormsWindowState.xcu \
- WriterGlobalWindowState.xcu \
- WriterWebWindowState.xcu \
- WriterCommands.xcu\
- GenericCategories.xcu\
- Sidebar.xcu
-
-XCUFILES= \
- $(LOCALIZEDFILES) \
- Controller.xcu \
- Factories.xcu \
- GlobalSettings.xcu
-
-.INCLUDE : target.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/main/officecfg/registry/data/org/openoffice/Office/makefile.mk b/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
deleted file mode 100644
index b8cbaed5ff..0000000000
--- a/main/officecfg/registry/data/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,117 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Accelerators.xcu \
- Calc.xcu \
- Canvas.xcu \
- Common.xcu \
- Compatibility.xcu \
- DataAccess.xcu \
- Embedding.xcu \
- ExtensionDependencies.xcu \
- ExtensionManager.xcu \
- FormWizard.xcu \
- Histories.xcu \
- Impress.xcu \
- Jobs.xcu \
- Labels.xcu \
- Linguistic.xcu \
- Logging.xcu \
- Math.xcu \
- Paths.xcu \
- PresenterScreen.xcu \
- ProtocolHandler.xcu \
- SFX.xcu \
- Scripting.xcu \
- Security.xcu \
- TableWizard.xcu \
- UI.xcu \
- Views.xcu \
- WebWizard.xcu \
- Writer.xcu \
-
-MODULEFILES= \
- Accelerators-macosx.xcu \
- Accelerators-unxwnt.xcu \
- Common-brand.xcu \
- Common-writer.xcu \
- Common-calc.xcu \
- Common-draw.xcu \
- Common-impress.xcu \
- Common-base.xcu \
- Common-math.xcu \
- Common-unx.xcu \
- Common-unixdesktop.xcu \
- Common-gconflockdown.xcu \
- Common-macosx.xcu \
- Common-wnt.xcu \
- Common-UseOOoFileDialogs.xcu \
- Linguistic-ForceDefaultLanguage.xcu \
- Scripting-python.xcu \
- Common-cjk.xcu \
- Common-ctl.xcu \
- Common-korea.xcu \
- Paths-macosx.xcu \
- Paths-unxwnt.xcu \
- Paths-unixdesktop.xcu \
- Paths-internallibtextcatdata.xcu \
- Paths-externallibtextcatdata.xcu \
- Writer-cjk.xcu \
- Impress-ogltrans.xcu \
- Embedding-calc.xcu \
- Embedding-chart.xcu \
- Embedding-draw.xcu \
- Embedding-impress.xcu \
- Embedding-math.xcu \
- Embedding-base.xcu \
- Embedding-writer.xcu \
- UI-brand.xcu \
- Recovery-gconflockdown.xcu
-
-LOCALIZEDFILES= \
- Accelerators.xcu \
- Common.xcu \
- SFX.xcu \
- DataAccess.xcu \
- TableWizard.xcu \
- UI.xcu \
- Embedding.xcu \
- WebWizard.xcu \
- FormWizard.xcu \
- Writer.xcu \
- Impress.xcu \
- PresenterScreen.xcu
-
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk b/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index b692d2d056..0000000000
--- a/main/officecfg/registry/data/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,46 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooTypeDetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- UISort.xcu
-
-MODULEFILES= \
- UISort-writer.xcu \
- UISort-calc.xcu \
- UISort-draw.xcu \
- UISort-impress.xcu \
- UISort-math.xcu
-
-LOCALIZEDFILES=
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/data/org/openoffice/makefile.mk b/main/officecfg/registry/data/org/openoffice/makefile.mk
deleted file mode 100644
index 3b9d3162eb..0000000000
--- a/main/officecfg/registry/data/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,67 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_oopenoffice
-PACKAGE=org.openoffice
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- FirstStartWizard.xcu \
- Inet.xcu \
- Interaction.xcu \
- Setup.xcu \
- System.xcu \
- UserProfile.xcu \
- VCL.xcu \
-
-
-MODULEFILES= \
- Inet-macosx.xcu \
- Inet-unixdesktop.xcu \
- Inet-wnt.xcu \
- Setup-brand.xcu \
- Setup-writer.xcu \
- Setup-calc.xcu \
- Setup-draw.xcu \
- Setup-impress.xcu \
- Setup-base.xcu \
- Setup-math.xcu \
- Setup-report.xcu \
- Setup-start.xcu \
- UserProfile-gconflockdown.xcu \
- VCL-gconflockdown.xcu \
- VCL-unixdesktop.xcu
-
-LOCALIZEDFILES=Setup.xcu
-
-.INCLUDE : target.mk
-
-LANGUAGEPACKS=$(MISC)$/registry$/spool$/Langpack-{$(alllangiso)}.xcu
-
-ALLTAR : $(LANGUAGEPACKS)
diff --git a/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk b/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk
deleted file mode 100644
index 395abf66e2..0000000000
--- a/main/officecfg/registry/data/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=data_ooucb
-PACKAGE=org.openoffice.ucb
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCUFILES= \
- Configuration.xcu
-
-MODULEFILES= \
- Configuration-gio.xcu
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/makefile.mk b/main/officecfg/registry/makefile.mk
deleted file mode 100644
index 363e09412c..0000000000
--- a/main/officecfg/registry/makefile.mk
+++ /dev/null
@@ -1,39 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..
-PRJNAME=officecfg
-TARGET=registry
-
-.INCLUDE : settings.mk
-
-# ---------------------------------------------------------
-
-COPYFILES = \
- $(MISC)$/component-update.dtd
-
-.INCLUDE : target.mk
-
-ALLTAR : $(COPYFILES)
-
-$(COPYFILES) : $$(@:f)
- $(COPY) $< $@
diff --git a/main/officecfg/registry/schema/makefile.mk b/main/officecfg/registry/schema/makefile.mk
deleted file mode 100644
index 659e52efdc..0000000000
--- a/main/officecfg/registry/schema/makefile.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..
-
-PRJNAME=officecfg
-TARGET=ldapschema
-
-.INCLUDE : settings.mk
-
-# --- Targets ------------------------------------------------------
-
-UNIXTEXT= \
- $(MISC)$/oo-org-map.properties \
- $(MISC)$/oo-ldap-attr-map.properties \
- $(MISC)$/oo-common.conf \
- $(MISC)$/oo-common.ldif \
- $(MISC)$/oo-common-ad.ldf
-
-.INCLUDE : target.mk
-
-ALLTAR: \
- $(UNIXTEXT)
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk b/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
deleted file mode 100644
index 3c9ea971bd..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/DataAccess/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooODataAccess
-PACKAGE=org.openoffice.Office.DataAccess
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Drivers.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk b/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
deleted file mode 100644
index 338b56f606..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/OOoImprovement/makefile.mk
+++ /dev/null
@@ -1,37 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOImprovement
-PACKAGE=org.openoffice.Office.OOoImprovement
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Settings.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk b/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
deleted file mode 100644
index 4ef9a46f62..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/UI/makefile.mk
+++ /dev/null
@@ -1,76 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOUI
-PACKAGE=org.openoffice.Office.UI
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Controller.xcs \
- Factories.xcs \
- Commands.xcs \
- BasicIDECommands.xcs \
- BibliographyCommands.xcs \
- CalcCommands.xcs \
- ChartCommands.xcs \
- DbuCommands.xcs \
- BaseWindowState.xcs \
- WriterFormWindowState.xcs \
- WriterReportWindowState.xcs \
- DbBrowserWindowState.xcs \
- DbTableDataWindowState.xcs \
- DrawImpressCommands.xcs \
- GenericCommands.xcs \
- MathCommands.xcs \
- StartModuleCommands.xcs \
- WriterCommands.xcs \
- WindowState.xcs \
- BasicIDEWindowState.xcs \
- BibliographyWindowState.xcs \
- CalcWindowState.xcs \
- ChartWindowState.xcs \
- DbQueryWindowState.xcs \
- DbRelationWindowState.xcs \
- DbTableWindowState.xcs \
- DrawWindowState.xcs \
- ImpressWindowState.xcs \
- MathWindowState.xcs \
- StartModuleWindowState.xcs \
- WriterWindowState.xcs \
- XFormsWindowState.xcs \
- WriterGlobalWindowState.xcs \
- WriterWebWindowState.xcs \
- Effects.xcs \
- Category.xcs \
- GenericCategories.xcs \
- GlobalSettings.xcs \
- WindowContentFactories.xcs \
- Sidebar.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk b/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
deleted file mode 100644
index 1a69b4a430..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/Office/makefile.mk
+++ /dev/null
@@ -1,79 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooOffice
-PACKAGE=org.openoffice.Office
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Accelerators.xcs \
- Addons.xcs \
- Calc.xcs \
- CalcAddIns.xcs \
- Canvas.xcs \
- Chart.xcs \
- Commands.xcs \
- Common.xcs \
- Compatibility.xcs \
- DataAccess.xcs \
- Draw.xcs \
- Embedding.xcs \
- Events.xcs \
- ExtendedColorScheme.xcs \
- ExtensionDependencies.xcs \
- ExtensionManager.xcs \
- FormWizard.xcs \
- Histories.xcs \
- Impress.xcs \
- Java.xcs \
- Jobs.xcs \
- Labels.xcs \
- Linguistic.xcs \
- Logging.xcs \
- Math.xcs \
- OOoImprovement.xcs \
- OptionsDialog.xcs \
- Paths.xcs \
- PresenterScreen.xcs \
- ProtocolHandler.xcs \
- Recovery.xcs \
- SFX.xcs \
- Scripting.xcs \
- Security.xcs \
- Substitution.xcs \
- TabBrowse.xcs \
- TableWizard.xcs \
- TypeDetection.xcs \
- UI.xcs \
- Views.xcs \
- WebWizard.xcs \
- Writer.xcs \
- WriterWeb.xcs \
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk b/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
deleted file mode 100644
index b6f37d036c..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/TypeDetection/makefile.mk
+++ /dev/null
@@ -1,41 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooTypeDetection
-PACKAGE=org.openoffice.TypeDetection
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Types.xcs \
- Filter.xcs \
- GraphicFilter.xcs \
- Misc.xcs \
- UISort.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/makefile.mk b/main/officecfg/registry/schema/org/openoffice/makefile.mk
deleted file mode 100644
index 422feed677..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/makefile.mk
+++ /dev/null
@@ -1,44 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooffice
-PACKAGE=org.openoffice
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- LDAP.xcs \
- Inet.xcs \
- Setup.xcs \
- System.xcs \
- UserProfile.xcs \
- VCL.xcs \
- FirstStartWizard.xcs \
- Interaction.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk b/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
deleted file mode 100644
index 474b4b385a..0000000000
--- a/main/officecfg/registry/schema/org/openoffice/ucb/makefile.mk
+++ /dev/null
@@ -1,40 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..$/..$/..$/..$/..
-
-PRJNAME=officecfg
-TARGET=schema_ooucb
-PACKAGE=org.openoffice.ucb
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Targets ------------------------------------------------------
-
-XCSFILES= \
- Configuration.xcs \
- Hierarchy.xcs \
- InteractionHandler.xcs \
- Store.xcs
-
-.INCLUDE : target.mk
diff --git a/main/officecfg/util/makefile.mk b/main/officecfg/util/makefile.mk
deleted file mode 100644
index fd24121088..0000000000
--- a/main/officecfg/util/makefile.mk
+++ /dev/null
@@ -1,43 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-PRJ=..
-
-
-PRJNAME=officecfg
-TARGET=util
-
-.INCLUDE : settings.mk
-.INCLUDE : target.mk
-
-# --- Targets ------------------------------------------------------
-
-$(MISC)$/$(TARGET)_delzip :
- -$(RM) $(BIN)$/registry_{$(alllangiso)}.zip
-
-$(BIN)$/registry_{$(alllangiso)}.zip : $(MISC)$/$(TARGET)_delzip
- cd $(MISC)$/registry$/res$/$(@:b:s/registry_//) && zip -ru ..$/..$/..$/..$/bin$/registry_$(@:b:s/registry_//).zip org/*
- $(PERL) -w $(SOLARENV)$/bin$/cleanzip.pl $@
-
-ALLTAR: \
- $(MISC)$/$(TARGET)_delzip \
- $(BIN)$/registry_{$(alllangiso)}.zip
diff --git a/main/officecfg/util/makefile.pmk b/main/officecfg/util/makefile.pmk
deleted file mode 100644
index f02b895cb9..0000000000
--- a/main/officecfg/util/makefile.pmk
+++ /dev/null
@@ -1,29 +0,0 @@
-#**************************************************************
-#
-# 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
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-#**************************************************************
-
-
-
-XSLDIR=$(PRJ)$/util
-ABSXCSROOT=$(PWD)$/$(PRJ)
-XCSROOT=..
-DTDDIR=$(PRJ)
-PROCESSOUT=$(MISC)
-PROCESSORDIR=$(CLASSDIR)
(openoffice) 19/21: We cannot use $(SRCDIR)/solenv/src/component.map as a version map file yet, because it doesn't export RTTI and exception typeinfos.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 0a9d806e6889118a07d68c9403d7c84bfac0af44
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 18 11:47:02 2025 +0200
We cannot use $(SRCDIR)/solenv/src/component.map as a version map
file yet, because it doesn't export RTTI and exception typeinfos.
Generally speaking, .map files have 2 purposes:
(A) to set symbol visibility (exported / hidden).
(B) to assign symbol versions to symbols.
We already achieve (A) by means of compiler-level annotations,
at least in gbuild (and in some dmake modules too), so we only
need .map files for (B).
dmake also has an AWK script in main/solenv/bin/addsym.awk, which
it uses to add:
_ZTI*; _ZTS*; # weak RTTI symbols for C++ exceptions
to the "global" section in .map files before linking with them.
However we don't need that. Since gbuild already hides unwanted
symbols, and exports everything wanted, once dmake is gone,
we could just use this much simpler .map file:
UDK_3_0_0 {
global:
*;
};
which would assign symbol version, without changing visibility.
For now, just stop using $(SRCDIR)/solenv/src/component.map. It
crashes during chart creation, because it cannot find exception
typeinfos. This means all gbuild modules lack symbol versions
which they used to have with dmake, but we can easily add that
later.
Patch by: me
---
main/chart2/Library_chartcontroller.mk | 2 --
main/chart2/Library_chartmodel.mk | 2 --
2 files changed, 4 deletions(-)
diff --git a/main/chart2/Library_chartcontroller.mk b/main/chart2/Library_chartcontroller.mk
index c69c3e7028..835146e0df 100644
--- a/main/chart2/Library_chartcontroller.mk
+++ b/main/chart2/Library_chartcontroller.mk
@@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,chartcontroller))
$(eval $(call gb_Library_add_precompiled_header,chartcontroller,$(SRCDIR)/chart2/inc/pch/precompiled_chartcontroller))
-$(eval $(call gb_Library_set_versionmap,chartcontroller,$(SRCDIR)/solenv/src/component.map))
-
$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
$(eval $(call gb_Library_set_include,chartcontroller,\
diff --git a/main/chart2/Library_chartmodel.mk b/main/chart2/Library_chartmodel.mk
index 9418ed4332..a1b20958f8 100644
--- a/main/chart2/Library_chartmodel.mk
+++ b/main/chart2/Library_chartmodel.mk
@@ -25,8 +25,6 @@ $(eval $(call gb_Library_Library,chartmodel))
$(eval $(call gb_Library_add_precompiled_header,chartmodel,$(SRCDIR)/chart2/inc/pch/precompiled_chartmodel))
-$(eval $(call gb_Library_set_versionmap,chartmodel,$(SRCDIR)/solenv/src/component.map))
-
$(eval $(call gb_Library_set_componentfile,chartmodel,chart2/source/model/chartmodel))
$(eval $(call gb_Library_set_include,chartmodel,\
(openoffice) 18/21: Add the empty prj/d.lst file for officecfg that was accidentally left out.
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
asf-gitbox-commits pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 9e90d1d104ef937463112c1b805ef463b6e59137
Author: Damjan Jovanovic <da...@apache.org>
AuthorDate: Sat Jan 18 07:00:52 2025 +0200
Add the empty prj/d.lst file for officecfg that was accidentally left out.
Patch by: me
---
main/officecfg/prj/d.lst | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/main/officecfg/prj/d.lst b/main/officecfg/prj/d.lst
new file mode 100644
index 0000000000..e69de29bb2