diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-23 10:37:14 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-03-12 10:14:54 +0100 |
| commit | 80aec8ef2a333890d46c4258f84af6b8f81832a8 (patch) | |
| tree | 9dd5c01a6cefbac98b251663fc662ed796c6125a | |
| parent | 86567ebde2d38c44aae93064b8c102f365641f81 (diff) | |
tdf#42949 Fix IWYU warnings in include/connectivity/*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I02f75be483529ba1f7a6e460e34c4752b4265221
Reviewed-on: https://gerrit.libreoffice.org/68893
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
147 files changed, 340 insertions, 136 deletions
diff --git a/connectivity/qa/connectivity/mork/DriverTest.cxx b/connectivity/qa/connectivity/mork/DriverTest.cxx index ba0cfd375874..f76c05e6d8ba 100644 --- a/connectivity/qa/connectivity/mork/DriverTest.cxx +++ b/connectivity/qa/connectivity/mork/DriverTest.cxx @@ -14,6 +14,7 @@ #include <MConnection.hxx> #include <com/sun/star/sdbc/XDriver.hpp> +#include <com/sun/star/sdbc/XRow.hpp> using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 05e047b9ec72..591fe961e517 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.cxx @@ -19,6 +19,7 @@ #include <connectivity/BlobHelper.hxx> #include <comphelper/seqstream.hxx> #include <connectivity/dbexception.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> using namespace connectivity; using namespace dbtools; diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index bd62d64990be..448ed296111a 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -18,8 +18,10 @@ */ #include <connectivity/ConnectionWrapper.hxx> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/uno3.hxx> #include <comphelper/sequence.hxx> diff --git a/connectivity/source/commontools/FValue.cxx b/connectivity/source/commontools/FValue.cxx index 1e48d68e85cd..61f344bb92b5 100644 --- a/connectivity/source/commontools/FValue.cxx +++ b/connectivity/source/commontools/FValue.cxx @@ -24,8 +24,13 @@ #include <connectivity/dbconversion.hxx> #include <comphelper/extract.hxx> #include <com/sun/star/io/XInputStream.hpp> +#include <com/sun/star/sdbc/XClob.hpp> +#include <com/sun/star/sdbc/XBlob.hpp> +#include <com/sun/star/sdb/XColumn.hpp> +#include <com/sun/star/sdbc/XRow.hpp> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> using namespace ::dbtools; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 0157f5c41051..83759ac42209 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -19,9 +19,12 @@ #include <connectivity/TIndexes.hxx> #include <connectivity/TIndex.hxx> +#include <connectivity/TTableHelper.hxx> +#include <com/sun/star/sdb/tools/XIndexAlteration.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/IndexType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/TTableHelper.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index c31a616926c2..682114e13e34 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -18,6 +18,7 @@ */ #include <connectivity/TKeyColumns.hxx> +#include <connectivity/TKey.hxx> #include <connectivity/sdbcx/VKeyColumn.hxx> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 293a0dab4ccf..9d4beb6b2a89 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -19,10 +19,13 @@ #include <connectivity/TKeys.hxx> #include <connectivity/TKey.hxx> +#include <connectivity/TTableHelper.hxx> +#include <com/sun/star/sdb/tools/XKeyAlteration.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index b08b33eec751..9b380a673525 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -21,6 +21,11 @@ #include <sal/log.hxx> #include <connectivity/TTableHelper.hxx> +#include <com/sun/star/sdb/tools/XTableRename.hpp> +#include <com/sun/star/sdb/tools/XTableAlteration.hpp> +#include <com/sun/star/sdb/tools/XKeyAlteration.hpp> +#include <com/sun/star/sdb/tools/XIndexAlteration.hpp> +#include <connectivity/sdbcx/VKey.hxx> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 03133dcf23e5..3d011c723b33 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -20,6 +20,8 @@ #include <connectivity/conncleanup.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> +#include <com/sun/star/sdbc/XRowSet.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <osl/diagnose.h> diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 1deb2a73b6d1..c7d817329664 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -79,6 +79,7 @@ #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> +#include <tools/stream.hxx> #include <cppuhelper/implbase.hxx> #include <strings.hrc> #include <resource/sharedresources.hxx> diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx index cd52c09ce6fe..39b1a7c2f373 100644 --- a/connectivity/source/commontools/dbtools2.cxx +++ b/connectivity/source/commontools/dbtools2.cxx @@ -24,6 +24,7 @@ #include <unotools/confignode.hxx> #include <resource/sharedresources.hxx> #include <strings.hrc> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> diff --git a/connectivity/source/commontools/formattedcolumnvalue.cxx b/connectivity/source/commontools/formattedcolumnvalue.cxx index 3e3c5e316762..be9a133d6923 100644 --- a/connectivity/source/commontools/formattedcolumnvalue.cxx +++ b/connectivity/source/commontools/formattedcolumnvalue.cxx @@ -28,6 +28,8 @@ #include <com/sun/star/util/XNumberFormatTypes.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdb/XColumn.hpp> +#include <com/sun/star/sdb/XColumnUpdate.hpp> #include <tools/diagnose_ex.h> #include <i18nlangtag/mslangid.hxx> diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 8ab930dc2d3f..3458ed7cc34e 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -20,6 +20,7 @@ #include <connectivity/parameters.hxx> #include <com/sun/star/form/DatabaseParameterEvent.hpp> +#include <com/sun/star/form/XDatabaseParameterListener.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> @@ -27,6 +28,8 @@ #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/XInteractionSupplyParameters.hpp> #include <com/sun/star/sdb/ParametersRequest.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/task/XInteractionHandler.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/filtermanager.hxx> diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 57db44200a4e..be04b91a9df1 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/SQLException.hpp> +#include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> diff --git a/connectivity/source/commontools/predicateinput.cxx b/connectivity/source/commontools/predicateinput.cxx index 3b3868c0eb8a..1c8812a8591c 100644 --- a/connectivity/source/commontools/predicateinput.cxx +++ b/connectivity/source/commontools/predicateinput.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/i18n/LocaleData.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/util/NumberFormatter.hpp> #include <osl/diagnose.h> #include <connectivity/sqlnode.hxx> diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index c14608a18db1..0ce4b8a75e40 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdb/ErrorCondition.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/commontools/statementcomposer.cxx b/connectivity/source/commontools/statementcomposer.cxx index 3f5714435689..a6d6c1155925 100644 --- a/connectivity/source/commontools/statementcomposer.cxx +++ b/connectivity/source/commontools/statementcomposer.cxx @@ -25,7 +25,10 @@ #include <com/sun/star/lang/NullPointerException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <unotools/sharedunocomponent.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/commontools/warningscontainer.cxx b/connectivity/source/commontools/warningscontainer.cxx index 50d706e55f18..65478f9c03ce 100644 --- a/connectivity/source/commontools/warningscontainer.cxx +++ b/connectivity/source/commontools/warningscontainer.cxx @@ -21,6 +21,9 @@ #include <connectivity/warningscontainer.hxx> #include <connectivity/dbexception.hxx> +#include <com/sun/star/sdb/SQLContext.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> + #include <o3tl/any.hxx> #include <osl/diagnose.h> diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index 850b20475507..ef9e0951670e 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -47,6 +47,7 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/typeprovider.hxx> using namespace connectivity; using namespace connectivity::calc; diff --git a/connectivity/source/drivers/component/CResultSet.cxx b/connectivity/source/drivers/component/CResultSet.cxx index 1036a97dcd58..3ac3508f758a 100644 --- a/connectivity/source/drivers/component/CResultSet.cxx +++ b/connectivity/source/drivers/component/CResultSet.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <component/CResultSet.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index f799388c727b..f1c0b2194d09 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <unotools/ucbhelper.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/typeprovider.hxx> #include <connectivity/dbexception.hxx> #include <dbase/DResultSet.hxx> #include <strings.hrc> diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index f635c98312f6..025dbdd0ddb6 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <dbase/DResultSet.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <dbase/DIndex.hxx> diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 4139f35acb24..1f901f363d9b 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -44,6 +44,7 @@ #include <unotools/tempfile.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/queryinterface.hxx> #include <connectivity/PColumn.hxx> diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index aae512bb2b5d..c74751628f84 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -23,6 +23,7 @@ #include "NTables.hxx" #include "NCatalog.hxx" #include <connectivity/sdbcx/VColumn.hxx> +#include <com/sun/star/sdbc/XRow.hpp> using namespace connectivity::sdbcx; using namespace connectivity; diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index f46189857231..1e18b8a1f6cd 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.cxx @@ -23,6 +23,8 @@ #include "NColumns.hxx" #include "NCatalog.hxx" +#include <com/sun/star/sdbc/XRow.hpp> + using namespace connectivity; using namespace ::comphelper; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/file/FDateFunctions.cxx b/connectivity/source/drivers/file/FDateFunctions.cxx index c0e0a77bc645..7d1caa1c9696 100644 --- a/connectivity/source/drivers/file/FDateFunctions.cxx +++ b/connectivity/source/drivers/file/FDateFunctions.cxx @@ -22,6 +22,7 @@ #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/datetime.hxx> +#include <osl/diagnose.h> using namespace connectivity; using namespace connectivity::file; diff --git a/connectivity/source/drivers/firebird/Catalog.cxx b/connectivity/source/drivers/firebird/Catalog.cxx index 7bccd521eaad..7dc3593d577a 100644 --- a/connectivity/source/drivers/firebird/Catalog.cxx +++ b/connectivity/source/drivers/firebird/Catalog.cxx @@ -11,6 +11,8 @@ #include "Tables.hxx" #include "Users.hxx" +#include <com/sun/star/sdbc/XRow.hpp> + using namespace ::connectivity::firebird; using namespace ::com::sun::star; using namespace ::com::sun::star::sdbc; diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index 13bb595d5692..df523235e2ac 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -20,6 +20,7 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> using namespace ::connectivity; using namespace ::connectivity::firebird; diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index be5c3c1230ae..71b41a768e9e 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/sdbcx/XDeleteRows.hpp> #include <flat/EResultSet.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 0a3d56216811..1d4d3baafd63 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -20,6 +20,7 @@ #include <flat/ETable.hxx> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <svl/converter.hxx> #include <flat/EConnection.hxx> @@ -30,6 +31,7 @@ #include <sal/log.hxx> #include <tools/solar.h> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> #include <comphelper/numbers.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 86683d50d822..ec73225d3abd 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> #include <cppuhelper/typeprovider.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 71dae8440da9..ac89a718bbf1 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <cppuhelper/exc_hlp.hxx> #include <tools/diagnose_ex.h> diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index d972bb137cc7..96ff62fd5b6a 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -21,6 +21,7 @@ #include "MacabCatalog.hxx" #include "MacabConnection.hxx" #include "MacabTables.hxx" +#include <com/sun/star/sdbc/XRow.hpp> using namespace connectivity::macab; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 23c95e996c1b..6eaa51aa7906 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -23,6 +23,7 @@ #include "MacabTables.hxx" #include "MacabCatalog.hxx" #include <connectivity/sdbcx/VColumn.hxx> +#include <com/sun/star/sdbc/XRow.hpp> using namespace connectivity::macab; using namespace connectivity::sdbcx; diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index c3bf64203d38..75da75bc1035 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.cxx @@ -22,6 +22,7 @@ #include "MacabTables.hxx" #include "MacabColumns.hxx" #include "MacabCatalog.hxx" +#include <com/sun/star/sdbc/XRow.hpp> using namespace connectivity::macab; using namespace connectivity; diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index a3128846f89d..c70aa87f87d5 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -23,6 +23,7 @@ #include "MacabCatalog.hxx" #include "MacabConnection.hxx" #include <comphelper/types.hxx> +#include <com/sun/star/sdbc/XRow.hpp> using namespace connectivity::macab; using namespace connectivity; diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index 80eb293a5c02..743d1e5ab9c6 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -21,6 +21,8 @@ #include "MConnection.hxx" #include "MTables.hxx" +#include <com/sun/star/sdbc/XRow.hpp> + using namespace connectivity::mork; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index f1b41deae6f9..6b0b70842298 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -18,6 +18,7 @@ */ #include "MColumns.hxx" +#include <com/sun/star/sdbc/XRow.hpp> #include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/dbtools.hxx> diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 95874decdce8..aabfbb79db3b 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -11,6 +11,7 @@ #include "MConnection.hxx" #include <com/sun/star/mozilla/XMozillaBootstrap.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <sal/log.hxx> diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 3ece446530f6..a0bfcf79b3f4 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -21,8 +21,10 @@ #include <com/sun/star/sdbc/FetchDirection.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <connectivity/dbtools.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/typeprovider.hxx> #include <sal/log.hxx> #include <vector> diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 447facf4f879..10bad0a49a40 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -21,6 +21,7 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> #include <comphelper/processfactory.hxx> #include <connectivity/dbexception.hxx> diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 1f9d5f410ebe..3cd7113a8e47 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -23,6 +23,7 @@ #include <comphelper/proparrhlp.hxx> #include <connectivity/sqliterator.hxx> #include <connectivity/sqlparse.hxx> +#include <com/sun/star/sdbc/SQLWarning.hpp> #include <TSortIndex.hxx> #include "MTable.hxx" diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index 3823013457a8..f1f169e2a727 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -22,6 +22,8 @@ #include "MCatalog.hxx" #include <comphelper/types.hxx> +#include <com/sun/star/sdbc/XRow.hpp> + using namespace connectivity; using namespace connectivity::mork; using namespace ::com::sun::star::uno; diff --git a/connectivity/source/drivers/mysql_jdbc/YTable.cxx b/connectivity/source/drivers/mysql_jdbc/YTable.cxx index 6fcaf30f25ae..e1556746c0e1 100644 --- a/connectivity/source/drivers/mysql_jdbc/YTable.cxx +++ b/connectivity/source/drivers/mysql_jdbc/YTable.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> #include <cppuhelper/typeprovider.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> diff --git a/connectivity/source/drivers/postgresql/pq_resultset.cxx b/connectivity/source/drivers/postgresql/pq_resultset.cxx index 85be755818d6..3036543c7988 100644 --- a/connectivity/source/drivers/postgresql/pq_resultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_resultset.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> using osl::MutexGuard; diff --git a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx index eefa362335c8..02030729ad73 100644 --- a/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx +++ b/connectivity/source/drivers/postgresql/pq_sequenceresultset.cxx @@ -40,6 +40,8 @@ #include <connectivity/dbexception.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> + using com::sun::star::sdbc::XResultSetMetaData; using com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/writer/WTable.cxx b/connectivity/source/drivers/writer/WTable.cxx index 75778eb939e7..5e5320540ee4 100644 --- a/connectivity/source/drivers/writer/WTable.cxx +++ b/connectivity/source/drivers/writer/WTable.cxx @@ -29,6 +29,7 @@ #include <writer/WConnection.hxx> #include <connectivity/sdbcx/VColumn.hxx> #include <sal/log.hxx> +#include <cppuhelper/typeprovider.hxx> namespace com { diff --git a/connectivity/source/inc/TKeyValue.hxx b/connectivity/source/inc/TKeyValue.hxx index 5837d0275c4a..abf61a4c7429 100644 --- a/connectivity/source/inc/TKeyValue.hxx +++ b/connectivity/source/inc/TKeyValue.hxx @@ -21,6 +21,7 @@ #include <connectivity/FValue.hxx> #include <connectivity/dbtoolsdllapi.hxx> +#include <osl/diagnose.h> namespace connectivity { diff --git a/connectivity/source/inc/hsqldb/HView.hxx b/connectivity/source/inc/hsqldb/HView.hxx index 6e333bb1081d..a14d75ccfa44 100644 --- a/connectivity/source/inc/hsqldb/HView.hxx +++ b/connectivity/source/inc/hsqldb/HView.hxx @@ -23,6 +23,7 @@ #include <connectivity/sdbcx/VView.hxx> #include <com/sun/star/sdbcx/XAlterView.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/connectivity/source/parse/PColumn.cxx b/connectivity/source/parse/PColumn.cxx index 806a312668e3..1db5ba45da8b 100644 --- a/connectivity/source/parse/PColumn.cxx +++ b/connectivity/source/parse/PColumn.cxx @@ -25,6 +25,9 @@ #include <comphelper/types.hxx> #include <tools/diagnose_ex.h> +#include <com/sun/star/sdbc/XResultSetMetaData.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> + using namespace ::comphelper; using namespace connectivity; using namespace dbtools; diff --git a/connectivity/source/sdbcx/VCatalog.cxx b/connectivity/source/sdbcx/VCatalog.cxx index 85d9ce2b6cd7..b075c9ae0dff 100644 --- a/connectivity/source/sdbcx/VCatalog.cxx +++ b/connectivity/source/sdbcx/VCatalog.cxx @@ -20,8 +20,10 @@ #include <comphelper/types.hxx> #include <connectivity/sdbcx/VCatalog.hxx> #include <connectivity/sdbcx/VCollection.hxx> +#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <connectivity/sdbcx/VDescriptor.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <TConnection.hxx> #include <connectivity/dbtools.hxx> diff --git a/connectivity/source/sdbcx/VCollection.cxx b/connectivity/source/sdbcx/VCollection.cxx index e9a6ab922521..7ccb08c4d21c 100644 --- a/connectivity/source/sdbcx/VCollection.cxx +++ b/connectivity/source/sdbcx/VCollection.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <connectivity/sdbcx/VCollection.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbexception.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/types.hxx> diff --git a/connectivity/source/sdbcx/VColumn.cxx b/connectivity/source/sdbcx/VColumn.cxx index 1b2560e0b415..78b223ef1f74 100644 --- a/connectivity/source/sdbcx/VColumn.cxx +++ b/connectivity/source/sdbcx/VColumn.cxx @@ -19,6 +19,7 @@ #include <connectivity/sdbcx/VColumn.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/sdbcx/VDescriptor.cxx b/connectivity/source/sdbcx/VDescriptor.cxx index 70463eadada5..0be99ce8b164 100644 --- a/connectivity/source/sdbcx/VDescriptor.cxx +++ b/connectivity/source/sdbcx/VDescriptor.cxx @@ -18,7 +18,9 @@ */ #include <connectivity/sdbcx/VDescriptor.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/queryinterface.hxx> +#include <cppuhelper/typeprovider.hxx> #include <algorithm> #include <string.h> diff --git a/connectivity/source/sdbcx/VIndex.cxx b/connectivity/source/sdbcx/VIndex.cxx index 85f87ee23ae8..67fb446b485f 100644 --- a/connectivity/source/sdbcx/VIndex.cxx +++ b/connectivity/source/sdbcx/VIndex.cxx @@ -19,6 +19,7 @@ #include <connectivity/sdbcx/VIndex.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/dbexception.hxx> #include <comphelper/sequence.hxx> diff --git a/connectivity/source/sdbcx/VIndexColumn.cxx b/connectivity/source/sdbcx/VIndexColumn.cxx index d8d48b2ccc79..744ffff5112d 100644 --- a/connectivity/source/sdbcx/VIndexColumn.cxx +++ b/connectivity/source/sdbcx/VIndexColumn.cxx @@ -18,6 +18,7 @@ */ #include <connectivity/sdbcx/VIndexColumn.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/supportsservice.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/sdbcx/VKey.cxx b/connectivity/source/sdbcx/VKey.cxx index 5e61d46f93dc..5a7bc636f7b0 100644 --- a/connectivity/source/sdbcx/VKey.cxx +++ b/connectivity/source/sdbcx/VKey.cxx @@ -19,6 +19,7 @@ #include <connectivity/sdbcx/VKey.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbc/KeyRule.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/connectivity/source/sdbcx/VKeyColumn.cxx b/connectivity/source/sdbcx/VKeyColumn.cxx index 0b1987b7d2d5..fd844bb17b96 100644 --- a/connectivity/source/sdbcx/VKeyColumn.cxx +++ b/connectivity/source/sdbcx/VKeyColumn.cxx @@ -18,6 +18,7 @@ */ #include <connectivity/sdbcx/VKeyColumn.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <cppuhelper/supportsservice.hxx> #include <TConnection.hxx> diff --git a/connectivity/source/sdbcx/VTable.cxx b/connectivity/source/sdbcx/VTable.cxx index 371a28ecf54e..db60d4a0e928 100644 --- a/connectivity/source/sdbcx/VTable.cxx +++ b/connectivity/source/sdbcx/VTable.cxx @@ -19,6 +19,7 @@ #include <connectivity/sdbcx/VTable.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <connectivity/sdbcx/VIndex.hxx> #include <comphelper/sequence.hxx> #include <connectivity/sdbcx/VCollection.hxx> diff --git a/connectivity/source/sdbcx/VView.cxx b/connectivity/source/sdbcx/VView.cxx index 97394fbea8b0..08c41a6f7934 100644 --- a/connectivity/source/sdbcx/VView.cxx +++ b/connectivity/source/sdbcx/VView.cxx @@ -19,6 +19,7 @@ #include <connectivity/sdbcx/VView.hxx> #include <com/sun/star/lang/DisposedException.hpp> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <TConnection.hxx> diff --git a/dbaccess/source/core/api/CacheSet.cxx b/dbaccess/source/core/api/CacheSet.cxx index 6d230f9361c4..dcfdb71266ff 100644 --- a/dbaccess/source/core/api/CacheSet.cxx +++ b/dbaccess/source/core/api/CacheSet.cxx @@ -40,6 +40,7 @@ #include <comphelper/types.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> using namespace comphelper; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 265193ee9e8a..a24cbc0c740a 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -22,6 +22,7 @@ #include <FilteredContainer.hxx> #include <RefreshListener.hxx> #include <sdbcoretools.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index bb9bf49629ef..0744d7fcff5d 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -31,6 +31,7 @@ #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index f08da5e73fa6..a7d857283986 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -25,9 +25,11 @@ #include <stringconstants.hxx> #include <sdbcoretools.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdb/tools/XTableAlteration.hpp> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 5f7926ce34c0..8a127d4137a1 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index bb15f191e67e..45deb996e762 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> +#include <com/sun/star/sdb/SQLContext.hpp> #include <comphelper/types.hxx> #include <comphelper/property.hxx> diff --git a/dbaccess/source/core/api/resultcolumn.cxx b/dbaccess/source/core/api/resultcolumn.cxx index 863a517baf08..9e2205a512a2 100644 --- a/dbaccess/source/core/api/resultcolumn.cxx +++ b/dbaccess/source/core/api/resultcolumn.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/XRow.hpp> #include <cppuhelper/typeprovider.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 6698429bc03e..4900f9b42aaa 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_RESULTCOLUMN_HXX #include <com/sun/star/sdbc/XResultSetMetaData.hpp> +#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <column.hxx> #include <boost/optional.hpp> #include <comphelper/proparrhlp.hxx> diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 67ab680ebb68..715f4465ff22 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -23,6 +23,7 @@ #include <apitools.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index aaff69dada25..7cc74ed3ef6e 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -22,6 +22,7 @@ #include <stringconstants.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 348c61ded3ac..ea0055404d64 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -29,12 +29,16 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> #include <comphelper/types.hxx> +#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/util/XRefreshListener.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> +#include <com/sun/star/sdb/tools/XTableRename.hpp> +#include <com/sun/star/sdb/tools/XTableAlteration.hpp> #include <connectivity/TKeys.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index 3ffea254068e..01336a5e3327 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index a17325b2e1e8..e5537da68843 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -43,6 +43,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/sdb/tools/XConnectionTools.hpp> #include <com/sun/star/sdb/application/XTableUIProvider.hpp> +#include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <cppuhelper/implbase13.hxx> #include <connectivity/ConnectionWrapper.hxx> diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index a60a45a30ad1..a1cd45ca094d 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -31,6 +31,7 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index b7683f30e709..f057b378d9a8 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -25,6 +25,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/container/XChild.hpp> #include <comphelper/IdPropArrayHelper.hxx> diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index c9da195f50e2..760f1664a0a8 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -32,6 +32,7 @@ #include <connectivity/sqlerror.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <memory> diff --git a/dbaccess/source/ui/browser/dsbrowserDnD.cxx b/dbaccess/source/ui/browser/dsbrowserDnD.cxx index 9ff5ce15e2b5..2d282cf671fa 100644 --- a/dbaccess/source/ui/browser/dsbrowserDnD.cxx +++ b/dbaccess/source/ui/browser/dsbrowserDnD.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/sdb/CommandType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/ui/control/TableGrantCtrl.cxx b/dbaccess/source/ui/control/TableGrantCtrl.cxx index cf2ca669e4f3..7983d64b3c09 100644 --- a/dbaccess/source/ui/control/TableGrantCtrl.cxx +++ b/dbaccess/source/ui/control/TableGrantCtrl.cxx @@ -19,12 +19,14 @@ #include <TableGrantCtrl.hxx> #include <core_resource.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> #include <com/sun/star/sdbcx/PrivilegeObject.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> #include <vcl/svapp.hxx> +#include <osl/diagnose.h> #include <strings.hrc> #include <UITools.hxx> diff --git a/dbaccess/source/ui/dlg/RelationDlg.cxx b/dbaccess/source/ui/dlg/RelationDlg.cxx index 99dc63bbdb96..31a672f79454 100644 --- a/dbaccess/source/ui/dlg/RelationDlg.cxx +++ b/dbaccess/source/ui/dlg/RelationDlg.cxx @@ -24,6 +24,7 @@ #include <vcl/svapp.hxx> #include <dbu_dlg.hxx> #include <com/sun/star/sdbc/KeyRule.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index c35e2033c52d..167ebdfde4f8 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -20,6 +20,7 @@ #include "UserAdmin.hxx" #include <UITools.hxx> #include <dbu_dlg.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> diff --git a/dbaccess/source/ui/dlg/UserAdminDlg.cxx b/dbaccess/source/ui/dlg/UserAdminDlg.cxx index 0b518d9ef6bd..9b30dcaa750a 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -28,6 +28,8 @@ #include "UserAdmin.hxx" #include <UserAdminDlg.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> + #include <connectivity/dbmetadata.hxx> #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/ui/dlg/queryfilter.cxx b/dbaccess/source/ui/dlg/queryfilter.cxx index 3c1d78050f28..7f05fda7f8ec 100644 --- a/dbaccess/source/ui/dlg/queryfilter.cxx +++ b/dbaccess/source/ui/dlg/queryfilter.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdb/SQLFilterOperator.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/dlg/queryorder.cxx b/dbaccess/source/ui/dlg/queryorder.cxx index 9ee58ca2af2b..1bd9d3692591 100644 --- a/dbaccess/source/ui/dlg/queryorder.cxx +++ b/dbaccess/source/ui/dlg/queryorder.cxx @@ -24,6 +24,7 @@ #include <stringconstants.hxx> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <tools/debug.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/ui/inc/querycontroller.hxx b/dbaccess/source/ui/inc/querycontroller.hxx index 3f6df60719e8..00a005046991 100644 --- a/dbaccess/source/ui/inc/querycontroller.hxx +++ b/dbaccess/source/ui/inc/querycontroller.hxx @@ -26,6 +26,7 @@ #include <svx/ParseContext.hxx> #include "TableFieldDescription.hxx" +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XObjectInputStream.hpp> #include <com/sun/star/io/XObjectOutputStream.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 75fc8e27cc50..23dc9ddb2ff0 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -25,6 +25,7 @@ #include <svtools/imgdef.hxx> #include <vcl/event.hxx> #include <vcl/settings.hxx> +#include <osl/diagnose.h> namespace dbaui { diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx index f96751c0a07b..76528eec7ff2 100644 --- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx +++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/tools/XConnectionTools.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> diff --git a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx index e07197ff734a..107525100687 100644 --- a/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx +++ b/dbaccess/source/ui/relationdesign/RTableConnectionData.cxx @@ -33,6 +33,7 @@ #include <core_resource.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> +#include <osl/diagnose.h> using namespace dbaui; using namespace ::com::sun::star::sdbc; diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 233120cc6f37..ad1cbb401eee 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -23,6 +23,7 @@ #include <browserids.hxx> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> diff --git a/dbaccess/source/ui/tabledesign/TEditControl.cxx b/dbaccess/source/ui/tabledesign/TEditControl.cxx index 97e78c6b7103..7f5297268be5 100644 --- a/dbaccess/source/ui/tabledesign/TEditControl.cxx +++ b/dbaccess/source/ui/tabledesign/TEditControl.cxx @@ -18,6 +18,7 @@ */ #include "TEditControl.hxx" +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XAlterTable.hpp> diff --git a/dbaccess/source/ui/uno/unosqlmessage.cxx b/dbaccess/source/ui/uno/unosqlmessage.cxx index ef6c755c2bc9..620e10a86816 100644 --- a/dbaccess/source/ui/uno/unosqlmessage.cxx +++ b/dbaccess/source/ui/uno/unosqlmessage.cxx @@ -30,6 +30,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> using namespace dbaui; using namespace dbtools; diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx index af0430e09352..b1d7dac8d267 100644 --- a/extensions/source/bibliography/datman.cxx +++ b/extensions/source/bibliography/datman.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdb/XCompletedConnection.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/form/ListSourceType.hpp> #include <com/sun/star/form/XLoadable.hpp> diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx index 89800e43ea66..760999d6e3f0 100644 --- a/extensions/source/dbpilots/commonpagesdbp.cxx +++ b/extensions/source/dbpilots/commonpagesdbp.cxx @@ -40,6 +40,7 @@ #include <unotools/pathoptions.hxx> #include <sfx2/filedlghelper.hxx> #include <svl/filenotation.hxx> +#include <osl/diagnose.h> namespace dbp { diff --git a/extensions/source/dbpilots/controlwizard.cxx b/extensions/source/dbpilots/controlwizard.cxx index 3b7928cb3556..eca18774260a 100644 --- a/extensions/source/dbpilots/controlwizard.cxx +++ b/extensions/source/dbpilots/controlwizard.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/sdbc/DataType.hpp> #include <tools/urlobj.hxx> #include <vcl/layout.hxx> +#include <osl/diagnose.h> #define WINDOW_SIZE_X 240 #define WINDOW_SIZE_Y 185 diff --git a/extensions/source/dbpilots/listcombowizard.cxx b/extensions/source/dbpilots/listcombowizard.cxx index 491eda019fa1..537d2e35b820 100644 --- a/extensions/source/dbpilots/listcombowizard.cxx +++ b/extensions/source/dbpilots/listcombowizard.cxx @@ -29,6 +29,7 @@ #include <connectivity/dbtools.hxx> #include <helpids.h> #include <sal/log.hxx> +#include <osl/diagnose.h> namespace dbp diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx index 99f43e25d2c2..5db86e93d7a8 100644 --- a/forms/source/component/Filter.cxx +++ b/forms/source/component/Filter.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdb/ErrorMessageDialog.hpp> #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> diff --git a/forms/source/component/FormComponent.cxx b/forms/source/component/FormComponent.cxx index 87bfa6c13bc8..4ab830b7f5a4 100644 --- a/forms/source/component/FormComponent.cxx +++ b/forms/source/component/FormComponent.cxx @@ -36,6 +36,7 @@ #include <com/sun/star/sdb/XRowSetSupplier.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/util/VetoException.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 77e361b3bf13..d6857dcfdcf8 100644 --- a/forms/source/component/ListBox.cxx +++ b/forms/source/component/ListBox.cxx @@ -33,6 +33,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> #include <com/sun/star/sdb/XQueriesSupplier.hpp> +#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx index c3fd30b7b262..adb5cf877f79 100644 --- a/forms/source/runtime/formoperations.cxx +++ b/forms/source/runtime/formoperations.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/sdb/OrderDialog.hpp> #include <com/sun/star/sdb/FilterDialog.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/form/XReset.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 3f2140512c76..44f5cdf17b70 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -584,3 +584,89 @@ blacklist: include/basic/sberrors.hxx: # Needed for macro defines - vcl/errcode.hxx + include/connectivity/BlobHelper.hxx: + # base class has to be a complete type + - com/sun/star/sdbc/XBlob.hpp + include/connectivity/CommonTools.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertySet.hpp + - com/sun/star/sdbcx/XColumnsSupplier.hpp + # Needed for macro defines + - cppuhelper/supportsservice.hxx + include/connectivity/ConnectionWrapper.hxx: + # base class has to be a complete type + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/lang/XServiceInfo.hpp + include/connectivity/conncleanup.hxx: + # base class has to be a complete type + - com/sun/star/beans/XPropertyChangeListener.hpp + - com/sun/star/sdbc/XRowSetListener.hpp + include/connectivity/parameters.hxx: + # base class has to be a complete type + - com/sun/star/sdb/XSingleSelectQueryComposer.hpp + include/connectivity/paramwrapper.hxx: + # base class has to be a complete type + - com/sun/star/container/XEnumerationAccess.hpp + - com/sun/star/container/XIndexAccess.hpp + include/connectivity/sdbcx/VCollection.hxx: + # base class has to be a complete type + - com/sun/star/container/XNameAccess.hpp + - com/sun/star/container/XIndexAccess.hpp + - com/sun/star/container/XEnumerationAccess.hpp + - com/sun/star/container/XContainer.hpp + - com/sun/star/sdbc/XColumnLocate.hpp + - com/sun/star/util/XRefreshable.hpp + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp + - com/sun/star/sdbcx/XAppend.hpp + - com/sun/star/sdbcx/XDrop.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/beans/XPropertySet.hpp + include/connectivity/sdbcx/VCatalog.hxx: + # base class has to be a complete type + - com/sun/star/sdbcx/XTablesSupplier.hpp + - com/sun/star/sdbcx/XViewsSupplier.hpp + - com/sun/star/sdbcx/XUsersSupplier.hpp + - com/sun/star/sdbcx/XGroupsSupplier.hpp + - com/sun/star/lang/XServiceInfo.hpp + include/connectivity/sdbcx/VColumn.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp + include/connectivity/sdbcx/VGroup.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sdbcx/XAuthorizable.hpp + - com/sun/star/sdbcx/XUsersSupplier.hpp + include/connectivity/sdbcx/VIndex.hxx: + # base class has to be a complete type + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp + include/connectivity/sdbcx/VKey.hxx: + # base class has to be a complete type + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp + include/connectivity/sdbcx/VTypeDef.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sdbcx/XColumnsSupplier.hpp + include/connectivity/sdbcx/VTable.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sdbcx/XAlterTable.hpp + - com/sun/star/sdbcx/XColumnsSupplier.hpp + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp + - com/sun/star/sdbcx/XIndexesSupplier.hpp + - com/sun/star/sdbcx/XKeysSupplier.hpp + - com/sun/star/sdbcx/XRename.hpp + include/connectivity/sdbcx/VUser.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/sdbcx/XGroupsSupplier.hpp + - com/sun/star/sdbcx/XUser.hpp + include/connectivity/sdbcx/VView.hxx: + # base class has to be a complete type + - com/sun/star/container/XNamed.hpp + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/sdbcx/XDataDescriptorFactory.hpp diff --git a/include/connectivity/CommonTools.hxx b/include/connectivity/CommonTools.hxx index bfa0fb36d8ec..f9cd35155dd2 100644 --- a/include/connectivity/CommonTools.hxx +++ b/include/connectivity/CommonTools.hxx @@ -26,24 +26,16 @@ #include <rtl/ref.hxx> #include <rtl/ustring.hxx> -#include <com/sun/star/lang/DisposedException.hpp> #include <vector> #include <cppuhelper/weakref.hxx> #include <comphelper/stl_types.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <osl/interlck.h> -#include <com/sun/star/uno/XComponentContext.hpp> #include <connectivity/dbtoolsdllapi.hxx> #include <cppuhelper/supportsservice.hxx> #include <salhelper/simplereferenceobject.hxx> -namespace com { namespace sun { namespace star { namespace util { - struct Date; - struct DateTime; - struct Time; -} -}}} +namespace com::sun::star::uno { class XComponentContext; } #if HAVE_FEATURE_JAVA namespace jvmaccess { class VirtualMachine; } diff --git a/include/connectivity/ConnectionWrapper.hxx b/include/connectivity/ConnectionWrapper.hxx index 14bc9e88d8c7..0d6132ae02b9 100644 --- a/include/connectivity/ConnectionWrapper.hxx +++ b/include/connectivity/ConnectionWrapper.hxx @@ -22,13 +22,14 @@ #include <cppuhelper/implbase2.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <connectivity/CommonTools.hxx> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::uno { class XComponentContext; } + namespace connectivity { diff --git a/include/connectivity/DriversConfig.hxx b/include/connectivity/DriversConfig.hxx index 342742597f58..a415f42cb665 100644 --- a/include/connectivity/DriversConfig.hxx +++ b/include/connectivity/DriversConfig.hxx @@ -23,7 +23,6 @@ #include <map> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/uno/Sequence.h> #include <connectivity/dbtoolsdllapi.hxx> #include <salhelper/singletonref.hxx> diff --git a/include/connectivity/FValue.hxx b/include/connectivity/FValue.hxx index 86a94273d352..a06fa627a199 100644 --- a/include/connectivity/FValue.hxx +++ b/include/connectivity/FValue.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/uno/Any.hxx> #include <rtl/ustring.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <osl/diagnose.h> #include <rtl/ref.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/CommonTools.hxx> @@ -32,8 +31,9 @@ #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdb/XColumn.hpp> + +namespace com::sun::star::sdb { class XColumn; } +namespace com::sun::star::sdbc { class XRow; } namespace connectivity { diff --git a/include/connectivity/IParseContext.hxx b/include/connectivity/IParseContext.hxx index 46601b5f75db..51171281da1f 100644 --- a/include/connectivity/IParseContext.hxx +++ b/include/connectivity/IParseContext.hxx @@ -21,9 +21,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/lang/Locale.hpp> -#include <connectivity/dbtoolsdllapi.hxx> - -namespace connectivity { class OSQLParseNode; } namespace connectivity { diff --git a/include/connectivity/PColumn.hxx b/include/connectivity/PColumn.hxx index 90c40227fd4d..7442ad1b0b8a 100644 --- a/include/connectivity/PColumn.hxx +++ b/include/connectivity/PColumn.hxx @@ -27,11 +27,12 @@ #include <connectivity/sdbcx/VColumn.hxx> #include <connectivity/CommonTools.hxx> #include <rtl/ref.hxx> -#include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <comphelper/proparrhlp.hxx> +namespace com::sun::star::container { class XNameAccess; } +namespace com::sun::star::sdbc { class XDatabaseMetaData; } +namespace com::sun::star::sdbc { class XResultSetMetaData; } + namespace connectivity { namespace parse diff --git a/include/connectivity/SQLStatementHelper.hxx b/include/connectivity/SQLStatementHelper.hxx index 19e5ce8bd734..027105ff7cc7 100644 --- a/include/connectivity/SQLStatementHelper.hxx +++ b/include/connectivity/SQLStatementHelper.hxx @@ -21,9 +21,11 @@ #define INCLUDED_CONNECTIVITY_SQLSTATEMENTHELPER_HXX #include <connectivity/dbtoolsdllapi.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/ustrbuf.hxx> +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace dbtools { class OOO_DLLPUBLIC_DBTOOLS ISQLStatementHelper diff --git a/include/connectivity/TColumnsHelper.hxx b/include/connectivity/TColumnsHelper.hxx index b45cd4ed9aa0..f4249cb34bfe 100644 --- a/include/connectivity/TColumnsHelper.hxx +++ b/include/connectivity/TColumnsHelper.hxx @@ -22,8 +22,6 @@ #include <memory> #include <connectivity/sdbcx/VCollection.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/dbtoolsdllapi.hxx> namespace connectivity diff --git a/include/connectivity/TIndex.hxx b/include/connectivity/TIndex.hxx index a7c3e731ccb1..72241e3a316a 100644 --- a/include/connectivity/TIndex.hxx +++ b/include/connectivity/TIndex.hxx @@ -22,7 +22,6 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VIndex.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { diff --git a/include/connectivity/TIndexes.hxx b/include/connectivity/TIndexes.hxx index b08f65c8e7fc..4f3a093056ed 100644 --- a/include/connectivity/TIndexes.hxx +++ b/include/connectivity/TIndexes.hxx @@ -22,7 +22,6 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VCollection.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { diff --git a/include/connectivity/TKey.hxx b/include/connectivity/TKey.hxx index 3fc9ba1f8b46..204a72e23e6e 100644 --- a/include/connectivity/TKey.hxx +++ b/include/connectivity/TKey.hxx @@ -22,7 +22,6 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VKey.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> namespace connectivity { diff --git a/include/connectivity/TKeyColumns.hxx b/include/connectivity/TKeyColumns.hxx index c77a35cb32a9..b2653a8a2be9 100644 --- a/include/connectivity/TKeyColumns.hxx +++ b/include/connectivity/TKeyColumns.hxx @@ -21,11 +21,11 @@ #define INCLUDED_CONNECTIVITY_TKEYCOLUMNS_HXX #include <connectivity/sdbcx/VCollection.hxx> -#include <connectivity/TKey.hxx> #include <connectivity/dbtoolsdllapi.hxx> namespace connectivity { + class OTableKeyHelper; class OOO_DLLPUBLIC_DBTOOLS OKeyColumnsHelper : public connectivity::sdbcx::OCollection { OTableKeyHelper* m_pKey; diff --git a/include/connectivity/TKeys.hxx b/include/connectivity/TKeys.hxx index 1b78a88e85a6..ae226b874416 100644 --- a/include/connectivity/TKeys.hxx +++ b/include/connectivity/TKeys.hxx @@ -21,12 +21,11 @@ #define INCLUDED_CONNECTIVITY_TKEYS_HXX #include <connectivity/sdbcx/VCollection.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <connectivity/TTableHelper.hxx> #include <connectivity/dbtoolsdllapi.hxx> namespace connectivity { + class OTableHelper; typedef sdbcx::OCollection OKeys_BASE; class OOO_DLLPUBLIC_DBTOOLS OKeysHelper : public OKeys_BASE { diff --git a/include/connectivity/TTableHelper.hxx b/include/connectivity/TTableHelper.hxx index 54d941421860..ba32ba7e9b80 100644 --- a/include/connectivity/TTableHelper.hxx +++ b/include/connectivity/TTableHelper.hxx @@ -27,11 +27,13 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sdbcx/VTable.hxx> -#include <connectivity/sdbcx/VKey.hxx> -#include <com/sun/star/sdb/tools/XTableRename.hpp> -#include <com/sun/star/sdb/tools/XTableAlteration.hpp> -#include <com/sun/star/sdb/tools/XKeyAlteration.hpp> -#include <com/sun/star/sdb/tools/XIndexAlteration.hpp> + +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::sdb::tools { class XIndexAlteration; } +namespace com::sun::star::sdb::tools { class XKeyAlteration; } +namespace com::sun::star::sdb::tools { class XTableAlteration; } +namespace com::sun::star::sdb::tools { class XTableRename; } +namespace connectivity::sdbcx { struct KeyProperties; } namespace connectivity { diff --git a/include/connectivity/conncleanup.hxx b/include/connectivity/conncleanup.hxx index 9ef3d2af5aaa..c7966e2fbd98 100644 --- a/include/connectivity/conncleanup.hxx +++ b/include/connectivity/conncleanup.hxx @@ -21,12 +21,15 @@ #define INCLUDED_CONNECTIVITY_CONNCLEANUP_HXX #include <cppuhelper/implbase.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/beans/XPropertyChangeListener.hpp> +#include <com/sun/star/sdbc/XRowSetListener.hpp> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::sdbc { class XRowSet; } +namespace com::sun::star::sdbc { class XConnection; } + namespace dbtools { diff --git a/include/connectivity/dbcharset.hxx b/include/connectivity/dbcharset.hxx index a4a4abe43a33..79e8c8ec48cf 100644 --- a/include/connectivity/dbcharset.hxx +++ b/include/connectivity/dbcharset.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> -#include <cstddef> #include <set> #include <rtl/textenc.h> diff --git a/include/connectivity/dbconversion.hxx b/include/connectivity/dbconversion.hxx index 270aea7b86da..5991682f7dfe 100644 --- a/include/connectivity/dbconversion.hxx +++ b/include/connectivity/dbconversion.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_CONNECTIVITY_DBCONVERSION_HXX #define INCLUDED_CONNECTIVITY_DBCONVERSION_HXX -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/util/Date.hpp> -#include <com/sun/star/uno/Reference.hxx> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::uno { template <typename > class Reference; } + namespace com { namespace sun @@ -40,10 +40,6 @@ namespace com class XColumn; class XColumnUpdate; } - namespace sdbc - { - class SQLException; - } namespace beans { class XPropertySet; diff --git a/include/connectivity/dbexception.hxx b/include/connectivity/dbexception.hxx index 729ca3cb80f0..e1335591fc94 100644 --- a/include/connectivity/dbexception.hxx +++ b/include/connectivity/dbexception.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX #define INCLUDED_CONNECTIVITY_DBEXCEPTION_HXX -#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/standardsqlstate.hxx> #include <connectivity/dbtoolsdllapi.hxx> +#include <com/sun/star/uno/Reference.hxx> namespace com { @@ -38,6 +38,7 @@ namespace com namespace sdbc { class SQLWarning; + class SQLException; } } } diff --git a/include/connectivity/dbmetadata.hxx b/include/connectivity/dbmetadata.hxx index 1d5b13935293..21c8d63013c6 100644 --- a/include/connectivity/dbmetadata.hxx +++ b/include/connectivity/dbmetadata.hxx @@ -20,12 +20,13 @@ #ifndef INCLUDED_CONNECTIVITY_DBMETADATA_HXX #define INCLUDED_CONNECTIVITY_DBMETADATA_HXX -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <memory> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::uno { class XComponentContext; } namespace dbtools { diff --git a/include/connectivity/dbtools.hxx b/include/connectivity/dbtools.hxx index d27d4b54c415..7be98eeeef25 100644 --- a/include/connectivity/dbtools.hxx +++ b/include/connectivity/dbtools.hxx @@ -20,20 +20,16 @@ #ifndef INCLUDED_CONNECTIVITY_DBTOOLS_HXX #define INCLUDED_CONNECTIVITY_DBTOOLS_HXX -#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <connectivity/dbexception.hxx> -#include <com/sun/star/sdbc/DataType.hpp> #include <comphelper/stl_types.hxx> #include <unotools/sharedunocomponent.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/FValue.hxx> -#include <tools/stream.hxx> namespace com { namespace sun { namespace star { namespace sdb { class XSingleSelectQueryComposer; - class SQLContext; } namespace sdbcx { class XTablesSupplier; @@ -55,8 +51,6 @@ namespace awt { } namespace lang { struct Locale; - class XMultiServiceFactory; - class WrappedTargetException; } namespace container { class XNameAccess; @@ -74,6 +68,7 @@ namespace task { } } } +class SvStream; namespace dbtools { diff --git a/include/connectivity/filtermanager.hxx b/include/connectivity/filtermanager.hxx index 45b58a6183f9..af9baef396fe 100644 --- a/include/connectivity/filtermanager.hxx +++ b/include/connectivity/filtermanager.hxx @@ -19,15 +19,14 @@ #ifndef INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX #define INCLUDED_CONNECTIVITY_FILTERMANAGER_HXX -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdb/XSQLQueryComposer.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <rtl/ustrbuf.hxx> -#include <vector> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::beans { class XPropertySet; } + namespace dbtools { diff --git a/include/connectivity/formattedcolumnvalue.hxx b/include/connectivity/formattedcolumnvalue.hxx index c8976a83d124..9fdf227edb9e 100644 --- a/include/connectivity/formattedcolumnvalue.hxx +++ b/include/connectivity/formattedcolumnvalue.hxx @@ -20,15 +20,17 @@ #ifndef INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX #define INCLUDED_CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdb/XColumn.hpp> -#include <com/sun/star/sdb/XColumnUpdate.hpp> -#include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> #include <connectivity/dbtoolsdllapi.hxx> +#include <rtl/ustring.hxx> #include <memory> +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::sdbc { class XRowSet; } +namespace com::sun::star::sdb { class XColumn; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace com::sun::star::util { class XNumberFormatter; } + namespace dbtools { struct FormattedColumnValue_Data; diff --git a/include/connectivity/parameters.hxx b/include/connectivity/parameters.hxx index 80efce8689e7..cea765314766 100644 --- a/include/connectivity/parameters.hxx +++ b/include/connectivity/parameters.hxx @@ -22,14 +22,6 @@ #include <map> #include <vector> -#include <com/sun/star/uno/XAggregation.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/form/XDatabaseParameterListener.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/task/XInteractionHandler.hpp> -#include <com/sun/star/sdbc/XParameters.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <connectivity/dbtoolsdllapi.hxx> @@ -37,6 +29,20 @@ #include <unotools/sharedunocomponent.hxx> #include <comphelper/interfacecontainer2.hxx> +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::form { class XDatabaseParameterListener; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::sdbc { class XArray; } +namespace com::sun::star::sdbc { class XBlob; } +namespace com::sun::star::sdbc { class XClob; } +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::sdbc { class XDatabaseMetaData; } +namespace com::sun::star::sdbc { class XParameters; } +namespace com::sun::star::sdbc { class XRef; } +namespace com::sun::star::task { class XInteractionHandler; } +namespace com::sun::star::uno { class XAggregation; } +namespace com::sun::star::uno { class XComponentContext; } namespace dbtools { diff --git a/include/connectivity/paramwrapper.hxx b/include/connectivity/paramwrapper.hxx index 2cbd8bb89bcb..4a68c61dd678 100644 --- a/include/connectivity/paramwrapper.hxx +++ b/include/connectivity/paramwrapper.hxx @@ -23,10 +23,8 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/FValue.hxx> -#include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> #include <comphelper/uno3.hxx> #include <comphelper/broadcasthelper.hxx> @@ -37,6 +35,9 @@ #include <memory> #include <vector> +namespace com::sun::star::sdbc { class XParameters; } +namespace com::sun::star::sdb { class XSingleSelectQueryAnalyzer; } + namespace dbtools { diff --git a/include/connectivity/predicateinput.hxx b/include/connectivity/predicateinput.hxx index 1e83d4ac43a5..3c54284700f4 100644 --- a/include/connectivity/predicateinput.hxx +++ b/include/connectivity/predicateinput.hxx @@ -20,15 +20,17 @@ #ifndef INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX #define INCLUDED_CONNECTIVITY_PREDICATEINPUT_HXX -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/i18n/XLocaleData4.hpp> #include <connectivity/sqlparse.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <com/sun/star/uno/Any.hxx> +namespace com::sun::star::beans { class XPropertySet; } +namespace com::sun::star::i18n { class XLocaleData4; } +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::util { class XNumberFormatter; } + + namespace dbtools { diff --git a/include/connectivity/sdbcx/IRefreshable.hxx b/include/connectivity/sdbcx/IRefreshable.hxx index 5c2105966874..3a9bd9a8c217 100644 --- a/include/connectivity/sdbcx/IRefreshable.hxx +++ b/include/connectivity/sdbcx/IRefreshable.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX #define INCLUDED_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX -#include <connectivity/CommonTools.hxx> #include <connectivity/dbtoolsdllapi.hxx> namespace connectivity diff --git a/include/connectivity/sdbcx/VCatalog.hxx b/include/connectivity/sdbcx/VCatalog.hxx index e39cd11abb22..1cf20e1ce257 100644 --- a/include/connectivity/sdbcx/VCatalog.hxx +++ b/include/connectivity/sdbcx/VCatalog.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VCATALOG_HXX -#include <osl/diagnose.h> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XViewsSupplier.hpp> #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XRow.hpp> #include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <connectivity/CommonTools.hxx> @@ -34,6 +31,11 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <memory> +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::sdbc { class XDatabaseMetaData; } +namespace com::sun::star::sdbc { class XResultSet; } +namespace com::sun::star::sdbc { class XRow; } + namespace connectivity { namespace sdbcx diff --git a/include/connectivity/sdbcx/VCollection.hxx b/include/connectivity/sdbcx/VCollection.hxx index 9bf5e4c54200..be79da04a8b7 100644 --- a/include/connectivity/sdbcx/VCollection.hxx +++ b/include/connectivity/sdbcx/VCollection.hxx @@ -24,10 +24,8 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/sdbcx/XDrop.hpp> @@ -39,6 +37,8 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <memory> +namespace com::sun::star::container { class XEnumeration; } + namespace connectivity { diff --git a/include/connectivity/sdbcx/VDescriptor.hxx b/include/connectivity/sdbcx/VDescriptor.hxx index 61b932c77729..b68689d16035 100644 --- a/include/connectivity/sdbcx/VDescriptor.hxx +++ b/include/connectivity/sdbcx/VDescriptor.hxx @@ -21,9 +21,6 @@ #define INCLUDED_CONNECTIVITY_SDBCX_VDESCRIPTOR_HXX #include <comphelper/propertycontainer.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <cppuhelper/typeprovider.hxx> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/stl_types.hxx> #include <connectivity/dbtoolsdllapi.hxx> diff --git a/include/connectivity/sdbcx/VGroup.hxx b/include/connectivity/sdbcx/VGroup.hxx index 61722d234e2f..ead9a500c6b9 100644 --- a/include/connectivity/sdbcx/VGroup.hxx +++ b/include/connectivity/sdbcx/VGroup.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VGROUP_HXX -#include <memory> -#include <osl/diagnose.h> - - #include <com/sun/star/sdbcx/XUsersSupplier.hpp> #include <com/sun/star/sdbcx/XAuthorizable.hpp> #include <com/sun/star/container/XNamed.hpp> diff --git a/include/connectivity/sdbcx/VIndex.hxx b/include/connectivity/sdbcx/VIndex.hxx index 6cd36f02861f..b4360f7e0805 100644 --- a/include/connectivity/sdbcx/VIndex.hxx +++ b/include/connectivity/sdbcx/VIndex.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VINDEX_HXX -#include <memory> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/container/XNamed.hpp> #include <comphelper/IdPropArrayHelper.hxx> #include <cppuhelper/basemutex.hxx> #include <connectivity/CommonTools.hxx> @@ -31,7 +28,6 @@ #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase1.hxx> namespace connectivity diff --git a/include/connectivity/sdbcx/VKey.hxx b/include/connectivity/sdbcx/VKey.hxx index bafab2761015..6bc6b7df2ecb 100644 --- a/include/connectivity/sdbcx/VKey.hxx +++ b/include/connectivity/sdbcx/VKey.hxx @@ -24,7 +24,6 @@ #include <comphelper/IdPropArrayHelper.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/sdbcx/VTypeDef.hxx> -#include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/IRefreshable.hxx> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> diff --git a/include/connectivity/sdbcx/VTable.hxx b/include/connectivity/sdbcx/VTable.hxx index 0fe70a36e86a..706700f878e9 100644 --- a/include/connectivity/sdbcx/VTable.hxx +++ b/include/connectivity/sdbcx/VTable.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/sdbcx/XAlterTable.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <comphelper/IdPropArrayHelper.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase4.hxx> @@ -35,8 +36,8 @@ #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/dbtoolsdllapi.hxx> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <memory> + +namespace com::sun::star::sdbc { class XDatabaseMetaData; } namespace connectivity { diff --git a/include/connectivity/sdbcx/VUser.hxx b/include/connectivity/sdbcx/VUser.hxx index 2727f167a029..ef488b074ac7 100644 --- a/include/connectivity/sdbcx/VUser.hxx +++ b/include/connectivity/sdbcx/VUser.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VUSER_HXX -#include <memory> -#include <osl/diagnose.h> #include <com/sun/star/sdbcx/XUser.hpp> #include <com/sun/star/sdbcx/XGroupsSupplier.hpp> #include <comphelper/proparrhlp.hxx> diff --git a/include/connectivity/sdbcx/VView.hxx b/include/connectivity/sdbcx/VView.hxx index b81cccd27032..e1a56a9fe85e 100644 --- a/include/connectivity/sdbcx/VView.hxx +++ b/include/connectivity/sdbcx/VView.hxx @@ -20,18 +20,18 @@ #ifndef INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX #define INCLUDED_CONNECTIVITY_SDBCX_VVIEW_HXX -#include <osl/diagnose.h> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <comphelper/proparrhlp.hxx> +#include <com/sun/star/lang/XServiceInfo.hpp> +#include <comphelper/broadcasthelper.hxx> #include <connectivity/CommonTools.hxx> -#include <cppuhelper/interfacecontainer.h> #include <com/sun/star/container/XNamed.hpp> #include <connectivity/sdbcx/VDescriptor.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <comphelper/IdPropArrayHelper.hxx> #include <cppuhelper/implbase.hxx> +namespace com::sun::star::sdbc { class XDatabaseMetaData; } + namespace connectivity { namespace sdbcx diff --git a/include/connectivity/sqlbison_exports.hxx b/include/connectivity/sqlbison_exports.hxx index 662c5045a1ee..4cd68a5974c0 100644 --- a/include/connectivity/sqlbison_exports.hxx +++ b/include/connectivity/sqlbison_exports.hxx @@ -10,9 +10,10 @@ #ifndef INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX #define INCLUDED_CONNECTIVITY_SQLBISON_EXPORTS_HXX -#include <sal/types.h> #include <rtl/ustring.hxx> -#include <connectivity/sqlnode.hxx> + +namespace connectivity { class OSQLParseNode; } +namespace connectivity { class OSQLParser; } OUString ConvertLikeToken(const ::connectivity::OSQLParseNode* pTokenNode, const ::connectivity::OSQLParseNode* pEscapeNode, bool bInternational); int SQLyyparse(); diff --git a/include/connectivity/sqlerror.hxx b/include/connectivity/sqlerror.hxx index b1084959a94b..be1112bda46f 100644 --- a/include/connectivity/sqlerror.hxx +++ b/include/connectivity/sqlerror.hxx @@ -21,7 +21,6 @@ #define INCLUDED_CONNECTIVITY_SQLERROR_HXX #include <com/sun/star/sdbc/SQLException.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <connectivity/dbtoolsdllapi.hxx> #include <boost/optional.hpp> #include <memory> diff --git a/include/connectivity/sqliterator.hxx b/include/connectivity/sqliterator.hxx index f62d6790a63f..f77df204d52c 100644 --- a/include/connectivity/sqliterator.hxx +++ b/include/connectivity/sqliterator.hxx @@ -20,21 +20,19 @@ #define INCLUDED_CONNECTIVITY_SQLITERATOR_HXX #include <connectivity/dbtoolsdllapi.hxx> -#include <connectivity/sqlnode.hxx> #include <connectivity/IParseContext.hxx> -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <connectivity/CommonTools.hxx> #include <rtl/ref.hxx> -#include <cppuhelper/weak.hxx> -#include <map> #include <memory> #include <vector> #include <o3tl/typed_flags_set.hxx> +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::beans { class XPropertySet; } + namespace connectivity { enum class TraversalParts diff --git a/include/connectivity/sqlnode.hxx b/include/connectivity/sqlnode.hxx index 1b5ef59392c3..d6cb4b914890 100644 --- a/include/connectivity/sqlnode.hxx +++ b/include/connectivity/sqlnode.hxx @@ -21,16 +21,15 @@ #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/dbmetadata.hxx> -#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/util/XNumberFormatTypes.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <functional> #include <memory> #include <set> #include <vector> #include <rtl/ustrbuf.hxx> -#include <osl/diagnose.h> + +namespace com::sun::star::lang { struct Locale; } +namespace com::sun::star::sdbc { class SQLException; } +namespace com::sun::star::sdbc { class XDatabaseMetaData; } namespace com { @@ -60,7 +59,6 @@ namespace com namespace connectivity { class OSQLParser; - class OSQLParseNode; class IParseContext; enum class SQLNodeType { Rule, ListRule, CommaListRule, diff --git a/include/connectivity/sqlparse.hxx b/include/connectivity/sqlparse.hxx index cdb92064997e..fc4196ea02b9 100644 --- a/include/connectivity/sqlparse.hxx +++ b/include/connectivity/sqlparse.hxx @@ -20,14 +20,10 @@ #define INCLUDED_CONNECTIVITY_SQLPARSE_HXX #include <memory> -#include <config_features.h> #include <com/sun/star/uno/Reference.h> #include <osl/mutex.hxx> #include <connectivity/sqlnode.hxx> -#include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/i18n/XLocaleData4.hpp> #include <connectivity/IParseContext.hxx> #include <connectivity/dbtoolsdllapi.hxx> #include <connectivity/sqlerror.hxx> @@ -35,6 +31,9 @@ #include <map> +namespace com::sun::star::i18n { class XCharacterClassification; } +namespace com::sun::star::i18n { class XLocaleData4; } + namespace com { namespace sun @@ -49,10 +48,6 @@ namespace com { class XNumberFormatter; } - namespace lang - { - struct Locale; - } } } } @@ -60,7 +55,6 @@ namespace com namespace connectivity { class OSQLScanner; - class SQLError; //= OParseContext diff --git a/include/connectivity/sqlscan.hxx b/include/connectivity/sqlscan.hxx index de0f0faff8f1..2ceac71c9ec1 100644 --- a/include/connectivity/sqlscan.hxx +++ b/include/connectivity/sqlscan.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_CONNECTIVITY_SQLSCAN_HXX #define INCLUDED_CONNECTIVITY_SQLSCAN_HXX -#include <stdarg.h> #include <connectivity/IParseContext.hxx> #include <connectivity/dbtoolsdllapi.hxx> diff --git a/include/connectivity/standardsqlstate.hxx b/include/connectivity/standardsqlstate.hxx index 9ddf0c8bd9d7..2569d3a02583 100644 --- a/include/connectivity/standardsqlstate.hxx +++ b/include/connectivity/standardsqlstate.hxx @@ -20,6 +20,7 @@ #ifndef INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX #define INCLUDED_CONNECTIVITY_STANDARDSQLSTATE_HXX +#include <sal/types.h> namespace dbtools { diff --git a/include/connectivity/statementcomposer.hxx b/include/connectivity/statementcomposer.hxx index e94d95a1a11b..944a4321b12a 100644 --- a/include/connectivity/statementcomposer.hxx +++ b/include/connectivity/statementcomposer.hxx @@ -20,12 +20,15 @@ #ifndef INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX #define INCLUDED_CONNECTIVITY_STATEMENTCOMPOSER_HXX -#include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> +#include <rtl/ustring.hxx> #include <memory> #include <connectivity/dbtoolsdllapi.hxx> +namespace com::sun::star::sdbc { class XConnection; } +namespace com::sun::star::sdb { class XSingleSelectQueryComposer; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace dbtools { diff --git a/include/connectivity/warningscontainer.hxx b/include/connectivity/warningscontainer.hxx index 1a57ed058f95..c5238ecaf533 100644 --- a/include/connectivity/warningscontainer.hxx +++ b/include/connectivity/warningscontainer.hxx @@ -20,11 +20,15 @@ #ifndef INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX #define INCLUDED_CONNECTIVITY_WARNINGSCONTAINER_HXX -#include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> - #include <connectivity/dbtoolsdllapi.hxx> +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::sdbc { class SQLException; } +namespace com::sun::star::sdbc { class SQLWarning; } +namespace com::sun::star::sdbc { class XWarningsSupplier; } +namespace com::sun::star::sdb { class SQLContext; } +namespace com::sun::star::uno { class XInterface; } namespace dbtools { diff --git a/reportdesign/source/core/sdr/formatnormalizer.cxx b/reportdesign/source/core/sdr/formatnormalizer.cxx index 8494732191de..a80fc6c796cd 100644 --- a/reportdesign/source/core/sdr/formatnormalizer.cxx +++ b/reportdesign/source/core/sdr/formatnormalizer.cxx @@ -21,6 +21,7 @@ #include <RptModel.hxx> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/util/XNumberFormatTypes.hpp> diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx index 7efab158ae5b..aa20dc3b1c23 100644 --- a/reportdesign/source/filter/xml/xmlHelper.cxx +++ b/reportdesign/source/filter/xml/xmlHelper.cxx @@ -50,6 +50,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/style/VerticalAlignment.hpp> #include <xmloff/EnumPropertyHdl.hxx> +#include <osl/diagnose.h> #define XML_RPT_ALGINMENT (XML_DB_TYPES_START+1) namespace rptxml diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index 9e5c93bc7ca5..e383152c2dcb 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -42,6 +42,7 @@ #include <com/sun/star/form/binding/XListEntrySink.hpp> #include <com/sun/star/reflection/XInterfaceMethodTypeDescription.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <svx/fmtools.hxx> #include <svl/macitem.hxx> diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx index 49ecccf6a573..6b09746db85f 100644 --- a/sw/source/uibase/dbui/dbmgr.cxx +++ b/sw/source/uibase/dbui/dbmgr.cxx @@ -97,6 +97,7 @@ #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/mail/MailAttachment.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> |