From a2db194ea0eee4deb6401f6352144e5be077c140 Mon Sep 17 00:00:00 2001 From: Thomas Arnhold Date: Wed, 4 Jun 2014 15:29:58 +0200 Subject: connectivity: fix includes Change-Id: I5d5dc6871789865189c78fe9135e7f8bff829489 --- connectivity/qa/connectivity/ado/DriverTest.cxx | 2 +- .../qa/connectivity/commontools/FValue_test.cxx | 2 +- connectivity/source/commontools/BlobHelper.cxx | 4 +-- connectivity/source/commontools/CommonTools.cxx | 4 +-- .../source/commontools/ConnectionWrapper.cxx | 2 +- connectivity/source/commontools/DateConversion.cxx | 2 +- .../commontools/FDatabaseMetaDataResultSet.cxx | 2 +- connectivity/source/commontools/FValue.cxx | 4 +-- .../source/commontools/ParamterSubstitution.cxx | 2 +- connectivity/source/commontools/TColumnsHelper.cxx | 8 +++--- connectivity/source/commontools/TIndex.cxx | 6 ++-- connectivity/source/commontools/TIndexColumns.cxx | 8 +++--- connectivity/source/commontools/TIndexes.cxx | 6 ++-- connectivity/source/commontools/TKey.cxx | 6 ++-- connectivity/source/commontools/TKeyColumns.cxx | 6 ++-- connectivity/source/commontools/TKeys.cxx | 6 ++-- .../source/commontools/TSkipDeletedSet.cxx | 2 +- connectivity/source/commontools/TTableHelper.cxx | 6 ++-- connectivity/source/commontools/dbmetadata.cxx | 6 ++-- connectivity/source/commontools/dbtools.cxx | 6 ++-- connectivity/source/commontools/dbtools2.cxx | 10 +++---- connectivity/source/commontools/filtermanager.cxx | 4 +-- .../source/commontools/formattedcolumnvalue.cxx | 6 ++-- connectivity/source/commontools/parameters.cxx | 6 ++-- connectivity/source/commontools/sqlerror.cxx | 2 +- .../source/commontools/warningscontainer.cxx | 4 +-- connectivity/source/cpool/ZConnectionPool.cxx | 2 +- connectivity/source/cpool/ZConnectionWrapper.hxx | 2 +- connectivity/source/cpool/ZPooledConnection.cxx | 2 +- connectivity/source/drivers/ado/AConnection.cxx | 2 +- .../drivers/ado/ADatabaseMetaDataResultSet.cxx | 2 +- .../ado/ADatabaseMetaDataResultSetMetaData.cxx | 2 +- connectivity/source/drivers/ado/ADriver.cxx | 2 +- connectivity/source/drivers/ado/AGroups.cxx | 2 +- .../source/drivers/ado/APreparedStatement.cxx | 6 ++-- connectivity/source/drivers/ado/AResultSet.cxx | 4 +-- .../source/drivers/ado/AResultSetMetaData.cxx | 2 +- connectivity/source/drivers/ado/AStatement.cxx | 2 +- connectivity/source/drivers/ado/AUsers.cxx | 2 +- connectivity/source/drivers/ado/Aolevariant.cxx | 10 +++---- connectivity/source/drivers/ado/adoimp.cxx | 2 +- connectivity/source/drivers/calc/CColumns.cxx | 2 +- connectivity/source/drivers/calc/CDriver.cxx | 4 +-- connectivity/source/drivers/calc/CTable.cxx | 2 +- connectivity/source/drivers/dbase/DColumns.cxx | 2 +- .../source/drivers/dbase/DDatabaseMetaData.cxx | 2 +- connectivity/source/drivers/dbase/DDriver.cxx | 4 +-- connectivity/source/drivers/dbase/DIndex.cxx | 4 +-- .../source/drivers/dbase/DIndexColumns.cxx | 2 +- connectivity/source/drivers/dbase/DTable.cxx | 8 +++--- connectivity/source/drivers/dbase/DTables.cxx | 2 +- connectivity/source/drivers/dbase/dindexnode.cxx | 2 +- connectivity/source/drivers/evoab2/NCatalog.hxx | 2 +- connectivity/source/drivers/evoab2/NColumns.cxx | 2 +- connectivity/source/drivers/evoab2/NColumns.hxx | 2 +- connectivity/source/drivers/evoab2/NConnection.hxx | 6 ++-- connectivity/source/drivers/evoab2/NDriver.cxx | 4 +-- connectivity/source/drivers/evoab2/NDriver.hxx | 2 +- connectivity/source/drivers/evoab2/NResultSet.hxx | 8 +++--- .../source/drivers/evoab2/NResultSetMetaData.cxx | 2 +- connectivity/source/drivers/evoab2/NStatement.hxx | 8 +++--- connectivity/source/drivers/evoab2/NTable.hxx | 2 +- connectivity/source/drivers/evoab2/NTables.cxx | 4 +-- connectivity/source/drivers/evoab2/NTables.hxx | 2 +- connectivity/source/drivers/file/FColumns.cxx | 2 +- connectivity/source/drivers/file/FConnection.cxx | 2 +- connectivity/source/drivers/file/FDriver.cxx | 2 +- .../source/drivers/file/FPreparedStatement.cxx | 10 +++---- connectivity/source/drivers/file/FResultSet.cxx | 8 +++--- .../source/drivers/file/FResultSetMetaData.cxx | 2 +- connectivity/source/drivers/file/FStatement.cxx | 2 +- connectivity/source/drivers/file/fanalyzer.cxx | 6 ++-- connectivity/source/drivers/file/fcode.cxx | 2 +- connectivity/source/drivers/file/fcomp.cxx | 6 ++-- connectivity/source/drivers/firebird/Blob.cxx | 2 +- connectivity/source/drivers/flat/EColumns.cxx | 2 +- connectivity/source/drivers/flat/EDriver.cxx | 4 +-- connectivity/source/drivers/flat/ETable.cxx | 2 +- connectivity/source/drivers/hsqldb/HDriver.cxx | 2 +- connectivity/source/drivers/hsqldb/HTable.cxx | 10 +++---- connectivity/source/drivers/hsqldb/HTables.cxx | 4 +-- connectivity/source/drivers/hsqldb/HUser.cxx | 4 +-- connectivity/source/drivers/hsqldb/HUsers.cxx | 6 ++-- connectivity/source/drivers/hsqldb/HView.cxx | 4 +-- connectivity/source/drivers/hsqldb/HViews.cxx | 4 +-- .../drivers/hsqldb/StorageNativeInputStream.cxx | 2 +- .../drivers/hsqldb/StorageNativeOutputStream.cxx | 14 +++++----- .../source/drivers/jdbc/DatabaseMetaData.cxx | 2 +- connectivity/source/drivers/jdbc/Date.cxx | 2 +- connectivity/source/drivers/jdbc/JConnection.cxx | 12 ++++---- connectivity/source/drivers/jdbc/JDriver.cxx | 2 +- connectivity/source/drivers/jdbc/Object.cxx | 2 +- .../source/drivers/jdbc/PreparedStatement.cxx | 6 ++-- connectivity/source/drivers/jdbc/ResultSet.cxx | 6 ++-- connectivity/source/drivers/jdbc/Timestamp.cxx | 2 +- connectivity/source/drivers/kab/KCatalog.hxx | 2 +- connectivity/source/drivers/kab/KColumns.cxx | 2 +- connectivity/source/drivers/kab/KColumns.hxx | 2 +- connectivity/source/drivers/kab/KConnection.hxx | 4 +-- connectivity/source/drivers/kab/KDriver.cxx | 2 +- connectivity/source/drivers/kab/KStatement.hxx | 4 +-- connectivity/source/drivers/kab/KTable.hxx | 2 +- connectivity/source/drivers/kab/KTables.hxx | 2 +- connectivity/source/drivers/kab/kcondition.cxx | 2 +- connectivity/source/drivers/kab/korder.hxx | 2 +- .../source/drivers/macab/MacabAddressBook.cxx | 2 +- connectivity/source/drivers/macab/MacabCatalog.hxx | 2 +- connectivity/source/drivers/macab/MacabColumns.cxx | 2 +- connectivity/source/drivers/macab/MacabColumns.hxx | 2 +- .../source/drivers/macab/MacabConnection.hxx | 4 +-- .../drivers/macab/MacabPreparedStatement.cxx | 2 +- .../source/drivers/macab/MacabStatement.hxx | 4 +-- connectivity/source/drivers/macab/MacabTable.hxx | 2 +- connectivity/source/drivers/macab/MacabTables.hxx | 2 +- .../source/drivers/macab/macabcondition.cxx | 2 +- connectivity/source/drivers/macab/macaborder.hxx | 2 +- connectivity/source/drivers/mork/MCatalog.hxx | 2 +- connectivity/source/drivers/mork/MColumns.cxx | 4 +-- connectivity/source/drivers/mork/MColumns.hxx | 4 +-- connectivity/source/drivers/mork/MConnection.hxx | 4 +-- .../source/drivers/mork/MDatabaseMetaData.cxx | 2 +- .../source/drivers/mork/MDatabaseMetaData.hxx | 4 +-- .../drivers/mork/MDatabaseMetaDataHelper.hxx | 2 +- connectivity/source/drivers/mork/MDriver.hxx | 32 +++++++++++----------- connectivity/source/drivers/mork/MNSFolders.cxx | 2 +- connectivity/source/drivers/mork/MNSINIParser.cxx | 2 +- .../source/drivers/mork/MNSProfileDiscover.cxx | 4 +-- .../source/drivers/mork/MPreparedStatement.cxx | 6 ++-- connectivity/source/drivers/mork/MResultSet.hxx | 6 ++-- .../source/drivers/mork/MResultSetMetaData.cxx | 4 +-- connectivity/source/drivers/mork/MServices.cxx | 8 +++--- connectivity/source/drivers/mork/MStatement.hxx | 6 ++-- connectivity/source/drivers/mork/MTable.cxx | 6 ++-- connectivity/source/drivers/mork/MTable.hxx | 2 +- connectivity/source/drivers/mork/MTables.cxx | 4 +-- connectivity/source/drivers/mork/MTables.hxx | 2 +- connectivity/source/drivers/mork/dllapi.h | 4 +-- connectivity/source/drivers/mork/services.cxx | 8 +++--- connectivity/source/drivers/mozab/MCatalog.hxx | 2 +- connectivity/source/drivers/mozab/MColumns.cxx | 4 +-- connectivity/source/drivers/mozab/MColumns.hxx | 4 +-- .../source/drivers/mozab/MConfigAccess.cxx | 4 +-- connectivity/source/drivers/mozab/MConnection.hxx | 4 +-- connectivity/source/drivers/mozab/MDriver.cxx | 2 +- connectivity/source/drivers/mozab/MDriver.hxx | 2 +- .../source/drivers/mozab/MPreparedStatement.cxx | 6 ++-- connectivity/source/drivers/mozab/MResultSet.hxx | 6 ++-- .../source/drivers/mozab/MResultSetMetaData.cxx | 4 +-- connectivity/source/drivers/mozab/MStatement.hxx | 6 ++-- connectivity/source/drivers/mozab/MTable.cxx | 6 ++-- connectivity/source/drivers/mozab/MTable.hxx | 2 +- connectivity/source/drivers/mozab/MTables.cxx | 4 +-- connectivity/source/drivers/mozab/MTables.hxx | 2 +- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 4 +-- .../source/drivers/mozab/bootstrap/MNSFolders.cxx | 2 +- .../drivers/mozab/bootstrap/MNSINIParser.cxx | 2 +- .../drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 4 +-- .../drivers/mozab/bootstrap/MNSProfileManager.cxx | 4 +-- .../mozab/bootstrap/mozilla_profilemanager.h | 2 +- .../mozab/mozillasrc/MDatabaseMetaDataHelper.cxx | 4 +-- .../drivers/mozab/mozillasrc/MLdapAttributeMap.hxx | 2 +- .../drivers/mozab/mozillasrc/MNSMozabProxy.cxx | 4 +-- .../drivers/mozab/mozillasrc/MNSMozabProxy.hxx | 4 +-- .../drivers/mozab/mozillasrc/MNameMapper.cxx | 2 +- .../drivers/mozab/mozillasrc/MNameMapper.hxx | 2 +- .../source/drivers/mozab/mozillasrc/MQuery.cxx | 4 +-- .../drivers/mozab/mozillasrc/MQueryHelper.hxx | 2 +- .../drivers/mozab/mozillasrc/MTypeConverter.cxx | 2 +- .../source/drivers/mozab/pre_include_mozilla.h | 2 +- connectivity/source/drivers/mysql/YDriver.cxx | 2 +- connectivity/source/drivers/mysql/YTable.cxx | 10 +++---- connectivity/source/drivers/mysql/YTables.cxx | 4 +-- connectivity/source/drivers/mysql/YUser.cxx | 4 +-- connectivity/source/drivers/mysql/YUsers.cxx | 6 ++-- connectivity/source/drivers/mysql/YViews.cxx | 6 ++-- connectivity/source/drivers/odbc/ODriver.cxx | 2 +- .../source/drivers/odbc/OPreparedStatement.cxx | 6 ++-- connectivity/source/drivers/odbc/ORealDriver.hxx | 6 ++-- connectivity/source/drivers/odbc/OResultSet.cxx | 4 +-- connectivity/source/drivers/odbc/OStatement.cxx | 2 +- .../source/drivers/postgresql/pq_tools.hxx | 2 +- connectivity/source/inc/AutoRetrievingBase.hxx | 2 +- .../source/inc/FDatabaseMetaDataResultSet.hxx | 6 ++-- .../inc/FDatabaseMetaDataResultSetMetaData.hxx | 4 +-- connectivity/source/inc/OColumn.hxx | 2 +- connectivity/source/inc/OTypeInfo.hxx | 2 +- connectivity/source/inc/RowFunctionParser.hxx | 2 +- connectivity/source/inc/TConnection.hxx | 4 +-- connectivity/source/inc/TDatabaseMetaDataBase.hxx | 2 +- connectivity/source/inc/TKeyValue.hxx | 4 +-- connectivity/source/inc/TPrivilegesResultSet.hxx | 2 +- connectivity/source/inc/TResultSetHelper.hxx | 2 +- connectivity/source/inc/TSkipDeletedSet.hxx | 2 +- connectivity/source/inc/TSortIndex.hxx | 2 +- connectivity/source/inc/ado/ACatalog.hxx | 2 +- connectivity/source/inc/ado/AColumn.hxx | 2 +- connectivity/source/inc/ado/AColumns.hxx | 4 +-- connectivity/source/inc/ado/AConnection.hxx | 4 +-- .../source/inc/ado/ADatabaseMetaDataResultSet.hxx | 2 +- connectivity/source/inc/ado/ADriver.hxx | 2 +- connectivity/source/inc/ado/AGroup.hxx | 2 +- connectivity/source/inc/ado/AGroups.hxx | 2 +- connectivity/source/inc/ado/AIndex.hxx | 2 +- connectivity/source/inc/ado/AIndexes.hxx | 2 +- connectivity/source/inc/ado/AKey.hxx | 2 +- connectivity/source/inc/ado/AKeys.hxx | 2 +- connectivity/source/inc/ado/ATable.hxx | 2 +- connectivity/source/inc/ado/ATables.hxx | 2 +- connectivity/source/inc/ado/AUser.hxx | 2 +- connectivity/source/inc/ado/AUsers.hxx | 2 +- connectivity/source/inc/ado/AView.hxx | 2 +- connectivity/source/inc/ado/AViews.hxx | 2 +- connectivity/source/inc/ado/Aolewrap.hxx | 2 +- connectivity/source/inc/dbase/DDriver.hxx | 2 +- connectivity/source/inc/dbase/DIndex.hxx | 2 +- connectivity/source/inc/dbase/DIndexColumns.hxx | 2 +- connectivity/source/inc/dbase/DIndexes.hxx | 2 +- connectivity/source/inc/dbase/DTable.hxx | 4 +-- connectivity/source/inc/dbase/dindexnode.hxx | 2 +- connectivity/source/inc/file/FCatalog.hxx | 2 +- connectivity/source/inc/file/FColumns.hxx | 4 +-- connectivity/source/inc/file/FConnection.hxx | 8 +++--- connectivity/source/inc/file/FDriver.hxx | 2 +- connectivity/source/inc/file/FResultSet.hxx | 4 +-- .../source/inc/file/FResultSetMetaData.hxx | 2 +- connectivity/source/inc/file/FStatement.hxx | 2 +- connectivity/source/inc/file/FTable.hxx | 4 +-- connectivity/source/inc/file/FTables.hxx | 2 +- connectivity/source/inc/file/fcode.hxx | 6 ++-- connectivity/source/inc/file/filedllapi.hxx | 4 +-- connectivity/source/inc/flat/EDriver.hxx | 2 +- connectivity/source/inc/flat/ETable.hxx | 4 +-- connectivity/source/inc/hsqldb/HCatalog.hxx | 4 +-- connectivity/source/inc/hsqldb/HColumns.hxx | 4 +-- connectivity/source/inc/hsqldb/HConnection.hxx | 2 +- connectivity/source/inc/hsqldb/HDriver.hxx | 2 +- connectivity/source/inc/hsqldb/HTable.hxx | 2 +- connectivity/source/inc/hsqldb/HTables.hxx | 2 +- connectivity/source/inc/hsqldb/HUser.hxx | 4 +-- connectivity/source/inc/hsqldb/HUsers.hxx | 4 +-- connectivity/source/inc/hsqldb/HView.hxx | 2 +- connectivity/source/inc/hsqldb/HViews.hxx | 2 +- connectivity/source/inc/java/sql/Connection.hxx | 4 +-- connectivity/source/inc/java/sql/JStatement.hxx | 4 +-- connectivity/source/inc/java/sql/ResultSet.hxx | 2 +- connectivity/source/inc/mysql/YCatalog.hxx | 4 +-- connectivity/source/inc/mysql/YColumns.hxx | 4 +-- connectivity/source/inc/mysql/YDriver.hxx | 2 +- connectivity/source/inc/mysql/YTable.hxx | 2 +- connectivity/source/inc/mysql/YTables.hxx | 4 +-- connectivity/source/inc/mysql/YUser.hxx | 4 +-- connectivity/source/inc/mysql/YUsers.hxx | 4 +-- connectivity/source/inc/mysql/YViews.hxx | 2 +- connectivity/source/inc/odbc/OConnection.hxx | 4 +-- .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 2 +- connectivity/source/inc/odbc/ODriver.hxx | 2 +- connectivity/source/inc/odbc/OResultSet.hxx | 4 +-- connectivity/source/inc/odbc/OStatement.hxx | 2 +- connectivity/source/inc/odbc/odbcbasedllapi.hxx | 4 +-- connectivity/source/inc/propertyids.hxx | 2 +- .../source/inc/resource/sharedresources.hxx | 2 +- connectivity/source/manager/mdrivermanager.hxx | 2 +- connectivity/source/parse/PColumn.cxx | 4 +-- connectivity/source/parse/sqliterator.cxx | 8 +++--- connectivity/source/parse/sqlnode.cxx | 6 ++-- connectivity/source/sdbcx/VCatalog.cxx | 8 +++--- connectivity/source/sdbcx/VCollection.cxx | 6 ++-- connectivity/source/sdbcx/VColumn.cxx | 2 +- connectivity/source/sdbcx/VGroup.cxx | 2 +- connectivity/source/sdbcx/VIndex.cxx | 6 ++-- connectivity/source/sdbcx/VIndexColumn.cxx | 2 +- connectivity/source/sdbcx/VKey.cxx | 6 ++-- connectivity/source/sdbcx/VKeyColumn.cxx | 2 +- connectivity/source/sdbcx/VTable.cxx | 12 ++++---- connectivity/source/sdbcx/VUser.cxx | 4 +-- connectivity/source/sdbcx/VView.cxx | 4 +-- connectivity/source/simpledbt/staticdbtools_s.cxx | 2 +- connectivity/workben/little/main.cxx | 4 +-- connectivity/workben/skeleton/SResultSet.hxx | 4 +-- connectivity/workben/testmoz/initUNO.cxx | 4 +-- connectivity/workben/testmoz/main.cxx | 4 +-- connectivity/workben/testmoz/mozthread.cxx | 4 +-- 282 files changed, 513 insertions(+), 513 deletions(-) (limited to 'connectivity') diff --git a/connectivity/qa/connectivity/ado/DriverTest.cxx b/connectivity/qa/connectivity/ado/DriverTest.cxx index 80753fa31745..c7115818bb05 100644 --- a/connectivity/qa/connectivity/ado/DriverTest.cxx +++ b/connectivity/qa/connectivity/ado/DriverTest.cxx @@ -21,7 +21,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include #include "resource/ado_res.hrc" diff --git a/connectivity/qa/connectivity/commontools/FValue_test.cxx b/connectivity/qa/connectivity/commontools/FValue_test.cxx index 8bab18be1140..2e6e326db960 100644 --- a/connectivity/qa/connectivity/commontools/FValue_test.cxx +++ b/connectivity/qa/connectivity/commontools/FValue_test.cxx @@ -19,7 +19,7 @@ #include -#include "connectivity/FValue.hxx" +#include #include using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 28a636d8b137..65a12ed43dd9 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.cxx @@ -16,9 +16,9 @@ * except in compliance with the License. You may obtain a copy of * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/BlobHelper.hxx" +#include #include -#include "connectivity/dbexception.hxx" +#include using namespace connectivity; using namespace dbtools; diff --git a/connectivity/source/commontools/CommonTools.cxx b/connectivity/source/commontools/CommonTools.cxx index f571e8e39db6..d67a794002bc 100644 --- a/connectivity/source/commontools/CommonTools.cxx +++ b/connectivity/source/commontools/CommonTools.cxx @@ -20,8 +20,8 @@ #include #include -#include "connectivity/CommonTools.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index a3529b4a63a9..f7b5427dbe4e 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/ConnectionWrapper.hxx" +#include #include #include #include diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index bb44707fa1e3..5371c431e0b6 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/dbconversion.hxx" +#include #include #include #include diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index 646d57865128..aee11e56ddf9 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -37,7 +37,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include "resource/common_res.hrc" #include "TConnection.hxx" diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index e7bb80306cd3..cd1365c08cba 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -20,8 +20,8 @@ #include #include -#include "connectivity/FValue.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 372e86a665fb..1ed3792b5688 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include "ParameterSubstitution.hxx" -#include "connectivity/sqlparse.hxx" +#include #include #include diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 28583442d2be..a4b3daff2d15 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TColumnsHelper.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include +#include #include #include #include @@ -27,9 +27,9 @@ #include #include #include -#include "connectivity/dbtools.hxx" +#include #include "TConnection.hxx" -#include "connectivity/TTableHelper.hxx" +#include #include using namespace ::comphelper; diff --git a/connectivity/source/commontools/TIndex.cxx b/connectivity/source/commontools/TIndex.cxx index 7f5069602a93..c6fe22e49a8b 100644 --- a/connectivity/source/commontools/TIndex.cxx +++ b/connectivity/source/commontools/TIndex.cxx @@ -17,11 +17,11 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TIndex.hxx" -#include "connectivity/TIndexColumns.hxx" +#include +#include #include #include -#include "connectivity/TTableHelper.hxx" +#include #include "TConnection.hxx" using namespace connectivity; diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 179dca464fc1..0edd2ec88eeb 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TIndexColumns.hxx" -#include "connectivity/sdbcx/VIndexColumn.hxx" +#include +#include #include #include #include #include #include -#include "connectivity/TIndex.hxx" -#include "connectivity/TTableHelper.hxx" +#include +#include #include "TConnection.hxx" using namespace connectivity; diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 642aa323f03b..8c6a3b62889d 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TIndexes.hxx" -#include "connectivity/TIndex.hxx" +#include +#include #include #include #include #include -#include "connectivity/TTableHelper.hxx" +#include #include "TConnection.hxx" #include #include diff --git a/connectivity/source/commontools/TKey.cxx b/connectivity/source/commontools/TKey.cxx index b269ab26bf71..bc99cd55f1c0 100644 --- a/connectivity/source/commontools/TKey.cxx +++ b/connectivity/source/commontools/TKey.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TKey.hxx" -#include "connectivity/TKeyColumns.hxx" +#include +#include #include #include #include "TConnection.hxx" -#include "connectivity/TTableHelper.hxx" +#include using namespace connectivity; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index c79bcca8ab7d..11323dec47ed 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TKeyColumns.hxx" -#include "connectivity/sdbcx/VKeyColumn.hxx" +#include +#include #include #include #include @@ -26,7 +26,7 @@ #include #include #include "TConnection.hxx" -#include "connectivity/TTableHelper.hxx" +#include using namespace connectivity; using namespace connectivity::sdbcx; diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 135d77a2233a..30ba628b4a37 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/TKeys.hxx" -#include "connectivity/TKey.hxx" +#include +#include #include #include #include #include -#include "connectivity/dbtools.hxx" +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/commontools/TSkipDeletedSet.cxx b/connectivity/source/commontools/TSkipDeletedSet.cxx index 58e1a73dc057..563d54555aa1 100644 --- a/connectivity/source/commontools/TSkipDeletedSet.cxx +++ b/connectivity/source/commontools/TSkipDeletedSet.cxx @@ -19,7 +19,7 @@ #include "TSkipDeletedSet.hxx" #include -#include "sal/log.hxx" +#include using namespace connectivity; diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index be7e9a135253..75a47668d293 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -20,7 +20,7 @@ #include #include -#include "connectivity/TTableHelper.hxx" +#include #include #include #include @@ -31,8 +31,8 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include +#include #include #include "TConnection.hxx" diff --git a/connectivity/source/commontools/dbmetadata.cxx b/connectivity/source/commontools/dbmetadata.cxx index 75fcc66b925f..bb1b23dfcd27 100644 --- a/connectivity/source/commontools/dbmetadata.cxx +++ b/connectivity/source/commontools/dbmetadata.cxx @@ -18,9 +18,9 @@ */ -#include "connectivity/dbmetadata.hxx" -#include "connectivity/dbexception.hxx" -#include "connectivity/DriversConfig.hxx" +#include +#include +#include #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 7ebf4a165622..9200694e056c 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/CommonTools.hxx" +#include #include "diagnose_ex.h" #include "TConnection.hxx" -#include "connectivity/ParameterCont.hxx" +#include #include #include @@ -79,7 +79,7 @@ #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" -#include "connectivity/OSubComponent.hxx" +#include #include #include diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index d18fa2084bef..ec5254cd9777 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/dbtools.hxx" -#include "connectivity/dbconversion.hxx" -#include "connectivity/dbcharset.hxx" -#include "connectivity/SQLStatementHelper.hxx" +#include +#include +#include +#include #include #include "resource/sharedresources.hxx" #include "resource/common_res.hrc" @@ -39,7 +39,7 @@ #include #include #include "TConnection.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include diff --git a/connectivity/source/commontools/filtermanager.cxx b/connectivity/source/commontools/filtermanager.cxx index 1c97944fb4bd..991baf2618bc 100644 --- a/connectivity/source/commontools/filtermanager.cxx +++ b/connectivity/source/commontools/filtermanager.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/filtermanager.hxx" +#include #include #include "TConnection.hxx" #include -#include "connectivity/dbtools.hxx" +#include #include #include diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index d70f014621bc..aba3c056001b 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -18,9 +18,9 @@ */ -#include "connectivity/formattedcolumnvalue.hxx" -#include "connectivity/dbtools.hxx" -#include "connectivity/dbconversion.hxx" +#include +#include +#include #include #include diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 13859f83b3b5..cc3799ed33dd 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/parameters.hxx" +#include #include #include @@ -29,7 +29,7 @@ #include #include -#include "connectivity/filtermanager.hxx" +#include #include "TConnection.hxx" #include @@ -38,7 +38,7 @@ #include #include #include -#include "connectivity/ParameterCont.hxx" +#include #include diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 14686fd71263..1894f354f3e3 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -18,7 +18,7 @@ */ -#include "connectivity/sqlerror.hxx" +#include #include diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index 1091eaeeb13e..e17e2cb82a06 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.cxx @@ -18,8 +18,8 @@ */ -#include "connectivity/warningscontainer.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index adb2b0e0272a..e0e1f4c9ba3b 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -27,7 +27,7 @@ #include #include "ZPooledConnection.hxx" #include "ZPoolCollection.hxx" -#include "connectivity/ConnectionWrapper.hxx" +#include #include diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index 99d3036c9b96..ab827185fb2f 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "connectivity/ConnectionWrapper.hxx" +#include namespace connectivity { diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index 2888e88ebc2e..56576adde5ad 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -19,7 +19,7 @@ #include "ZPooledConnection.hxx" #include "ZConnectionWrapper.hxx" -#include "connectivity/ConnectionWrapper.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 31768d537141..6dcb5628b828 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -29,7 +29,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include #include "resource/ado_res.hrc" diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 266000b5db58..6627e8d93e1a 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -32,7 +32,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 011e347625d4..79f602628941 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -19,7 +19,7 @@ #include "ado/ADatabaseMetaDataResultSetMetaData.hxx" #include "ado/Awrapado.hxx" -#include "connectivity/dbexception.hxx" +#include using namespace connectivity; diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 0f4958bca242..69f38d859c7b 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -24,7 +24,7 @@ #include "ado/Awrapado.hxx" #include "ado/adoimp.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include #include "resource/ado_res.hrc" #include diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index 4eae0dc11030..5e49dd347c76 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -23,7 +23,7 @@ #include "ado/AConnection.hxx" #include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include "TConnection.hxx" #include #include diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index 03f49802f326..71fbf0fc168b 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sqlparse.hxx" +#include #include "ado/APreparedStatement.hxx" #include #include "ado/AResultSetMetaData.hxx" @@ -27,8 +27,8 @@ #include #include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include "resource/ado_res.hrc" #include diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 4a5dd491dfe6..7ccbc5ecf50e 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -32,8 +32,8 @@ #include #include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include using namespace ::comphelper; diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index 9c4912350f11..03f8057b1c90 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -21,7 +21,7 @@ #include #include #include "ado/Awrapado.hxx" -#include "connectivity/dbexception.hxx" +#include using namespace connectivity; using namespace connectivity::ado; diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 9351a2f4fa32..830040f255e4 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include #undef max diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index e47ec19a99ea..081edbcbb2d9 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -23,7 +23,7 @@ #include "ado/AConnection.hxx" #include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include #include #include "resource/ado_res.hrc" diff --git a/connectivity/source/drivers/ado/Aolevariant.cxx b/connectivity/source/drivers/ado/Aolevariant.cxx index 78ad0d07ae95..bcb0c6280c95 100644 --- a/connectivity/source/drivers/ado/Aolevariant.cxx +++ b/connectivity/source/drivers/ado/Aolevariant.cxx @@ -18,7 +18,7 @@ */ #include "ado/Aolevariant.hxx" -#include "connectivity/dbconversion.hxx" +#include #include #include #include @@ -26,10 +26,10 @@ #include "diagnose_ex.h" #include "resource/sharedresources.hxx" #include "resource/ado_res.hrc" -#include "com/sun/star/bridge/oleautomation/Date.hpp" -#include "com/sun/star/bridge/oleautomation/Currency.hpp" -#include "com/sun/star/bridge/oleautomation/SCode.hpp" -#include "com/sun/star/bridge/oleautomation/Decimal.hpp" +#include +#include +#include +#include using namespace com::sun::star::beans; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 7e5647b44430..fcb5b365ebed 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -19,7 +19,7 @@ #include #include -#include "connectivity/dbexception.hxx" +#include #include "ado/Awrapado.hxx" #include "ado/adoimp.hxx" #include diff --git a/connectivity/source/drivers/calc/CColumns.cxx b/connectivity/source/drivers/calc/CColumns.cxx index 9fb1ca6a9201..f5227b316864 100644 --- a/connectivity/source/drivers/calc/CColumns.cxx +++ b/connectivity/source/drivers/calc/CColumns.cxx @@ -19,7 +19,7 @@ #include "calc/CColumns.hxx" #include "calc/CTable.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include using namespace connectivity::calc; using namespace connectivity; diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 6a8e91243265..55ac71457dd1 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -20,10 +20,10 @@ #include "calc/CDriver.hxx" #include "calc/CConnection.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include "resource/sharedresources.hxx" #include "resource/calc_res.hrc" -#include "comphelper/processfactory.hxx" +#include using namespace connectivity::calc; using namespace connectivity::file; diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 87ee744f52f9..b70a209f8001 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -37,7 +37,7 @@ #include #include "calc/CConnection.hxx" #include "calc/CColumns.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index c3b19978ee27..dccd3fb9782c 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -19,7 +19,7 @@ #include "dbase/DColumns.hxx" #include "dbase/DTable.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index b3020417d5bb..00f334183cae 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -28,7 +28,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include #include "dbase/DIndex.hxx" -#include "connectivity/FValue.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index f045cd4a56de..0a5b3018d96d 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -20,9 +20,9 @@ #include "dbase/DDriver.hxx" #include "dbase/DConnection.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include "resource/dbase_res.hrc" -#include "comphelper/processfactory.hxx" +#include using namespace connectivity::dbase; using namespace connectivity::file; diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 05a8088e1652..0ce8ae423255 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -20,12 +20,12 @@ #include "dbase/DIndex.hxx" #include "dbase/DIndexColumns.hxx" #include -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include "dbase/DTable.hxx" #include "dbase/DIndexIter.hxx" #include -#include "connectivity/CommonTools.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index a39484a3df6d..eeccd0289693 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -19,7 +19,7 @@ #include "dbase/DIndexColumns.hxx" #include "dbase/DTable.hxx" -#include "connectivity/sdbcx/VIndexColumn.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index ad6b71a7b48b..937a3a1cb718 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -45,10 +45,10 @@ #include #include #include -#include "connectivity/PColumn.hxx" -#include "connectivity/dbtools.hxx" -#include "connectivity/FValue.hxx" -#include "connectivity/dbconversion.hxx" +#include +#include +#include +#include #include "resource/dbase_res.hrc" #include diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index c91a9b35fd2b..8ec47ad96758 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -30,7 +30,7 @@ #include "dbase/DCatalog.hxx" #include #include "resource/dbase_res.hrc" -#include "connectivity/dbexception.hxx" +#include using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/dbase/dindexnode.cxx b/connectivity/source/drivers/dbase/dindexnode.cxx index 8bc902c1886e..2d2d84b00a4e 100644 --- a/connectivity/source/drivers/dbase/dindexnode.cxx +++ b/connectivity/source/drivers/dbase/dindexnode.cxx @@ -18,7 +18,7 @@ */ #include "dbase/dindexnode.hxx" -#include "connectivity/CommonTools.hxx" +#include #include #include "dbase/DIndex.hxx" #include diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 468f4c0d2ca9..96b74154de7c 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index 89cec832487b..3aa25bd1ff2a 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -22,7 +22,7 @@ #include "NTable.hxx" #include "NTables.hxx" #include "NCatalog.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include using namespace connectivity::sdbcx; using namespace connectivity; diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index ff56c18f1d44..e3a6c496c1fe 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NCOLUMNS_HXX #include "NTable.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index 2f0b335b1b9b..6f5287305609 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -23,10 +23,10 @@ #include "NDriver.hxx" #include #include -#include "connectivity/OSubComponent.hxx" +#include #include -#include "connectivity/CommonTools.hxx" -#include "connectivity/warningscontainer.hxx" +#include +#include #include "TConnection.hxx" #include #include diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 8cc957e352d9..acb2955c014c 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -20,9 +20,9 @@ #include "NDriver.hxx" #include "NConnection.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include -#include "osl/security.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 029aa2d16c1c..ba71a4b236a7 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include #define EVOAB_EVOLUTION_SCHEMA "evolution" diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 6a3494ed9275..20b676ce7352 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -34,11 +34,11 @@ #include #include #include -#include "connectivity/CommonTools.hxx" -#include "connectivity/FValue.hxx" -#include "connectivity/warningscontainer.hxx" +#include +#include +#include #include "NStatement.hxx" -#include "connectivity/OSubComponent.hxx" +#include #include "NResultSetMetaData.hxx" namespace connectivity diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index f40cba6a3264..9a114fb75d82 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -19,7 +19,7 @@ #include "NResultSetMetaData.hxx" #include "NDatabaseMetaData.hxx" -#include "connectivity/dbexception.hxx" +#include #include #include "resource/evoab2_res.hrc" diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index e868419f77ea..27ad32e4fcc7 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -28,13 +28,13 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include #include -#include "connectivity/sqliterator.hxx" -#include "connectivity/sqlparse.hxx" +#include +#include #include -#include "connectivity/OSubComponent.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 7205fe588ced..c8109231940a 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NTABLE_HXX #include "NConnection.hxx" -#include "connectivity/sdbcx/VTable.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 26f424ef48dc..817b9e557f5b 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -27,8 +27,8 @@ #include "NCatalog.hxx" #include "NConnection.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "NTable.hxx" diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 2ee7c4cebe64..252d81657be3 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_EVOAB2_NTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 3f1bdbd62282..ac1a93fa7841 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -18,7 +18,7 @@ */ #include "file/FColumns.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index e3befff7e5d9..bd6d0a4db80d 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #include #include diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index b88dbfdcbb29..950a76c96764 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index 89bab271c50c..fb9b2c2e48ec 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -19,7 +19,7 @@ #include -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include "file/FPreparedStatement.hxx" #include @@ -27,10 +27,10 @@ #include #include #include -#include "connectivity/dbconversion.hxx" -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" -#include "connectivity/PColumn.hxx" +#include +#include +#include +#include #include "diagnose_ex.h" #include #include diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index 4f454e3fd6aa..832dddc2c959 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -21,7 +21,7 @@ #ifdef __GNUC__ #include #endif -#include "connectivity/sdbcx/VColumn.hxx" +#include #include "file/FResultSet.hxx" #include "file/FResultSetMetaData.hxx" #include @@ -32,8 +32,8 @@ #include #include #include -#include "connectivity/dbconversion.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include @@ -44,7 +44,7 @@ #include #include -#include "connectivity/dbexception.hxx" +#include #include #include "resource/file_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index e397867fe04e..919e23e911b0 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -20,7 +20,7 @@ #include "file/FResultSetMetaData.hxx" #include "file/FTable.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 031b81f4c7ae..fb3361a0e817 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -32,7 +32,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include "resource/file_res.hrc" #include #include diff --git a/connectivity/source/drivers/file/fanalyzer.cxx b/connectivity/source/drivers/file/fanalyzer.cxx index 6f3b65b03c17..3c01fabca4bc 100644 --- a/connectivity/source/drivers/file/fanalyzer.cxx +++ b/connectivity/source/drivers/file/fanalyzer.cxx @@ -18,12 +18,12 @@ */ #include "file/fanalyzer.hxx" -#include "connectivity/sqlparse.hxx" +#include #include #include #include -#include "connectivity/sqlnode.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include "file/FConnection.hxx" #include "resource/file_res.hrc" diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 2f6ced4655b2..65e826003bff 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -19,7 +19,7 @@ #include "file/fcode.hxx" #include -#include "connectivity/sqlparse.hxx" +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index e79b4a93af30..5ed3e0d92f47 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -20,14 +20,14 @@ #include "file/fcomp.hxx" #include #include "TConnection.hxx" -#include "connectivity/sqlparse.hxx" +#include #include "file/fanalyzer.hxx" #include #include #include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbconversion.hxx" +#include +#include #include #include "resource/file_res.hrc" #include "file/FStringFunctions.hxx" diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 4551d8d71188..95ecc54a5aa0 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -11,7 +11,7 @@ #include "Connection.hxx" #include "Util.hxx" -#include "connectivity/dbexception.hxx" +#include #include diff --git a/connectivity/source/drivers/flat/EColumns.cxx b/connectivity/source/drivers/flat/EColumns.cxx index f472c564b829..4102d52141f3 100644 --- a/connectivity/source/drivers/flat/EColumns.cxx +++ b/connectivity/source/drivers/flat/EColumns.cxx @@ -19,7 +19,7 @@ #include "flat/EColumns.hxx" #include "flat/ETable.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include using namespace connectivity::flat; using namespace connectivity; diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 31fbaea22f32..793d111e278f 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -20,11 +20,11 @@ #include "flat/EDriver.hxx" #include "flat/EConnection.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" -#include "comphelper/processfactory.hxx" +#include using namespace connectivity::flat; diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 7059cb2d18a8..90cbe945913d 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -41,7 +41,7 @@ #include #include #include -#include "connectivity/dbconversion.hxx" +#include #include "file/quotedstring.hxx" #include diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index f11de6f82ab4..b78c6c16efa7 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -22,7 +22,7 @@ #include "hsqldb/HDriver.hxx" #include "hsqldb/HConnection.hxx" #include -#include "connectivity/dbexception.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 4e7b9654a84d..2ff063cba27a 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -31,11 +31,11 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/TKeys.hxx" -#include "connectivity/TIndexes.hxx" -#include "connectivity/TColumnsHelper.hxx" +#include +#include +#include +#include +#include #include "hsqldb/HCatalog.hxx" #include "hsqldb/HColumns.hxx" #include "TConnection.hxx" diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index cd5c1816c7dc..6ee5c545b045 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -28,8 +28,8 @@ #include #include "hsqldb/HCatalog.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index df04d379cec9..98a615fedc8a 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -20,8 +20,8 @@ #include "hsqldb/HUser.hxx" #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 3bf553fe3520..5cec116c7a59 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -22,10 +22,10 @@ #include "hsqldb/HTable.hxx" #include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include "TConnection.hxx" using namespace ::comphelper; diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 6cf719ab401d..bd4fa1bdb81c 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -23,8 +23,8 @@ #include "propertyids.hxx" -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 1790e4c6d36b..13a538371467 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -29,8 +29,8 @@ #include #include "hsqldb/HCatalog.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index 5ca1c21aad2b..cfe2a60d5b31 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx @@ -31,7 +31,7 @@ #include "hsqldb/HStorageMap.hxx" #include "hsqldb/StorageNativeInputStream.h" -#include "jvmaccess/virtualmachine.hxx" +#include #include #include "accesslog.hxx" diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 7a6765f724b5..ce194628a738 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx @@ -21,11 +21,11 @@ #include #endif -#include "uno/mapping.hxx" -#include "uno/environment.hxx" -#include "cppuhelper/bootstrap.hxx" -#include "cppuhelper/compbase1.hxx" -#include "cppuhelper/component_context.hxx" +#include +#include +#include +#include +#include #include "accesslog.hxx" #include #include @@ -38,8 +38,8 @@ #include "hsqldb/HStorageAccess.hxx" #include "hsqldb/HStorageMap.hxx" -#include "jvmaccess/virtualmachine.hxx" -#include "com/sun/star/lang/XSingleComponentFactory.hpp" +#include +#include #include "diagnose_ex.h" using namespace ::com::sun::star::container; diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index d5c93d555bc0..d332d11ff43a 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -23,7 +23,7 @@ #include "java/sql/ResultSet.hxx" #include "java/tools.hxx" #include "java/lang/String.hxx" -#include "connectivity/CommonTools.hxx" +#include #include "FDatabaseMetaDataResultSet.hxx" #include #include "TPrivilegesResultSet.hxx" diff --git a/connectivity/source/drivers/jdbc/Date.cxx b/connectivity/source/drivers/jdbc/Date.cxx index 748597a7566f..c07b01e38d59 100644 --- a/connectivity/source/drivers/jdbc/Date.cxx +++ b/connectivity/source/drivers/jdbc/Date.cxx @@ -19,7 +19,7 @@ #include "java/util/Date.hxx" #include "java/tools.hxx" -#include "connectivity/dbconversion.hxx" +#include using namespace connectivity; //************ Class: java.util.Date diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index 4dc8c3d8563a..813486602fe5 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -17,9 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include -#include "boost/scoped_ptr.hpp" +#include #include "java/sql/Connection.hxx" #include "java/lang/Class.hxx" #include "java/tools.hxx" @@ -33,13 +33,13 @@ #include #include #include -#include "connectivity/sqlparse.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include "java/util/Property.hxx" #include "java/LocalRef.hxx" #include "resource/jdbc_log.hrc" -#include "com/sun/star/uno/XComponentContext.hpp" -#include "jvmaccess/classpath.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index b9ea306555a9..48335489aa0d 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -24,7 +24,7 @@ #include "java/sql/Connection.hxx" #include "java/util/Property.hxx" #include "java/tools.hxx" -#include "connectivity/dbexception.hxx" +#include #include #include "diagnose_ex.h" #include "resource/jdbc_log.hrc" diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index fe0fdd6655e6..7fe79967e23d 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -18,7 +18,7 @@ */ #include "java/lang/Class.hxx" -#include "connectivity/CommonTools.hxx" +#include #include #include "java/tools.hxx" #include "java/sql/SQLException.hxx" diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 2ebd437c2752..8a3c31190cd0 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -26,9 +26,9 @@ #include "java/tools.hxx" #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/FValue.hxx" -#include "connectivity/dbexception.hxx" +#include +#include +#include #include "resource/jdbc_log.hrc" #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 6d327c1db7ec..1f8b0cc4c9c3 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -33,14 +33,14 @@ #include "java/io/Reader.hxx" #include "java/tools.hxx" #include -#include "connectivity/CommonTools.hxx" +#include #include #include #include #include "TConnection.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" #include "java/LocalRef.hxx" diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 4fedd1e1bc1b..cc2c7e1d7399 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -20,7 +20,7 @@ #include "java/sql/Timestamp.hxx" #include "java/tools.hxx" #include -#include "connectivity/dbconversion.hxx" +#include using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index 9afa09c85dce..682f66a8cb35 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index 77c18ae9257b..f15b32f4e71d 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -22,7 +22,7 @@ #include "KTable.hxx" #include "KTables.hxx" #include "KCatalog.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include using namespace connectivity::kab; using namespace connectivity::sdbcx; diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 6e09b4b48093..1d9f62571e42 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCOLUMNS_HXX #include "KTable.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index cae5d3397a4b..848dce45ba6f 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -21,8 +21,8 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KCONNECTION_HXX #include -#include "connectivity/OSubComponent.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index b023eaa1136f..23ec9cd85806 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -21,7 +21,7 @@ #include "KDriver.hxx" #include "KDEInit.h" #include "KConnection.hxx" -#include "rtl/strbuf.hxx" +#include #include #include diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index b56c62720a2a..a1455fd80e9e 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -22,8 +22,8 @@ #include "KConnection.hxx" #include -#include "connectivity/sqliterator.hxx" -#include "connectivity/sqlparse.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 2d0c64d4b61e..74fbfec0793c 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLE_HXX #include "KConnection.hxx" -#include "connectivity/sdbcx/VTable.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 5dba33726a2a..7ea30ce52716 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 1e69494f2a8f..52fa34e60f76 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -20,7 +20,7 @@ #include "kcondition.hxx" #include "kfields.hxx" -#include "connectivity/CommonTools.hxx" +#include using namespace ::connectivity::kab; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 380c10bffee1..758c4572e061 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KORDER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_KAB_KORDER_HXX -#include "rtl/ustring.hxx" +#include #include #include diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index d1040f62609a..aa74c1f003ca 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.cxx @@ -28,7 +28,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include using namespace connectivity::macab; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index 4a7b1a1a11bb..c02251dfcad1 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 2556e2164438..22cd54c0cfa8 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -22,7 +22,7 @@ #include "MacabTable.hxx" #include "MacabTables.hxx" #include "MacabCatalog.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include using namespace connectivity::macab; using namespace connectivity::sdbcx; diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 3241cddc8a35..9b5ee6a75a51 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCOLUMNS_HXX #include "MacabTable.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index dc933a652dd3..8e5c165e2735 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -21,8 +21,8 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABCONNECTION_HXX #include -#include "connectivity/OSubComponent.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 5f1924c759ea..7b7ac3bdbd39 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -22,7 +22,7 @@ #include "MacabAddressBook.hxx" #include "propertyids.hxx" #include -#include "connectivity/dbtools.hxx" +#include #include "resource/macab_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 2ee61251b72d..fc3a1d1752af 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -23,8 +23,8 @@ #include "MacabConnection.hxx" #include "MacabHeader.hxx" #include -#include "connectivity/sqliterator.hxx" -#include "connectivity/sqlparse.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index 0bfe171ec4c4..a80d64e33ab9 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABTABLE_HXX #include "MacabConnection.hxx" -#include "connectivity/sdbcx/VTable.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 17320d72f79f..293141059ba9 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 186802670f8b..64e9abb56f74 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -21,7 +21,7 @@ #include "macabcondition.hxx" #include "MacabHeader.hxx" #include "MacabRecord.hxx" -#include "connectivity/CommonTools.hxx" +#include using namespace ::connectivity::macab; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/drivers/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index 1a9c202ecb40..f00a45514514 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABORDER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MACAB_MACABORDER_HXX -#include "rtl/ustring.hxx" +#include #include "MacabHeader.hxx" #include "MacabRecord.hxx" diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index bfc7d18ca2cf..30947278b8da 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index ba872cb3d5a9..156709f03a72 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -18,7 +18,7 @@ */ #include "MColumns.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include #include @@ -27,7 +27,7 @@ #include "MTables.hxx" #include "MCatalog.hxx" #include -#include "connectivity/dbtools.hxx" +#include using namespace ::comphelper; diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index d0839d0be4bc..ca708cb4e237 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCOLUMNS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include "MTable.hxx" namespace connectivity diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index a7d9c8528c74..bf9146ef3696 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -10,9 +10,9 @@ #ifndef CONNECTIVITY_SCONNECTION_HXX #define CONNECTIVITY_SCONNECTION_HXX -#include "connectivity/CommonTools.hxx" +#include -#include "connectivity/OSubComponent.hxx" +#include #include "TConnection.hxx" #include "MColumnAlias.hxx" diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 55f8a67f4be8..e472236a45c5 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -21,7 +21,7 @@ #include "MDatabaseMetaDataHelper.hxx" #include "MorkParser.hxx" -#include "connectivity/dbtools.hxx" +#include using namespace dbtools; using namespace connectivity::mork; diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index fd3a52930772..f9b693010b8b 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -10,8 +10,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATA_HXX -#include "connectivity/CommonTools.hxx" -#include "connectivity/OSubComponent.hxx" +#include +#include #include "MConnection.hxx" #include "MDatabaseMetaDataHelper.hxx" diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 2080909c4b0e..dce1375d12bb 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -15,7 +15,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include "MErrorResource.hxx" -#include +#include "MConnection.hxx" #include diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index 959ac402affd..9aa9e1b2a4ab 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -10,26 +10,26 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDRIVER_HXX -#include "sal/config.h" +#include #include -#include "boost/noncopyable.hpp" -#include "com/sun/star/beans/PropertyValue.hpp" -#include "com/sun/star/lang/XServiceInfo.hpp" -#include "com/sun/star/sdbc/DriverPropertyInfo.hpp" -#include "com/sun/star/sdbc/SQLException.hpp" -#include "com/sun/star/sdbc/XConnection.hpp" -#include "com/sun/star/sdbc/XDriver.hpp" -#include "com/sun/star/uno/Reference.hxx" -#include "com/sun/star/uno/RuntimeException.hpp" -#include "com/sun/star/uno/Sequence.hxx" -#include "com/sun/star/uno/XComponentContext.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include "cppuhelper/implbase2.hxx" -#include "cppuhelper/weak.hxx" -#include "rtl/ustring.hxx" -#include "sal/types.h" +#include +#include +#include +#include #define MORK_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MorkDriver" diff --git a/connectivity/source/drivers/mork/MNSFolders.cxx b/connectivity/source/drivers/mork/MNSFolders.cxx index 5237a9304f23..ac22f7e0d1d3 100644 --- a/connectivity/source/drivers/mork/MNSFolders.cxx +++ b/connectivity/source/drivers/mork/MNSFolders.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "MNSFolders.hxx" #ifdef UNIX #include diff --git a/connectivity/source/drivers/mork/MNSINIParser.cxx b/connectivity/source/drivers/mork/MNSINIParser.cxx index 641fbbd4061d..b33baa1e82df 100644 --- a/connectivity/source/drivers/mork/MNSINIParser.cxx +++ b/connectivity/source/drivers/mork/MNSINIParser.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "MNSINIParser.hxx" #include IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) diff --git a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx index 87c064cbce99..80090c37f616 100644 --- a/connectivity/source/drivers/mork/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mork/MNSProfileDiscover.cxx @@ -20,8 +20,8 @@ #include "MNSProfileDiscover.hxx" -#include -#include +#include "MNSFolders.hxx" +#include "MNSINIParser.hxx" namespace connectivity { diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 02aa4bfea4ad..742a13bbb3a8 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -9,15 +9,15 @@ #include #include -#include "connectivity/sdbcx/VColumn.hxx" +#include #include "MPreparedStatement.hxx" #include #include "MResultSetMetaData.hxx" #include #include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include "diagnose_ex.h" diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 1126ef7d73e1..36874a3ea18d 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -34,9 +34,9 @@ #include #include "MStatement.hxx" #include "MQueryHelper.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/FValue.hxx" -#include "connectivity/sqliterator.hxx" +#include +#include +#include #include "TSortIndex.hxx" namespace connectivity diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index f323d8d93adf..267465818098 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/mork/MServices.cxx b/connectivity/source/drivers/mork/MServices.cxx index 07395e63f54c..ae8b4568d368 100644 --- a/connectivity/source/drivers/mork/MServices.cxx +++ b/connectivity/source/drivers/mork/MServices.cxx @@ -7,11 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" +#include -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implementationentry.hxx" -#include "sal/types.h" +#include +#include +#include #include "MDriver.hxx" diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 114d1d3a1899..c1b35cdbddfb 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -27,12 +27,12 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include #include #include -#include "connectivity/sqliterator.hxx" -#include "connectivity/sqlparse.hxx" +#include +#include #include #include "TSortIndex.hxx" #include "MConnection.hxx" diff --git a/connectivity/source/drivers/mork/MTable.cxx b/connectivity/source/drivers/mork/MTable.cxx index 3fc79897e418..f76f11405a3f 100644 --- a/connectivity/source/drivers/mork/MTable.cxx +++ b/connectivity/source/drivers/mork/MTable.cxx @@ -30,9 +30,9 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/TKeys.hxx" -#include "connectivity/TIndexes.hxx" +#include +#include +#include #include "MCatalog.hxx" diff --git a/connectivity/source/drivers/mork/MTable.hxx b/connectivity/source/drivers/mork/MTable.hxx index 9d2623fe87fa..39090517ecc4 100644 --- a/connectivity/source/drivers/mork/MTable.hxx +++ b/connectivity/source/drivers/mork/MTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLE_HXX -#include "connectivity/TTableHelper.hxx" +#include #include #include "MConnection.hxx" diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 19a3f1e25260..2024e5af52ae 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -27,8 +27,8 @@ #include "MCatalog.hxx" #include "MConnection.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index 126523f7b313..dfdb02e6b763 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/drivers/mork/dllapi.h b/connectivity/source/drivers/mork/dllapi.h index b42eb606f9c3..adf269107d22 100644 --- a/connectivity/source/drivers/mork/dllapi.h +++ b/connectivity/source/drivers/mork/dllapi.h @@ -11,8 +11,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_DLLAPI_H #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_DLLAPI_H -#include "sal/config.h" -#include "sal/types.h" +#include +#include #if defined LO_DLLIMPLEMENTATION_MORK #define LO_DLLPUBLIC_MORK SAL_DLLPUBLIC_EXPORT diff --git a/connectivity/source/drivers/mork/services.cxx b/connectivity/source/drivers/mork/services.cxx index 150b21d63a8c..f70e6acf111b 100644 --- a/connectivity/source/drivers/mork/services.cxx +++ b/connectivity/source/drivers/mork/services.cxx @@ -7,11 +7,11 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include "sal/config.h" +#include -#include "cppuhelper/factory.hxx" -#include "cppuhelper/implementationentry.hxx" -#include "sal/types.h" +#include +#include +#include #include "MorkDriver.hxx" diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx index 0612857e448e..6ebfcb67f573 100644 --- a/connectivity/source/drivers/mozab/MCatalog.hxx +++ b/connectivity/source/drivers/mozab/MCatalog.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include namespace connectivity { diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index 452a34bece0a..a59b9ca1fcf9 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -18,7 +18,7 @@ */ #include "MColumns.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include #include @@ -27,7 +27,7 @@ #include "MTables.hxx" #include "MCatalog.hxx" #include -#include "connectivity/dbtools.hxx" +#include using namespace ::comphelper; diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx index 0b416ade3e40..af685ee912b2 100644 --- a/connectivity/source/drivers/mozab/MColumns.hxx +++ b/connectivity/source/drivers/mozab/MColumns.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MCOLUMNS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include "MTable.hxx" namespace connectivity diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 1f765df09566..a4d552fe02c3 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -18,8 +18,8 @@ */ -#include "com/sun/star/configuration/theDefaultProvider.hpp" -#include "comphelper/processfactory.hxx" +#include +#include #include "MConfigAccess.hxx" #include "MExtConfigAccess.hxx" diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index f50468db18b9..1a95d52916ed 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -19,11 +19,11 @@ #ifndef CONNECTIVITY_SCONNECTION_HXX #define CONNECTIVITY_SCONNECTION_HXX -#include "connectivity/CommonTools.hxx" +#include #include "MCatalog.hxx" #include "MColumnAlias.hxx" -#include "connectivity/OSubComponent.hxx" +#include #include "TConnection.hxx" #include diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 38c5d3eee4eb..c17fd3d13077 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -20,7 +20,7 @@ #include #include "MDriver.hxx" #include "MConnection.hxx" -#include "connectivity/dbexception.hxx" +#include #include #include "resource/mozab_res.hrc" #include "resource/common_res.hrc" diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index 75899a3e163b..d161a69a4cf5 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -22,7 +22,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index e8ace7cf11ce..e206c4a8b519 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -19,15 +19,15 @@ #include #include -#include "connectivity/sdbcx/VColumn.hxx" +#include #include "MPreparedStatement.hxx" #include #include "MResultSetMetaData.hxx" #include #include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include "diagnose_ex.h" diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index bc12d2695c13..46898f254bc4 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -33,9 +33,9 @@ #include #include #include "MStatement.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/FValue.hxx" -#include "connectivity/sqliterator.hxx" +#include +#include +#include #include "TSortIndex.hxx" #include "mozillasrc/MQuery.hxx" diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index d43eda83a0c8..cc2f2539f77b 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index a89a0588e6e2..e459a8f1f68e 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -27,12 +27,12 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include #include #include -#include "connectivity/sqliterator.hxx" -#include "connectivity/sqlparse.hxx" +#include +#include #include #include "TSortIndex.hxx" #include "MConnection.hxx" diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index e0939535352d..52052a4b65d6 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -30,9 +30,9 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/TKeys.hxx" -#include "connectivity/TIndexes.hxx" +#include +#include +#include #include "MCatalog.hxx" diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index 6f4332eb88a7..94f0c54b0dfb 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MTABLE_HXX -#include "connectivity/TTableHelper.hxx" +#include #include #include "MConnection.hxx" diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 7a3ee5b9451a..3cc06c694692 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -27,8 +27,8 @@ #include "MCatalog.hxx" #include "MConnection.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index 0817f2162dba..5193b98fed08 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index c73159fc85d6..6d7a652438b6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -24,13 +24,13 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::mozilla; using namespace connectivity::mozab; -#include +#include "MNSFolders.hxx" #include "MNSProfileDiscover.hxx" #ifndef MINIMAL_PROFILEDISCOVER # include "MNSProfileManager.hxx" # include "MNSRunnable.hxx" #endif -#include +#include "MNSInit.hxx" static MozillaBootstrap *pMozillaBootstrap=NULL; static Reference xMozillaBootstrap; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 5237a9304f23..ac22f7e0d1d3 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "MNSFolders.hxx" #ifdef UNIX #include diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 358cb930843c..9b36e68f2fd0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "MNSINIParser.hxx" #include IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOException ) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index b151d81dc214..6660a5c9b690 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -78,8 +78,8 @@ static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID); #endif -#include -#include +#include "MNSFolders.hxx" +#include "MNSINIParser.hxx" namespace connectivity { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx index 45999d06a4f0..1e5e0c4cf00a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx @@ -24,8 +24,8 @@ #ifndef MAXPATHLEN #define MAXPATHLEN 1024 #endif -#include -#include +#include "MNSFolders.hxx" +#include "MNSINIParser.hxx" static ::sal_Int32 nInitCounter=0; namespace connectivity diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h index f8fea6b4368e..ff0310422b9d 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h @@ -62,7 +62,7 @@ #endif #include "nsIPlatformCharset.h" -#include +#include "MNSInit.hxx" #include "post_include_mozilla.h" diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 04b25a247ad6..f0b6f17b6c56 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -36,9 +36,9 @@ #include "post_include_mozilla.h" #include "bootstrap/MNSInit.hxx" -#include +#include "MNameMapper.hxx" #include "MNSMozabProxy.hxx" -#include +#include "MNSDeclares.hxx" static ::osl::Mutex m_aMetaMutex; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index f7b1d9f1253f..7e66763b2a38 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MLDAPATTRIBUTEMAP_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_MOZILLASRC_MLDAPATTRIBUTEMAP_HXX -#include +#include "MNSInclude.hxx" #include diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 9cd96b40acdc..eef642b89a89 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -37,10 +37,10 @@ #include "nsILDAPConnection.h" #include "nsILDAPOperation.h" #include "post_include_mozilla.h" -#include +#include "MQueryHelper.hxx" #include #include -#include "com/sun/star/mozilla/XProxyRunner.hpp" +#include using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 4e8c0241621c..97c2882e64a5 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -22,10 +22,10 @@ #include "MNSDeclares.hxx" #include -#include +#include "MNSInclude.hxx" #include #include -#include "com/sun/star/mozilla/XProxyRunner.hpp" +#include namespace connectivity { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index d13e73552803..5b17676a1f95 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include +#include "MNameMapper.hxx" #if OSL_DEBUG_LEVEL > 0 # define OUtoCStr( x ) ( OUStringToOString ( (x), RTL_TEXTENCODING_ASCII_US).getStr()) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx index 43df1a7afcf5..821579e596b1 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx @@ -23,7 +23,7 @@ #include // Mozilla includes -#include +#include "MNSInclude.hxx" // Star Includes #include diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 2af3e55fb89a..4fc486c9c038 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -18,8 +18,8 @@ */ -#include -#include +#include "MQueryHelper.hxx" +#include "MNameMapper.hxx" #include #include #include "MQuery.hxx" diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 47f8032d2542..cd725df1bd10 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -24,7 +24,7 @@ #include -#include +#include "MNSInclude.hxx" #include "MErrorResource.hxx" #include #include diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 5272a6b61cab..937b928a97d0 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -18,7 +18,7 @@ */ -#include +#include "MNSInclude.hxx" #include "MTypeConverter.hxx" #include diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index 17b4b02c82ff..2168ce02b82e 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "sal/config.h" +#include #ifndef MINIMAL_PROFILEDISCOVER // Turn off DEBUG Assertions diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 5e854c6c5fec..c76ade75e6ab 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -23,7 +23,7 @@ #include #include #include -#include "connectivity/dbexception.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 942be52625ae..37a3ce40ee5c 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -31,11 +31,11 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/TKeys.hxx" -#include "connectivity/TIndexes.hxx" -#include "connectivity/TColumnsHelper.hxx" +#include +#include +#include +#include +#include #include "mysql/YCatalog.hxx" #include "mysql/YColumns.hxx" #include "TConnection.hxx" diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index d346b38033a9..e1773333c623 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -28,8 +28,8 @@ #include #include "mysql/YCatalog.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index f67cbaf1a26b..2a54977a2824 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -20,8 +20,8 @@ #include "mysql/YUser.hxx" #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index b4342d3ee5af..ee39cb1a39a8 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -22,10 +22,10 @@ #include "mysql/YTable.hxx" #include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include -#include "connectivity/dbexception.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include "TConnection.hxx" using namespace ::comphelper; diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 0d7430400b29..a7ec2cac6310 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -27,10 +27,10 @@ #include #include "mysql/YCatalog.hxx" #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include -#include "connectivity/sdbcx/VView.hxx" +#include #include #include "TConnection.hxx" diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index b6ead37a90e1..1b9582623059 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -21,7 +21,7 @@ #include "odbc/OConnection.hxx" #include "odbc/OFunctions.hxx" #include "odbc/OTools.hxx" -#include "connectivity/dbexception.hxx" +#include #include #include "resource/common_res.hrc" #include "resource/sharedresources.hxx" diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 70bfc7723bdf..67dfaeef65ed 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -33,11 +33,11 @@ #include #include #include -#include "connectivity/dbtools.hxx" +#include #include -#include "connectivity/FValue.hxx" +#include #include "resource/common_res.hrc" -#include "connectivity/sqlparse.hxx" +#include #include #include #include diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index 5b3b9efbed48..01ff93f8c456 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_ODBC_OREALDRIVER_HXX -#include "sal/config.h" +#include -#include "com/sun/star/uno/Exception.hpp" -#include "com/sun/star/uno/Reference.hxx" +#include +#include namespace com { namespace sun { namespace star { namespace lang { class XMultiServiceFactory; } diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index f5a79b0d283f..fd70b4a7b0e4 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -33,8 +33,8 @@ #include #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbexception.hxx" +#include +#include #include "diagnose_ex.h" #include diff --git a/connectivity/source/drivers/odbc/OStatement.cxx b/connectivity/source/drivers/odbc/OStatement.cxx index c9391e84ecfb..bb143549bee0 100644 --- a/connectivity/source/drivers/odbc/OStatement.cxx +++ b/connectivity/source/drivers/odbc/OStatement.cxx @@ -38,7 +38,7 @@ #include "diagnose_ex.h" #include #include "resource/common_res.hrc" -#include "connectivity/dbexception.hxx" +#include using namespace ::comphelper; diff --git a/connectivity/source/drivers/postgresql/pq_tools.hxx b/connectivity/source/drivers/postgresql/pq_tools.hxx index aa392f75865b..4f34c2a52806 100644 --- a/connectivity/source/drivers/postgresql/pq_tools.hxx +++ b/connectivity/source/drivers/postgresql/pq_tools.hxx @@ -46,7 +46,7 @@ #include #include -#include +#include "pq_connection.hxx" namespace pq_sdbc_driver { bool isWhitespace( sal_Unicode c ); diff --git a/connectivity/source/inc/AutoRetrievingBase.hxx b/connectivity/source/inc/AutoRetrievingBase.hxx index 8c5fe2be2c20..c1e243135e95 100644 --- a/connectivity/source/inc/AutoRetrievingBase.hxx +++ b/connectivity/source/inc/AutoRetrievingBase.hxx @@ -20,7 +20,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_AUTORETRIEVINGBASE_HXX #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx index 83031a0a905c..1aafe39de5ee 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSet.hxx @@ -37,10 +37,10 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include -#include "connectivity/FValue.hxx" -#include "connectivity/dbtoolsdllapi.hxx" +#include +#include #include #include diff --git a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx index 84837223e601..5ecd3fd22f82 100644 --- a/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx +++ b/connectivity/source/inc/FDatabaseMetaDataResultSetMetaData.hxx @@ -25,8 +25,8 @@ #include #include "FDatabaseMetaDataResultSet.hxx" #include "OColumn.hxx" -#include "connectivity/StdTypeDefs.hxx" -#include "connectivity/dbtoolsdllapi.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/OColumn.hxx b/connectivity/source/inc/OColumn.hxx index 63c5bfd2e2bc..cefddcd0540e 100644 --- a/connectivity/source/inc/OColumn.hxx +++ b/connectivity/source/inc/OColumn.hxx @@ -22,7 +22,7 @@ #include #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/OTypeInfo.hxx b/connectivity/source/inc/OTypeInfo.hxx index fba771e4e429..ac19ad963c2e 100644 --- a/connectivity/source/inc/OTypeInfo.hxx +++ b/connectivity/source/inc/OTypeInfo.hxx @@ -22,7 +22,7 @@ #include #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/RowFunctionParser.hxx b/connectivity/source/inc/RowFunctionParser.hxx index 4ca5d364561d..bdc0cba15e03 100644 --- a/connectivity/source/inc/RowFunctionParser.hxx +++ b/connectivity/source/inc/RowFunctionParser.hxx @@ -24,7 +24,7 @@ #include #include "FDatabaseMetaDataResultSet.hxx" #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity diff --git a/connectivity/source/inc/TConnection.hxx b/connectivity/source/inc/TConnection.hxx index e6c7e1f19077..58c1f17a84ab 100644 --- a/connectivity/source/inc/TConnection.hxx +++ b/connectivity/source/inc/TConnection.hxx @@ -27,8 +27,8 @@ #include #include #include "propertyids.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/dbtoolsdllapi.hxx" +#include +#include #include "resource/sharedresources.hxx" namespace connectivity diff --git a/connectivity/source/inc/TDatabaseMetaDataBase.hxx b/connectivity/source/inc/TDatabaseMetaDataBase.hxx index 290140efd406..c05cc3076a12 100644 --- a/connectivity/source/inc/TDatabaseMetaDataBase.hxx +++ b/connectivity/source/inc/TDatabaseMetaDataBase.hxx @@ -26,7 +26,7 @@ #include #include "FDatabaseMetaDataResultSet.hxx" #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index e46ba6a29b90..4fb32932f5a6 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_TKEYVALUE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_TKEYVALUE_HXX -#include "connectivity/FValue.hxx" -#include "connectivity/dbtoolsdllapi.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/TPrivilegesResultSet.hxx b/connectivity/source/inc/TPrivilegesResultSet.hxx index 628031badf5d..2737d0d50139 100644 --- a/connectivity/source/inc/TPrivilegesResultSet.hxx +++ b/connectivity/source/inc/TPrivilegesResultSet.hxx @@ -21,7 +21,7 @@ #include "FDatabaseMetaDataResultSet.hxx" #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/TResultSetHelper.hxx b/connectivity/source/inc/TResultSetHelper.hxx index 9f1f1a0f6676..542c441e2480 100644 --- a/connectivity/source/inc/TResultSetHelper.hxx +++ b/connectivity/source/inc/TResultSetHelper.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_TRESULTSETHELPER_HXX #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/TSkipDeletedSet.hxx b/connectivity/source/inc/TSkipDeletedSet.hxx index 4bc6e10564d7..3c79fb5034c5 100644 --- a/connectivity/source/inc/TSkipDeletedSet.hxx +++ b/connectivity/source/inc/TSkipDeletedSet.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/TSortIndex.hxx b/connectivity/source/inc/TSortIndex.hxx index 3f699bd8f1f0..6caf0272ef1b 100644 --- a/connectivity/source/inc/TSortIndex.hxx +++ b/connectivity/source/inc/TSortIndex.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_TSORTINDEX_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_TSORTINDEX_HXX -#include "connectivity/dbtoolsdllapi.hxx" +#include #include "TKeyValue.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/ACatalog.hxx b/connectivity/source/inc/ado/ACatalog.hxx index fd683b1cf726..313467cd95fc 100644 --- a/connectivity/source/inc/ado/ACatalog.hxx +++ b/connectivity/source/inc/ado/ACatalog.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AColumn.hxx b/connectivity/source/inc/ado/AColumn.hxx index 82e41a46d31c..a7471a585925 100644 --- a/connectivity/source/inc/ado/AColumn.hxx +++ b/connectivity/source/inc/ado/AColumn.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMN_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMN_HXX -#include "connectivity/sdbcx/VColumn.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AColumns.hxx b/connectivity/source/inc/ado/AColumns.hxx index 849f2008de67..1e16cafef7e0 100644 --- a/connectivity/source/inc/ado/AColumns.hxx +++ b/connectivity/source/inc/ado/AColumns.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ACOLUMNS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AConnection.hxx b/connectivity/source/inc/ado/AConnection.hxx index 1def006225f6..1b1adff81227 100644 --- a/connectivity/source/inc/ado/AConnection.hxx +++ b/connectivity/source/inc/ado/AConnection.hxx @@ -22,9 +22,9 @@ #include #include #include -#include "connectivity/OSubComponent.hxx" +#include #include -#include "connectivity/CommonTools.hxx" +#include #include "OTypeInfo.hxx" #include "TConnection.hxx" #include "ado/Awrapado.hxx" diff --git a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx index 6f5f622cfc17..59adc3365df3 100644 --- a/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/ado/ADatabaseMetaDataResultSet.hxx @@ -33,7 +33,7 @@ #include #include "ado/AStatement.hxx" #include -#include "connectivity/StdTypeDefs.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/ado/ADriver.hxx b/connectivity/source/inc/ado/ADriver.hxx index 1607cdac22a8..72ddec4e977a 100644 --- a/connectivity/source/inc/ado/ADriver.hxx +++ b/connectivity/source/inc/ado/ADriver.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/ado/AGroup.hxx b/connectivity/source/inc/ado/AGroup.hxx index 7e41920ce1f8..5aca399d2845 100644 --- a/connectivity/source/inc/ado/AGroup.hxx +++ b/connectivity/source/inc/ado/AGroup.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUP_HXX -#include "connectivity/sdbcx/VGroup.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AGroups.hxx b/connectivity/source/inc/ado/AGroups.hxx index 9c2cd7875033..3be4c8e7c3f6 100644 --- a/connectivity/source/inc/ado/AGroups.hxx +++ b/connectivity/source/inc/ado/AGroups.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUPS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AGROUPS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "ado/Awrapadox.hxx" #include "ado/ACatalog.hxx" diff --git a/connectivity/source/inc/ado/AIndex.hxx b/connectivity/source/inc/ado/AIndex.hxx index e912cc5126ed..e7c859a5b0e8 100644 --- a/connectivity/source/inc/ado/AIndex.hxx +++ b/connectivity/source/inc/ado/AIndex.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEX_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEX_HXX -#include "connectivity/sdbcx/VIndex.hxx" +#include #include #include "ado/Awrapadox.hxx" diff --git a/connectivity/source/inc/ado/AIndexes.hxx b/connectivity/source/inc/ado/AIndexes.hxx index 721dc3f1d39b..64027ebdaa97 100644 --- a/connectivity/source/inc/ado/AIndexes.hxx +++ b/connectivity/source/inc/ado/AIndexes.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEXES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AINDEXES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include #include "ado/Awrapadox.hxx" diff --git a/connectivity/source/inc/ado/AKey.hxx b/connectivity/source/inc/ado/AKey.hxx index 3f1f62c9e0b3..73eb909e2ff6 100644 --- a/connectivity/source/inc/ado/AKey.hxx +++ b/connectivity/source/inc/ado/AKey.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEY_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEY_HXX -#include "connectivity/sdbcx/VKey.hxx" +#include #include #include "ado/Awrapadox.hxx" diff --git a/connectivity/source/inc/ado/AKeys.hxx b/connectivity/source/inc/ado/AKeys.hxx index 72f109aa4184..c919f27380eb 100644 --- a/connectivity/source/inc/ado/AKeys.hxx +++ b/connectivity/source/inc/ado/AKeys.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEYS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AKEYS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/ATable.hxx b/connectivity/source/inc/ado/ATable.hxx index f461b065e1a4..02327a0f10c7 100644 --- a/connectivity/source/inc/ado/ATable.hxx +++ b/connectivity/source/inc/ado/ATable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLE_HXX -#include "connectivity/sdbcx/VTable.hxx" +#include #include "ado/Awrapadox.hxx" #include "ado/ACatalog.hxx" diff --git a/connectivity/source/inc/ado/ATables.hxx b/connectivity/source/inc/ado/ATables.hxx index ba1d37152eca..b88300c063b9 100644 --- a/connectivity/source/inc/ado/ATables.hxx +++ b/connectivity/source/inc/ado/ATables.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_ATABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "ado/Awrapadox.hxx" #include "ado/ACatalog.hxx" diff --git a/connectivity/source/inc/ado/AUser.hxx b/connectivity/source/inc/ado/AUser.hxx index 9ffd87788bfd..d7d3a0147c2c 100644 --- a/connectivity/source/inc/ado/AUser.hxx +++ b/connectivity/source/inc/ado/AUser.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSER_HXX -#include "connectivity/sdbcx/VUser.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AUsers.hxx b/connectivity/source/inc/ado/AUsers.hxx index 975bdc672028..9baba1bf85e4 100644 --- a/connectivity/source/inc/ado/AUsers.hxx +++ b/connectivity/source/inc/ado/AUsers.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSERS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AUSERS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "ado/Awrapadox.hxx" #include "ado/ACatalog.hxx" diff --git a/connectivity/source/inc/ado/AView.hxx b/connectivity/source/inc/ado/AView.hxx index 0927d536bad0..9d890fbb8280 100644 --- a/connectivity/source/inc/ado/AView.hxx +++ b/connectivity/source/inc/ado/AView.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEW_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEW_HXX -#include "connectivity/sdbcx/VView.hxx" +#include #include "ado/Awrapadox.hxx" namespace connectivity diff --git a/connectivity/source/inc/ado/AViews.hxx b/connectivity/source/inc/ado/AViews.hxx index 94c8ac6fbc9c..f81da54795b8 100644 --- a/connectivity/source/inc/ado/AViews.hxx +++ b/connectivity/source/inc/ado/AViews.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEWS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ADO_AVIEWS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "ado/Awrapadox.hxx" #include "ado/ACatalog.hxx" diff --git a/connectivity/source/inc/ado/Aolewrap.hxx b/connectivity/source/inc/ado/Aolewrap.hxx index bc31494c05cc..fba73837c02d 100644 --- a/connectivity/source/inc/ado/Aolewrap.hxx +++ b/connectivity/source/inc/ado/Aolewrap.hxx @@ -23,7 +23,7 @@ #include #include #include -#include "connectivity/StdTypeDefs.hxx" +#include namespace rtl { diff --git a/connectivity/source/inc/dbase/DDriver.hxx b/connectivity/source/inc/dbase/DDriver.hxx index b6d45000ffc4..05a372888cb5 100644 --- a/connectivity/source/inc/dbase/DDriver.hxx +++ b/connectivity/source/inc/dbase/DDriver.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DDRIVER_HXX #include -#include "connectivity/CommonTools.hxx" +#include #include "file/FDriver.hxx" namespace connectivity diff --git a/connectivity/source/inc/dbase/DIndex.hxx b/connectivity/source/inc/dbase/DIndex.hxx index e672390bf6e2..b20d51afa7ec 100644 --- a/connectivity/source/inc/dbase/DIndex.hxx +++ b/connectivity/source/inc/dbase/DIndex.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEX_HXX -#include "connectivity/sdbcx/VIndex.hxx" +#include #include #include "dbase/DTable.hxx" #include "dbase/dindexnode.hxx" diff --git a/connectivity/source/inc/dbase/DIndexColumns.hxx b/connectivity/source/inc/dbase/DIndexColumns.hxx index 95c9b2075619..1dce848994ed 100644 --- a/connectivity/source/inc/dbase/DIndexColumns.hxx +++ b/connectivity/source/inc/dbase/DIndexColumns.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXCOLUMNS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "dbase/DIndex.hxx" #include "dbase/DTable.hxx" diff --git a/connectivity/source/inc/dbase/DIndexes.hxx b/connectivity/source/inc/dbase/DIndexes.hxx index a431185bb1e5..9d2ad4e27f3d 100644 --- a/connectivity/source/inc/dbase/DIndexes.hxx +++ b/connectivity/source/inc/dbase/DIndexes.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DINDEXES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "dbase/DTable.hxx" namespace connectivity diff --git a/connectivity/source/inc/dbase/DTable.hxx b/connectivity/source/inc/dbase/DTable.hxx index 580f0ffcce3e..4f2635e2a82c 100644 --- a/connectivity/source/inc/dbase/DTable.hxx +++ b/connectivity/source/inc/dbase/DTable.hxx @@ -21,8 +21,8 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_DBASE_DTABLE_HXX #include "file/FTable.hxx" -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include diff --git a/connectivity/source/inc/dbase/dindexnode.hxx b/connectivity/source/inc/dbase/dindexnode.hxx index 839fdc8e5b74..c59da5d299ed 100644 --- a/connectivity/source/inc/dbase/dindexnode.hxx +++ b/connectivity/source/inc/dbase/dindexnode.hxx @@ -21,7 +21,7 @@ #include "file/fcode.hxx" #include "file/FTable.hxx" -#include "connectivity/FValue.hxx" +#include #include #include #include diff --git a/connectivity/source/inc/file/FCatalog.hxx b/connectivity/source/inc/file/FCatalog.hxx index 6c6e717ae0ab..5cf87e78fe5f 100644 --- a/connectivity/source/inc/file/FCatalog.hxx +++ b/connectivity/source/inc/file/FCatalog.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" +#include #include "file/filedllapi.hxx" diff --git a/connectivity/source/inc/file/FColumns.hxx b/connectivity/source/inc/file/FColumns.hxx index ad2e5575b382..7f94124e61ca 100644 --- a/connectivity/source/inc/file/FColumns.hxx +++ b/connectivity/source/inc/file/FColumns.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCOLUMNS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include -#include "connectivity/sdbcx/IRefreshable.hxx" +#include #include "file/FTable.hxx" #include "file/filedllapi.hxx" diff --git a/connectivity/source/inc/file/FConnection.hxx b/connectivity/source/inc/file/FConnection.hxx index cbd73b38dc5b..43d430d012af 100644 --- a/connectivity/source/inc/file/FConnection.hxx +++ b/connectivity/source/inc/file/FConnection.hxx @@ -22,15 +22,15 @@ #include #include #include -#include "connectivity/OSubComponent.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include "OTypeInfo.hxx" #include #include #include #include -#include "connectivity/sqlparse.hxx" -#include "connectivity/sqliterator.hxx" +#include +#include #include "TConnection.hxx" #include "file/filedllapi.hxx" #include diff --git a/connectivity/source/inc/file/FDriver.hxx b/connectivity/source/inc/file/FDriver.hxx index bb22b9588195..1f0e466ec741 100644 --- a/connectivity/source/inc/file/FDriver.hxx +++ b/connectivity/source/inc/file/FDriver.hxx @@ -24,7 +24,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include "file/filedllapi.hxx" namespace connectivity diff --git a/connectivity/source/inc/file/FResultSet.hxx b/connectivity/source/inc/file/FResultSet.hxx index 74b046dae24c..6fcf9fc94037 100644 --- a/connectivity/source/inc/file/FResultSet.hxx +++ b/connectivity/source/inc/file/FResultSet.hxx @@ -32,13 +32,13 @@ #include #include #include "file/FStatement.hxx" -#include "connectivity/CommonTools.hxx" +#include #include #include "file/fanalyzer.hxx" #include "file/FTable.hxx" #include "file/filedllapi.hxx" #include -#include "connectivity/StdTypeDefs.hxx" +#include #include "TSortIndex.hxx" #include "TSkipDeletedSet.hxx" #include diff --git a/connectivity/source/inc/file/FResultSetMetaData.hxx b/connectivity/source/inc/file/FResultSetMetaData.hxx index 6f18b285ac3a..3d62d944812b 100644 --- a/connectivity/source/inc/file/FResultSetMetaData.hxx +++ b/connectivity/source/inc/file/FResultSetMetaData.hxx @@ -22,7 +22,7 @@ #include #include -#include "connectivity/CommonTools.hxx" +#include #include #include "file/filedllapi.hxx" diff --git a/connectivity/source/inc/file/FStatement.hxx b/connectivity/source/inc/file/FStatement.hxx index 1abb479b236c..3fb60bb74738 100644 --- a/connectivity/source/inc/file/FStatement.hxx +++ b/connectivity/source/inc/file/FStatement.hxx @@ -31,7 +31,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include "file/FConnection.hxx" #include "file/filedllapi.hxx" #include diff --git a/connectivity/source/inc/file/FTable.hxx b/connectivity/source/inc/file/FTable.hxx index 00e6f8d1b389..27fcaa46b431 100644 --- a/connectivity/source/inc/file/FTable.hxx +++ b/connectivity/source/inc/file/FTable.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLE_HXX -#include "connectivity/sdbcx/VTable.hxx" +#include #include #include #include "file/FConnection.hxx" #include "file/filedllapi.hxx" #include -#include "connectivity/FValue.hxx" +#include #include "TResultSetHelper.hxx" namespace connectivity diff --git a/connectivity/source/inc/file/FTables.hxx b/connectivity/source/inc/file/FTables.hxx index 828e93bb7663..74ac0dce6f86 100644 --- a/connectivity/source/inc/file/FTables.hxx +++ b/connectivity/source/inc/file/FTables.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FTABLES_HXX #include "file/filedllapi.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity diff --git a/connectivity/source/inc/file/fcode.hxx b/connectivity/source/inc/file/fcode.hxx index 6ff472f12e5d..1c5c91220293 100644 --- a/connectivity/source/inc/file/fcode.hxx +++ b/connectivity/source/inc/file/fcode.hxx @@ -20,13 +20,13 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCODE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FCODE_HXX -#include "connectivity/sqliterator.hxx" +#include #include -#include "connectivity/CommonTools.hxx" +#include #include #include #include -#include "connectivity/FValue.hxx" +#include #include "file/filedllapi.hxx" namespace connectivity diff --git a/connectivity/source/inc/file/filedllapi.hxx b/connectivity/source/inc/file/filedllapi.hxx index 16256847cc45..7bc8ed0ce0e7 100644 --- a/connectivity/source/inc/file/filedllapi.hxx +++ b/connectivity/source/inc/file/filedllapi.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_FILE_FILEDLLAPI_HXX -#include "sal/config.h" +#include -#include "sal/types.h" +#include #if defined OOO_DLLIMPLEMENTATION_FILE #define OOO_DLLPUBLIC_FILE SAL_DLLPUBLIC_EXPORT diff --git a/connectivity/source/inc/flat/EDriver.hxx b/connectivity/source/inc/flat/EDriver.hxx index 3e0dde2e8186..cbc8e850ce77 100644 --- a/connectivity/source/inc/flat/EDriver.hxx +++ b/connectivity/source/inc/flat/EDriver.hxx @@ -21,7 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_INC_FLAT_EDRIVER_HXX #include -#include "connectivity/CommonTools.hxx" +#include #include "file/FDriver.hxx" namespace connectivity diff --git a/connectivity/source/inc/flat/ETable.hxx b/connectivity/source/inc/flat/ETable.hxx index aa91a0d83938..d03d4f7af93e 100644 --- a/connectivity/source/inc/flat/ETable.hxx +++ b/connectivity/source/inc/flat/ETable.hxx @@ -22,8 +22,8 @@ #include "file/FTable.hxx" #include "flat/EConnection.hxx" -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include #include "file/quotedstring.hxx" #include diff --git a/connectivity/source/inc/hsqldb/HCatalog.hxx b/connectivity/source/inc/hsqldb/HCatalog.hxx index b3fcfb0ce3f6..1bc1d10b437f 100644 --- a/connectivity/source/inc/hsqldb/HCatalog.hxx +++ b/connectivity/source/inc/hsqldb/HCatalog.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" -#include "connectivity/StdTypeDefs.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/hsqldb/HColumns.hxx b/connectivity/source/inc/hsqldb/HColumns.hxx index e5187ce51c4d..3fdc0205b39b 100644 --- a/connectivity/source/inc/hsqldb/HColumns.hxx +++ b/connectivity/source/inc/hsqldb/HColumns.hxx @@ -18,8 +18,8 @@ */ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCOLUMNS_HXX -#include "connectivity/TColumnsHelper.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/hsqldb/HConnection.hxx b/connectivity/source/inc/hsqldb/HConnection.hxx index e8c4a076136b..efeeaa4e5555 100644 --- a/connectivity/source/inc/hsqldb/HConnection.hxx +++ b/connectivity/source/inc/hsqldb/HConnection.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCONNECTION_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HCONNECTION_HXX -#include "connectivity/ConnectionWrapper.hxx" +#include #include #include #include diff --git a/connectivity/source/inc/hsqldb/HDriver.hxx b/connectivity/source/inc/hsqldb/HDriver.hxx index 3768e1e736c7..66bb5d17a2fd 100644 --- a/connectivity/source/inc/hsqldb/HDriver.hxx +++ b/connectivity/source/inc/hsqldb/HDriver.hxx @@ -28,7 +28,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include namespace connectivity diff --git a/connectivity/source/inc/hsqldb/HTable.hxx b/connectivity/source/inc/hsqldb/HTable.hxx index 13423e7dc128..47693ed770a7 100644 --- a/connectivity/source/inc/hsqldb/HTable.hxx +++ b/connectivity/source/inc/hsqldb/HTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLE_HXX -#include "connectivity/TTableHelper.hxx" +#include #include #include diff --git a/connectivity/source/inc/hsqldb/HTables.hxx b/connectivity/source/inc/hsqldb/HTables.hxx index f7c428854f4c..bd553d1ec56a 100644 --- a/connectivity/source/inc/hsqldb/HTables.hxx +++ b/connectivity/source/inc/hsqldb/HTables.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/inc/hsqldb/HUser.hxx b/connectivity/source/inc/hsqldb/HUser.hxx index 1f3b64791fb9..f9ab04891ffb 100644 --- a/connectivity/source/inc/hsqldb/HUser.hxx +++ b/connectivity/source/inc/hsqldb/HUser.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSER_HXX -#include "connectivity/sdbcx/VUser.hxx" -#include "com/sun/star/sdbc/XConnection.hpp" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/hsqldb/HUsers.hxx b/connectivity/source/inc/hsqldb/HUsers.hxx index 901ac9be6b1f..8824cebce2a2 100644 --- a/connectivity/source/inc/hsqldb/HUsers.hxx +++ b/connectivity/source/inc/hsqldb/HUsers.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSERS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HUSERS_HXX -#include "connectivity/sdbcx/VCollection.hxx" -#include "com/sun/star/sdbc/XConnection.hpp" +#include +#include namespace connectivity { namespace sdbcx diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 49698d46da93..e13ff796734e 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEW_HXX -#include "connectivity/sdbcx/VView.hxx" +#include #include diff --git a/connectivity/source/inc/hsqldb/HViews.hxx b/connectivity/source/inc/hsqldb/HViews.hxx index 7a1c042657a9..fd72e431f710 100644 --- a/connectivity/source/inc/hsqldb/HViews.hxx +++ b/connectivity/source/inc/hsqldb/HViews.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEWS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_HSQLDB_HVIEWS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/inc/java/sql/Connection.hxx b/connectivity/source/inc/java/sql/Connection.hxx index 704e9d62ae79..a61f89addcb6 100644 --- a/connectivity/source/inc/java/sql/Connection.hxx +++ b/connectivity/source/inc/java/sql/Connection.hxx @@ -21,8 +21,8 @@ #include "java/lang/Object.hxx" #include "TConnection.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/OSubComponent.hxx" +#include +#include #include #include "AutoRetrievingBase.hxx" #include "java/sql/ConnectionLog.hxx" diff --git a/connectivity/source/inc/java/sql/JStatement.hxx b/connectivity/source/inc/java/sql/JStatement.hxx index eeaf7f763ab5..998c9f8c9286 100644 --- a/connectivity/source/inc/java/sql/JStatement.hxx +++ b/connectivity/source/inc/java/sql/JStatement.hxx @@ -30,8 +30,8 @@ #include #include #include -#include "connectivity/CommonTools.hxx" -#include "connectivity/OSubComponent.hxx" +#include +#include #include #include diff --git a/connectivity/source/inc/java/sql/ResultSet.hxx b/connectivity/source/inc/java/sql/ResultSet.hxx index 87e7ff9378d9..eb3a2ca83c2a 100644 --- a/connectivity/source/inc/java/sql/ResultSet.hxx +++ b/connectivity/source/inc/java/sql/ResultSet.hxx @@ -31,7 +31,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include "java/sql/JStatement.hxx" #include #include "java/sql/ConnectionLog.hxx" diff --git a/connectivity/source/inc/mysql/YCatalog.hxx b/connectivity/source/inc/mysql/YCatalog.hxx index b817af744b23..28a745a909a3 100644 --- a/connectivity/source/inc/mysql/YCatalog.hxx +++ b/connectivity/source/inc/mysql/YCatalog.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCATALOG_HXX -#include "connectivity/sdbcx/VCatalog.hxx" -#include "connectivity/StdTypeDefs.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/mysql/YColumns.hxx b/connectivity/source/inc/mysql/YColumns.hxx index dc65c10648f0..ec9855844ed9 100644 --- a/connectivity/source/inc/mysql/YColumns.hxx +++ b/connectivity/source/inc/mysql/YColumns.hxx @@ -18,8 +18,8 @@ */ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCOLUMNS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YCOLUMNS_HXX -#include "connectivity/TColumnsHelper.hxx" -#include "connectivity/sdbcx/VColumn.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/mysql/YDriver.hxx b/connectivity/source/inc/mysql/YDriver.hxx index 25f3eda10d24..dc69e9e659c5 100644 --- a/connectivity/source/inc/mysql/YDriver.hxx +++ b/connectivity/source/inc/mysql/YDriver.hxx @@ -30,7 +30,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include namespace connectivity diff --git a/connectivity/source/inc/mysql/YTable.hxx b/connectivity/source/inc/mysql/YTable.hxx index 9356a789aee8..434132890cc6 100644 --- a/connectivity/source/inc/mysql/YTable.hxx +++ b/connectivity/source/inc/mysql/YTable.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLE_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLE_HXX -#include "connectivity/TTableHelper.hxx" +#include #include #include diff --git a/connectivity/source/inc/mysql/YTables.hxx b/connectivity/source/inc/mysql/YTables.hxx index 9a9f8aa643b5..84715849a680 100644 --- a/connectivity/source/inc/mysql/YTables.hxx +++ b/connectivity/source/inc/mysql/YTables.hxx @@ -19,8 +19,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YTABLES_HXX -#include "connectivity/sdbcx/VCollection.hxx" -#include "connectivity/SQLStatementHelper.hxx" +#include +#include #include namespace connectivity { diff --git a/connectivity/source/inc/mysql/YUser.hxx b/connectivity/source/inc/mysql/YUser.hxx index 30390a0359f0..848da1f28493 100644 --- a/connectivity/source/inc/mysql/YUser.hxx +++ b/connectivity/source/inc/mysql/YUser.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSER_HXX -#include "connectivity/sdbcx/VUser.hxx" -#include "com/sun/star/sdbc/XConnection.hpp" +#include +#include namespace connectivity { diff --git a/connectivity/source/inc/mysql/YUsers.hxx b/connectivity/source/inc/mysql/YUsers.hxx index 9a327e2e6968..20f370bf1dad 100644 --- a/connectivity/source/inc/mysql/YUsers.hxx +++ b/connectivity/source/inc/mysql/YUsers.hxx @@ -20,8 +20,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSERS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YUSERS_HXX -#include "connectivity/sdbcx/VCollection.hxx" -#include "com/sun/star/sdbc/XConnection.hpp" +#include +#include namespace connectivity { namespace sdbcx diff --git a/connectivity/source/inc/mysql/YViews.hxx b/connectivity/source/inc/mysql/YViews.hxx index c1b1b8e8638d..22485967ba88 100644 --- a/connectivity/source/inc/mysql/YViews.hxx +++ b/connectivity/source/inc/mysql/YViews.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YVIEWS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_MYSQL_YVIEWS_HXX -#include "connectivity/sdbcx/VCollection.hxx" +#include #include namespace connectivity { diff --git a/connectivity/source/inc/odbc/OConnection.hxx b/connectivity/source/inc/odbc/OConnection.hxx index 43a67a1392de..bdf46b6ac3cf 100644 --- a/connectivity/source/inc/odbc/OConnection.hxx +++ b/connectivity/source/inc/odbc/OConnection.hxx @@ -23,8 +23,8 @@ #include #include "odbc/OFunctiondefs.hxx" #include "odbc/odbcbasedllapi.hxx" -#include "connectivity/OSubComponent.hxx" -#include "connectivity/CommonTools.hxx" +#include +#include #include "TConnection.hxx" #include "OTypeInfo.hxx" #include diff --git a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx index d8da9dd22841..4b7bbd4575d2 100644 --- a/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx +++ b/connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx @@ -35,7 +35,7 @@ #include "odbc/ODatabaseMetaData.hxx" #include "odbc/odbcbasedllapi.hxx" #include -#include "connectivity/StdTypeDefs.hxx" +#include namespace connectivity { diff --git a/connectivity/source/inc/odbc/ODriver.hxx b/connectivity/source/inc/odbc/ODriver.hxx index 138974d16c8c..f225bd002d32 100644 --- a/connectivity/source/inc/odbc/ODriver.hxx +++ b/connectivity/source/inc/odbc/ODriver.hxx @@ -25,7 +25,7 @@ #include #include "odbc/OFunctiondefs.hxx" #include "odbc/odbcbasedllapi.hxx" -#include "connectivity/CommonTools.hxx" +#include #include namespace connectivity diff --git a/connectivity/source/inc/odbc/OResultSet.hxx b/connectivity/source/inc/odbc/OResultSet.hxx index 416a14d926f8..a423e735ca58 100644 --- a/connectivity/source/inc/odbc/OResultSet.hxx +++ b/connectivity/source/inc/odbc/OResultSet.hxx @@ -36,8 +36,8 @@ #include "odbc/OFunctions.hxx" #include "odbc/OStatement.hxx" #include "odbc/odbcbasedllapi.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/FValue.hxx" +#include +#include #include "TSkipDeletedSet.hxx" namespace connectivity diff --git a/connectivity/source/inc/odbc/OStatement.hxx b/connectivity/source/inc/odbc/OStatement.hxx index 8ba5ee8ce065..c0387806c915 100644 --- a/connectivity/source/inc/odbc/OStatement.hxx +++ b/connectivity/source/inc/odbc/OStatement.hxx @@ -31,7 +31,7 @@ #include #include #include -#include "connectivity/CommonTools.hxx" +#include #include "odbc/OFunctions.hxx" #include "odbc/OConnection.hxx" #include "odbc/odbcbasedllapi.hxx" diff --git a/connectivity/source/inc/odbc/odbcbasedllapi.hxx b/connectivity/source/inc/odbc/odbcbasedllapi.hxx index 55a3dcf6f1dd..59619eee7014 100644 --- a/connectivity/source/inc/odbc/odbcbasedllapi.hxx +++ b/connectivity/source/inc/odbc/odbcbasedllapi.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX #define INCLUDED_CONNECTIVITY_SOURCE_INC_ODBC_ODBCBASEDLLAPI_HXX -#include "sal/config.h" +#include -#include "sal/types.h" +#include #if defined OOO_DLLIMPLEMENTATION_ODBCBASE #define OOO_DLLPUBLIC_ODBCBASE SAL_DLLPUBLIC_EXPORT diff --git a/connectivity/source/inc/propertyids.hxx b/connectivity/source/inc/propertyids.hxx index 0fe711b3f1ad..f3eb554ed7af 100644 --- a/connectivity/source/inc/propertyids.hxx +++ b/connectivity/source/inc/propertyids.hxx @@ -23,7 +23,7 @@ // every dll has his own set of property names #include #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace dbtools { diff --git a/connectivity/source/inc/resource/sharedresources.hxx b/connectivity/source/inc/resource/sharedresources.hxx index 3ce955535560..76cd950d388f 100644 --- a/connectivity/source/inc/resource/sharedresources.hxx +++ b/connectivity/source/inc/resource/sharedresources.hxx @@ -22,7 +22,7 @@ #include #include -#include "connectivity/dbtoolsdllapi.hxx" +#include namespace connectivity diff --git a/connectivity/source/manager/mdrivermanager.hxx b/connectivity/source/manager/mdrivermanager.hxx index 6d41d0a67999..e2fa4191f64c 100644 --- a/connectivity/source/manager/mdrivermanager.hxx +++ b/connectivity/source/manager/mdrivermanager.hxx @@ -35,7 +35,7 @@ #include #include #include -#include "connectivity/DriversConfig.hxx" +#include namespace drivermanager { diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 9dceeffccb0c..fa1035c02ce9 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -18,8 +18,8 @@ */ -#include "connectivity/PColumn.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include "TConnection.hxx" #include diff --git a/connectivity/source/parse/sqliterator.cxx b/connectivity/source/parse/sqliterator.cxx index e4a153ae0887..7c4a1784600c 100644 --- a/connectivity/source/parse/sqliterator.cxx +++ b/connectivity/source/parse/sqliterator.cxx @@ -17,8 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sqliterator.hxx" -#include "connectivity/sdbcx/VTable.hxx" +#include +#include #include #include #include @@ -30,8 +30,8 @@ #ifdef SQL_TEST_PARSETREEITERATOR #include #endif -#include "connectivity/PColumn.hxx" -#include "connectivity/dbtools.hxx" +#include +#include #include #include "TConnection.hxx" #include diff --git a/connectivity/source/parse/sqlnode.cxx b/connectivity/source/parse/sqlnode.cxx index be2c75da4e13..73bbbb96e3f9 100644 --- a/connectivity/source/parse/sqlnode.cxx +++ b/connectivity/source/parse/sqlnode.cxx @@ -42,15 +42,15 @@ #include #include #include -#include "connectivity/dbconversion.hxx" +#include #include #include #include #include "TConnection.hxx" #include #include -#include "connectivity/dbtools.hxx" -#include "connectivity/dbmetadata.hxx" +#include +#include #include #include #include diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 8691057f8393..fe4e13ae87a2 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VCatalog.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include +#include #include -#include "connectivity/sdbcx/VDescriptor.hxx" +#include #include "TConnection.hxx" #include -#include "connectivity/dbtools.hxx" +#include using namespace connectivity; using namespace connectivity::sdbcx; diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index 9473d9516e2b..622ccf15d889 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -20,9 +20,9 @@ #include #include -#include "connectivity/sdbcx/VCollection.hxx" -#include "connectivity/sdbcx/VDescriptor.hxx" -#include "connectivity/dbexception.hxx" +#include +#include +#include #include #include #include diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index a22b54311dc9..ea46df1f6bb5 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include #include diff --git a/connectivity/source/sdbcx/VGroup.cxx b/connectivity/source/sdbcx/VGroup.cxx index b1eeac8eb52f..960c320d068d 100644 --- a/connectivity/source/sdbcx/VGroup.cxx +++ b/connectivity/source/sdbcx/VGroup.cxx @@ -19,7 +19,7 @@ #include -#include "connectivity/sdbcx/VGroup.hxx" +#include #include #include #include diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index 472922805514..acc128ebed44 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -17,12 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VIndex.hxx" +#include #include -#include "connectivity/sdbcx/VColumn.hxx" +#include #include #include -#include "connectivity/sdbcx/VCollection.hxx" +#include #include #include "TConnection.hxx" diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index d1b6dc108602..f60b5a7d9cbb 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VIndexColumn.hxx" +#include #include #include "TConnection.hxx" diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index a7d3c4246e36..ccd9e9b53881 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -17,13 +17,13 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VKey.hxx" +#include #include #include #include #include -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include +#include #include "TConnection.hxx" using namespace connectivity; diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index dafe705a3f9a..bec457e0a1cc 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VKeyColumn.hxx" +#include #include #include "TConnection.hxx" diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 42421f4cfcf1..18d7c35bab7f 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -17,15 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VTable.hxx" +#include #include -#include "connectivity/sdbcx/VIndex.hxx" +#include #include -#include "connectivity/sdbcx/VCollection.hxx" +#include #include "TConnection.hxx" -#include "connectivity/sdbcx/VColumn.hxx" -#include "connectivity/sdbcx/VKey.hxx" -#include "connectivity/dbtools.hxx" +#include +#include +#include #include #include diff --git a/connectivity/source/sdbcx/VUser.cxx b/connectivity/source/sdbcx/VUser.cxx index 31fc79721088..911c8d9cbbab 100644 --- a/connectivity/source/sdbcx/VUser.cxx +++ b/connectivity/source/sdbcx/VUser.cxx @@ -19,12 +19,12 @@ #include -#include "connectivity/sdbcx/VUser.hxx" +#include #include #include #include #include "TConnection.hxx" -#include "connectivity/sdbcx/VCollection.hxx" +#include #include #include diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index e8cedba72ce5..adc2e3d62543 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -17,10 +17,10 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "connectivity/sdbcx/VView.hxx" +#include #include #include -#include "connectivity/dbtools.hxx" +#include #include "TConnection.hxx" diff --git a/connectivity/source/simpledbt/staticdbtools_s.cxx b/connectivity/source/simpledbt/staticdbtools_s.cxx index dba6091ec8b5..55bfdf4628d0 100644 --- a/connectivity/source/simpledbt/staticdbtools_s.cxx +++ b/connectivity/source/simpledbt/staticdbtools_s.cxx @@ -19,7 +19,7 @@ #include #include "staticdbtools_s.hxx" -#include "connectivity/dbconversion.hxx" +#include #include #include diff --git a/connectivity/workben/little/main.cxx b/connectivity/workben/little/main.cxx index 3c9f66a45005..346f60020ca7 100644 --- a/connectivity/workben/little/main.cxx +++ b/connectivity/workben/little/main.cxx @@ -18,7 +18,7 @@ */ #include -#include "connectivity/sqliterator.hxx" +#include #include #include #include @@ -31,7 +31,7 @@ #include #include #include -#include "connectivity/sqlnode.hxx" +#include using namespace connectivity; using namespace com::sun::star::sdbc; diff --git a/connectivity/workben/skeleton/SResultSet.hxx b/connectivity/workben/skeleton/SResultSet.hxx index f305393d188d..86234171ba79 100644 --- a/connectivity/workben/skeleton/SResultSet.hxx +++ b/connectivity/workben/skeleton/SResultSet.hxx @@ -33,8 +33,8 @@ #include #include #include "SStatement.hxx" -#include "connectivity/CommonTools.hxx" -#include "connectivity/FValue.hxx" +#include +#include namespace connectivity { diff --git a/connectivity/workben/testmoz/initUNO.cxx b/connectivity/workben/testmoz/initUNO.cxx index 6ccfba2223ad..2cc1d35c282d 100644 --- a/connectivity/workben/testmoz/initUNO.cxx +++ b/connectivity/workben/testmoz/initUNO.cxx @@ -18,8 +18,8 @@ */ -#include "rtl/bootstrap.hxx" -#include "cppuhelper/bootstrap.hxx" +#include +#include #include using namespace cppu; diff --git a/connectivity/workben/testmoz/main.cxx b/connectivity/workben/testmoz/main.cxx index 60430537650e..7051ef2e28d4 100644 --- a/connectivity/workben/testmoz/main.cxx +++ b/connectivity/workben/testmoz/main.cxx @@ -18,7 +18,7 @@ */ #include -#include "connectivity/sqliterator.hxx" +#include #include #include #include @@ -40,7 +40,7 @@ #include #include -#include "connectivity/sqlnode.hxx" +#include #include #include #include diff --git a/connectivity/workben/testmoz/mozthread.cxx b/connectivity/workben/testmoz/mozthread.cxx index d7e53d7a0e93..48ab7b1f68eb 100644 --- a/connectivity/workben/testmoz/mozthread.cxx +++ b/connectivity/workben/testmoz/mozthread.cxx @@ -18,7 +18,7 @@ */ #include -#include "connectivity/sqliterator.hxx" +#include #include #include #include @@ -40,7 +40,7 @@ #include #include -#include "connectivity/sqlnode.hxx" +#include #include #include #include -- cgit