diff options
Diffstat (limited to 'connectivity/source/drivers')
60 files changed, 61 insertions, 54 deletions
diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index ec94b9c3cfc3..b155453b82b0 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -20,6 +20,7 @@ #include <comphelper/sequence.hxx> #include <ado/ADatabaseMetaDataResultSet.hxx> #include <ado/ADatabaseMetaDataResultSetMetaData.hxx> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index c5df337a7468..04b60da887fb 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -22,6 +22,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 004b0af38232..bcdc12486b09 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -20,6 +20,7 @@ #include <calc/CTable.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sheet/XSpreadsheetDocument.hpp> #include <com/sun/star/sheet/XSpreadsheet.hpp> diff --git a/connectivity/source/drivers/component/CDatabaseMetaData.cxx b/connectivity/source/drivers/component/CDatabaseMetaData.cxx index a2edb795fc1e..4e43a6c76cff 100644 --- a/connectivity/source/drivers/component/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/component/CDatabaseMetaData.cxx @@ -18,7 +18,9 @@ */ #include <component/CDatabaseMetaData.hxx> +#include <connectivity/sqliterator.hxx> #include <file/FConnection.hxx> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index cc5f12b6e7ac..5aad3708e908 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -19,6 +19,7 @@ #include <dbase/DDatabaseMetaData.hxx> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 0054f3fcecc1..8f218811037b 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -22,6 +22,7 @@ #include <dbase/DConnection.hxx> #include <dbase/DTables.hxx> #include <dbase/DTable.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 0fafcc90b80b..a2c12a87ff05 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -25,7 +25,6 @@ #include <comphelper/processfactory.hxx> #include <cppuhelper/compbase.hxx> #include <connectivity/CommonTools.hxx> -#include <osl/module.h> #define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 612618ab4580..02f94ef0c0b1 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -16,6 +16,7 @@ #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <sal/log.hxx> diff --git a/connectivity/source/drivers/firebird/Column.hxx b/connectivity/source/drivers/firebird/Column.hxx index c5cb8957d8b6..b72203da8a4e 100644 --- a/connectivity/source/drivers/firebird/Column.hxx +++ b/connectivity/source/drivers/firebird/Column.hxx @@ -8,7 +8,7 @@ */ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_HCOLUMN_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_HCOLUMN_HXX -#include <connectivity/TColumnsHelper.hxx> + #include <connectivity/sdbcx/VColumn.hxx> namespace connectivity diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index b3b5ac9ee1da..df278084c178 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -17,7 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include "Blob.hxx" #include "Catalog.hxx" +#include "Clob.hxx" #include "Connection.hxx" #include "DatabaseMetaData.hxx" #include "Driver.hxx" diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index d6e70fdbee63..7365aa06aee2 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CONNECTION_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_CONNECTION_HXX -#include "Clob.hxx" -#include "Blob.hxx" -#include "SubComponent.hxx" - #include <ibase.h> #include <connectivity/CommonTools.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/weakref.hxx> -#include <map> #include <memory> #include <OTypeInfo.hxx> #include <unotools/tempfile.hxx> @@ -38,10 +33,9 @@ #include <com/sun/star/document/DocumentEvent.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> +#include <com/sun/star/sdbc/XBlob.hpp> +#include <com/sun/star/sdbc/XClob.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index c152694a5963..e77322e86f6e 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -25,11 +25,13 @@ #include <sal/log.hxx> #include <FDatabaseMetaDataResultSet.hxx> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/IndexType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index d5b480e5ff41..94335a17d4c7 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -19,6 +19,7 @@ #include "Connection.hxx" #include "Driver.hxx" +#include "SubComponent.hxx" #include <connectivity/dbexception.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 63800ac09e01..e77201791cd1 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_PREPAREDSTATEMENT_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_PREPAREDSTATEMENT_HXX -#include "Statement.hxx" +#include "StatementCommonBase.hxx" #include <cppuhelper/implbase5.hxx> diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index dd0e56afb9af..257ff0675c80 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -35,6 +35,10 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/FetchDirection.hpp> +#include <com/sun/star/sdbc/ResultSetConcurrency.hpp> +#include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> using namespace ::comphelper; diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index 000f749af9f8..dc1a611febe2 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_RESULTSET_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_RESULTSET_HXX -#include "Statement.hxx" +#include "Connection.hxx" #include <ibase.h> @@ -30,9 +30,6 @@ #include <comphelper/propertycontainer.hxx> #include <com/sun/star/util/XCancellable.hpp> -#include <com/sun/star/sdbc/FetchDirection.hpp> -#include <com/sun/star/sdbc/ResultSetConcurrency.hpp> -#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 0b55d6d31bc5..d21115029df3 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -21,6 +21,7 @@ #include "Util.hxx" #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/DataType.hpp> diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 83add5821100..4c9168fd4304 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -23,6 +23,7 @@ #include "StatementCommonBase.hxx" #include <cppuhelper/implbase1.hxx> +#include <com/sun/star/sdbc/XBatchExecution.hpp> namespace connectivity { diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index c9a142667aef..097234e9f1e2 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -29,6 +29,8 @@ #include <vcl/svapp.hxx> #include <TConnection.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> + using namespace ::connectivity::firebird; using namespace ::com::sun::star; diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index a127d42dfd09..bce9f737435e 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -21,18 +21,14 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_STATEMENTCOMMONBASE_HXX #include "Connection.hxx" +#include "SubComponent.hxx" #include <ibase.h> #include <cppuhelper/compbase.hxx> -#include <list> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> -#include <com/sun/star/sdbc/XBatchExecution.hpp> #include <com/sun/star/sdbc/XCloseable.hpp> #include <com/sun/star/sdbc/XMultipleResults.hpp> -#include <com/sun/star/sdbc/XStatement.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/util/XCancellable.hpp> diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index ae100956ed1a..d37100670995 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_SUBCOMPONENT_HXX -#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/weak.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> -#include <com/sun/star/lang/DisposedException.hpp> - namespace cppu { class IPropertyArrayHelper; } diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index 58b31a373468..635774727095 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -10,7 +10,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_TABLES_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_TABLES_HXX -#include "DatabaseMetaData.hxx" +#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <connectivity/sdbcx/VCollection.hxx> diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index 9112d12a7c75..39e019e4dada 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -10,9 +10,8 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USERS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_FIREBIRD_USERS_HXX -#include "DatabaseMetaData.hxx" - #include <connectivity/sdbcx/VCollection.hxx> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx index c4d6eeece4d1..c89540c1d90b 100644 --- a/connectivity/source/drivers/firebird/Util.cxx +++ b/connectivity/source/drivers/firebird/Util.cxx @@ -12,6 +12,9 @@ #include <rtl/strbuf.hxx> #include <sal/log.hxx> +#include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> + using namespace ::connectivity; using namespace ::com::sun::star; diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index f380ab6caab5..107840876e55 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -13,10 +13,8 @@ #include <ibase.h> #include <rtl/ustring.hxx> -#include <rtl/ustrbuf.hxx> -#include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/uno/XInterface.hpp> namespace connectivity { diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index ad8982eb21bc..76a19797bfa7 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -18,9 +18,11 @@ */ #include <flat/EDatabaseMetaData.hxx> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 05ac29b79ff2..450383cbb0a1 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -30,6 +30,7 @@ #include <rtl/math.hxx> #include <sal/log.hxx> #include <tools/solar.h> +#include <tools/urlobj.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/numbers.hxx> @@ -43,6 +44,7 @@ #include <unotools/configmgr.hxx> #include <i18nlangtag/languagetag.hxx> #include <connectivity/dbconversion.hxx> +#include <connectivity/sdbcx/VColumn.hxx> #include <file/quotedstring.hxx> #include <unotools/syslocale.hxx> #include <unotools/charclass.hxx> diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index 9211641526f8..22436a3dc282 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -21,6 +21,7 @@ #include <java/tools.hxx> #include <java/io/InputStream.hxx> #include <connectivity/dbexception.hxx> +#include <osl/diagnose.h> #include <string.h> diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index ee02595f3666..135512d5a245 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -21,6 +21,7 @@ #include <java/tools.hxx> #include <java/io/Reader.hxx> #include <connectivity/dbexception.hxx> +#include <osl/diagnose.h> using namespace connectivity; diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index 35c020f4a738..c88bc2f5093b 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -21,6 +21,7 @@ #include <java/sql/DatabaseMetaData.hxx> #include <java/sql/Connection.hxx> #include <java/sql/ResultSet.hxx> +#include <java/sql/SQLException.hxx> #include <java/tools.hxx> #include <java/lang/String.hxx> #include <connectivity/CommonTools.hxx> diff --git a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx index 7b0017a03f21..b6dc17062cf6 100644 --- a/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx +++ b/connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx @@ -25,7 +25,6 @@ using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index 33aa2ae8d94c..d21792e2c830 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/io/BufferSizeExceededException.hpp> #include <java/io/InputStream.hxx> #include <java/tools.hxx> +#include <osl/diagnose.h> #include <string.h> diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index b3516a15f6ac..7b452a1947d9 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/logging/LogLevel.hpp> #include <java/tools.hxx> #include <java/sql/SQLException.hxx> +#include <osl/diagnose.h> #include <osl/thread.h> #include <java/LocalRef.hxx> #include <strings.hxx> diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 5f49db97f05b..8dd12157e3ee 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -19,6 +19,7 @@ #include <java/io/Reader.hxx> #include <string.h> +#include <osl/diagnose.h> using namespace connectivity; using ::com::sun::star::uno::Sequence; diff --git a/connectivity/source/drivers/jdbc/Timestamp.cxx b/connectivity/source/drivers/jdbc/Timestamp.cxx index 9338956377ec..eb7624719812 100644 --- a/connectivity/source/drivers/jdbc/Timestamp.cxx +++ b/connectivity/source/drivers/jdbc/Timestamp.cxx @@ -20,6 +20,7 @@ #include <java/sql/Timestamp.hxx> #include <java/tools.hxx> #include <connectivity/dbconversion.hxx> +#include <osl/diagnose.h> using namespace ::comphelper; using namespace connectivity; diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index 77265009d20b..1d737600024c 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -25,8 +25,10 @@ #include <java/lang/Class.hxx> #include <java/util/Property.hxx> #include <com/sun/star/sdbc/DriverPropertyInfo.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <connectivity/dbexception.hxx> +#include <osl/diagnose.h> using namespace connectivity; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 706d6e064241..809537c2316b 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -27,6 +27,7 @@ #include "MacabDriver.hxx" #include <FDatabaseMetaDataResultSet.hxx> #include <OTypeInfo.hxx> +#include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> diff --git a/connectivity/source/drivers/mork/MColumnAlias.hxx b/connectivity/source/drivers/mork/MColumnAlias.hxx index 50c725258234..5074d4949cbf 100644 --- a/connectivity/source/drivers/mork/MColumnAlias.hxx +++ b/connectivity/source/drivers/mork/MColumnAlias.hxx @@ -24,7 +24,6 @@ #include <unotools/confignode.hxx> #include <unordered_map> -#include <vector> namespace connectivity { diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index ed5c0e5720bb..b0774af27c88 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -21,8 +21,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MCOLUMNS_HXX #include <connectivity/sdbcx/VCollection.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <connectivity/sdbcx/IRefreshable.hxx> #include "MTable.hxx" namespace connectivity diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index f3a16a566ec1..8677fc7aa903 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -12,6 +12,7 @@ #include <memory> #include <TDatabaseMetaDataBase.hxx> +#include "MConnection.hxx" namespace connectivity { diff --git a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx index 7e892949ec25..0ae96dac96a6 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx @@ -11,6 +11,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MDATABASEMETADATAHELPER_HXX #include <FDatabaseMetaDataResultSet.hxx> +#include "MConnection.hxx" namespace connectivity { diff --git a/connectivity/source/drivers/mork/MQueryHelper.hxx b/connectivity/source/drivers/mork/MQueryHelper.hxx index 92c27f2135cb..859b61ddcf9f 100644 --- a/connectivity/source/drivers/mork/MQueryHelper.hxx +++ b/connectivity/source/drivers/mork/MQueryHelper.hxx @@ -22,6 +22,7 @@ #include <connectivity/FValue.hxx> #include "MErrorResource.hxx" +#include "MColumnAlias.hxx" namespace connectivity { diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 1e057ef7773e..5362a4ac080c 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -22,9 +22,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase.hxx> -#include <vector> #include <rtl/ref.hxx> -#include "MConnection.hxx" #include "MTable.hxx" namespace connectivity diff --git a/connectivity/source/drivers/mork/MorkParser.hxx b/connectivity/source/drivers/mork/MorkParser.hxx index 392f4f01bbd6..d16fc417dacd 100644 --- a/connectivity/source/drivers/mork/MorkParser.hxx +++ b/connectivity/source/drivers/mork/MorkParser.hxx @@ -35,7 +35,6 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MORKPARSER_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MORK_MORKPARSER_HXX -#include <sal/types.h> #include <rtl/ustring.hxx> #include <string> diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 179a13418aa9..a727e3579e0e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/compbase.hxx> -#include <osl/module.h> #define MOZAB_MozillaBootstrap_IMPL_NAME "com.sun.star.comp.mozilla.MozillaBootstrap" diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index f443797990e6..50c992f230af 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSFOLDERS_HXX #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSFOLDERS_HXX -#include <sal/types.h> -#include <osl/diagnose.h> -#include <osl/conditn.hxx> #include <com/sun/star/mozilla/MozillaProductType.hpp> #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 04c27cd0ed71..8d9277f99ed8 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -18,6 +18,8 @@ */ #include "MNSINIParser.hxx" +#include <com/sun/star/io/IOException.hpp> +#include <osl/process.h> #include <rtl/byteseq.hxx> #include <sal/log.hxx> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index f9cb0241b4a1..210553b73bcc 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -20,8 +20,6 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSINIPARSER_HXX #include <rtl/ustring.hxx> -#include <com/sun/star/io/IOException.hpp> -#include <osl/process.h> #include <map> #include <vector> diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index a9f447739a4b..8921a9c4bcfc 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -21,10 +21,7 @@ #define INCLUDED_CONNECTIVITY_SOURCE_DRIVERS_MOZAB_BOOTSTRAP_MNSPROFILEDISCOVER_HXX #include <sal/types.h> -#include <osl/diagnose.h> -#include <osl/conditn.hxx> #include <com/sun/star/mozilla/MozillaProductType.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx index 48cc6aca3a00..6513f4f94129 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx @@ -39,6 +39,7 @@ #include <osl/diagnose.h> #include <rtl/uri.hxx> #include <rtl/ustrbuf.hxx> +#include <cppuhelper/supportsservice.hxx> using namespace connectivity::mysqlc; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx b/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx index e69fcab53c41..b2c1a1be071e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_propertyids.hxx @@ -22,8 +22,6 @@ // this define has to be set to split the names into different dll's or so's // every dll has his own set of property names -#include <rtl/ustring.hxx> -#include <map> namespace connectivity { diff --git a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx index d562322d894d..edea5b82a03e 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_statement.cxx @@ -35,6 +35,7 @@ #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/supportsservice.hxx> #include <osl/thread.h> using namespace connectivity::mysqlc; diff --git a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx index c4930f96f77f..a1b02da51fa5 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_subcomponent.hxx @@ -20,11 +20,7 @@ #ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX #define INCLUDED_MYSQLC_SOURCE_MYSQLC_SUBCOMPONENT_HXX -#include <com/sun/star/lang/DisposedException.hpp> -#include <cppuhelper/interfacecontainer.h> #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/weak.hxx> #include <osl/diagnose.h> #include <osl/mutex.hxx> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_types.hxx b/connectivity/source/drivers/mysqlc/mysqlc_types.hxx index 3aa355fb65a2..5f577ee0352b 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_types.hxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_types.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX #define INCLUDED_MYSQLC_SOURCE_MYSQLC_TYPES_HXX +#include <sal/types.h> + struct TypeInfoDef { const char* typeName; diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index b4b092b87697..fac79cc44677 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> -#include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/uno/Reference.hxx> namespace com { namespace sun { namespace star { diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index d30d62d9032e..e1946abc2b77 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -49,6 +49,7 @@ #include <comphelper/sequence.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> diff --git a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx index fd919583fb16..63255f562dc3 100644 --- a/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/connectivity/source/drivers/postgresql/pq_statics.hxx b/connectivity/source/drivers/postgresql/pq_statics.hxx index 324889b72100..78051cd69689 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.hxx +++ b/connectivity/source/drivers/postgresql/pq_statics.hxx @@ -42,7 +42,6 @@ #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/sdbc/DataType.hpp> #include <cppuhelper/propshlp.hxx> diff --git a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx index f60e6f95e566..8dfe3b9ea96c 100644 --- a/connectivity/source/drivers/writer/WDatabaseMetaData.cxx +++ b/connectivity/source/drivers/writer/WDatabaseMetaData.cxx @@ -19,6 +19,7 @@ #include <writer/WDatabaseMetaData.hxx> #include <writer/WConnection.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> using namespace ::com::sun::star; diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index cf9ca7850fd5..1919d835f40c 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -20,6 +20,7 @@ #include <writer/WTable.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/text/XTextTablesSupplier.hpp> #include <com/sun/star/table/XCellRange.hpp> |