This is an automated email from the ASF dual-hosted git repository. jimjag pushed a commit to branch trunk in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit 2d58aae5e7115e6acf3419d3faa4e3b77539414d Merge: e753d49c3b d9eb145fce Author: Jim Jagielski <[email protected]> AuthorDate: Mon Aug 3 06:28:02 2026 -0400 Merge branch 'trunk' of https://github.com/apache/openoffice into trunk main/Module_ooo.mk | 1 + main/Repository.mk | 18 +- main/RepositoryFixes.mk | 8 + main/basic/source/runtime/dllmgr.cxx | 2 +- .../source/cpp_uno/msvc_win64_x86-64/call.asm | 10 +- .../source/cpp_uno/msvc_win64_x86-64/cpp2uno.cxx | 19 +- .../source/cpp_uno/msvc_win64_x86-64/except.cxx | 19 +- .../source/cpp_uno/msvc_win64_x86-64/uno2cpp.cxx | 18 +- .../source/cpp_uno/s5abi_macosx_aarch64/abi.cxx | 15 + .../cpp_uno/s5abi_macosx_aarch64/cpp2uno.cxx | 5 +- .../source/cpp_uno/shared/vtablefactory.cxx | 35 ++ 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} | 32 +- 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} | 34 +- .../{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 +++++ .../Library_dbpool2.mk} | 55 ++- 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 ++++ .../Library_sdbc2.mk} | 51 ++- .../makefile.mk => connectivity/Makefile} | 29 +- .../Module_connectivity.mk} | 60 ++- .../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/jvmfwk/Module_jvmfwk.mk | 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 +- 859 files changed, 6422 insertions(+), 2845 deletions(-)
