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:55 UTC
(openoffice) 07/21: Early, incomplete attempt to port connectivity to gbuild.
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"