diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-02-23 12:53:38 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2020-02-27 09:05:38 +0100 |
| commit | ca281166ef75a9c52ccd792b8d1f86609ca40c1e (patch) | |
| tree | 46c6c5568292e8747dca84b665228ea591968ba0 /dbaccess | |
| parent | c6aceaa407faf9950675411cc24d0c156fc7d972 (diff) | |
tdf#42949 Fix IWYU warnings in dbaccess/source/*/*hxx
Except for source/ui/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: If3e2a4cea3c44bd26f1c44309c52eae522904ae3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89299
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'dbaccess')
93 files changed, 87 insertions, 208 deletions
diff --git a/dbaccess/IwyuFilter_dbaccess.yaml b/dbaccess/IwyuFilter_dbaccess.yaml new file mode 100644 index 000000000000..2e56f22afaa1 --- /dev/null +++ b/dbaccess/IwyuFilter_dbaccess.yaml @@ -0,0 +1,23 @@ +--- +assumeFilename: dbaccess/source/ui/querydesign/QueryDesignView.cxx +blacklist: + dbaccess/source/inc/dbu_reghelper.hxx: + # Needed for registrationhelper.hxx + - com/sun/star/lang/XSingleServiceFactory.hpp + - com/sun/star/lang/XMultiServiceFactory.hpp + - rtl/ustring.hxx + - cppuhelper/factory.hxx + dbaccess/source/inc/flt_reghelper.hxx: + # Needed for registrationhelper.hxx + - com/sun/star/lang/XSingleServiceFactory.hpp + - com/sun/star/lang/XMultiServiceFactory.hpp + - rtl/ustring.hxx + - cppuhelper/factory.hxx + dbaccess/source/inc/apitools.hxx: + # Needed for macros to work + - com/sun/star/lang/XMultiServiceFactory.hpp + - comphelper/sequence.hxx + - strings.hxx + dbaccess/source/filter/xml/xmlExport.hxx: + # Needed for implicit dtor + - xmloff/txtprmap.hxx diff --git a/dbaccess/inc/dbaccess_slotid.hrc b/dbaccess/inc/dbaccess_slotid.hrc index 9ac775cbf9bd..768887dc0670 100644 --- a/dbaccess/inc/dbaccess_slotid.hrc +++ b/dbaccess/inc/dbaccess_slotid.hrc @@ -20,7 +20,7 @@ #ifndef INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC #define INCLUDED_DBACCESS_INC_DBACCESS_SLOTID_HRC -#include <sfx2/sfxsids.hrc> +#include <svl/solar.hrc> #define SID_INDEXDESIGN ( SID_DBACCESS_START + 0 ) #define SID_DOCUMENT_DATA_SOURCE ( SID_DBACCESS_START + 1 ) diff --git a/dbaccess/source/core/api/BookmarkSet.hxx b/dbaccess/source/core/api/BookmarkSet.hxx index b25a7efe73bc..6567d50b75b6 100644 --- a/dbaccess/source/core/api/BookmarkSet.hxx +++ b/dbaccess/source/core/api/BookmarkSet.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_BOOKMARKSET_HXX #include "CacheSet.hxx" +#include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> namespace dbaccess diff --git a/dbaccess/source/core/api/CacheSet.hxx b/dbaccess/source/core/api/CacheSet.hxx index efdd843250b4..4a671e7c6dfc 100644 --- a/dbaccess/source/core/api/CacheSet.hxx +++ b/dbaccess/source/core/api/CacheSet.hxx @@ -21,13 +21,9 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> -#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdbcx/XRowLocate.hpp> -#include <com/sun/star/sdbcx/XDeleteRows.hpp> -#include <com/sun/star/sdbcx/CompareBookmark.hpp> #include "RowSetRow.hxx" #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/core/api/HelperCollections.cxx b/dbaccess/source/core/api/HelperCollections.cxx index 7ad1ddabfb72..195dd204754f 100644 --- a/dbaccess/source/core/api/HelperCollections.cxx +++ b/dbaccess/source/core/api/HelperCollections.cxx @@ -22,6 +22,8 @@ #include <stringconstants.hxx> #include <strings.hxx> +#include <osl/diagnose.h> + namespace dbaccess { using namespace dbtools; diff --git a/dbaccess/source/core/api/HelperCollections.hxx b/dbaccess/source/core/api/HelperCollections.hxx index dceecbc73158..c2406dc492aa 100644 --- a/dbaccess/source/core/api/HelperCollections.hxx +++ b/dbaccess/source/core/api/HelperCollections.hxx @@ -20,9 +20,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_HELPERCOLLECTIONS_HXX #include <connectivity/sdbcx/VCollection.hxx> -#include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> -#include <connectivity/PColumn.hxx> #include <rtl/ref.hxx> namespace dbaccess diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx index f83ac766237d..e050b23879db 100644 --- a/dbaccess/source/core/api/KeySet.cxx +++ b/dbaccess/source/core/api/KeySet.cxx @@ -27,11 +27,13 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/XPreparedStatement.hpp> #include <com/sun/star/sdbc/XParameters.hpp> +#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XGeneratedResultSet.hpp> #include <com/sun/star/sdbc/XColumnLocate.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <stringconstants.hxx> #include <apitools.hxx> +#include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> diff --git a/dbaccess/source/core/api/KeySet.hxx b/dbaccess/source/core/api/KeySet.hxx index cdf2e5a6946d..c0f034081a62 100644 --- a/dbaccess/source/core/api/KeySet.hxx +++ b/dbaccess/source/core/api/KeySet.hxx @@ -26,7 +26,6 @@ #include <map> #include <vector> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> #include <comphelper/stl_types.hxx> diff --git a/dbaccess/source/core/api/OptimisticSet.hxx b/dbaccess/source/core/api/OptimisticSet.hxx index d64d75a0b8fb..db380d071041 100644 --- a/dbaccess/source/core/api/OptimisticSet.hxx +++ b/dbaccess/source/core/api/OptimisticSet.hxx @@ -25,7 +25,6 @@ #include <connectivity/sqlparse.hxx> #include <connectivity/sqliterator.hxx> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> namespace dbaccess diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index 7e80d5e9ec22..65456a3bdf5d 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -48,6 +48,7 @@ #include <com/sun/star/sdb/XQueriesSupplier.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/XDataSource.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> diff --git a/dbaccess/source/core/api/RowSet.hxx b/dbaccess/source/core/api/RowSet.hxx index a0c7b6fca6d5..effbdb87a8df 100644 --- a/dbaccess/source/core/api/RowSet.hxx +++ b/dbaccess/source/core/api/RowSet.hxx @@ -37,12 +37,9 @@ #include <com/sun/star/sdbc/XResultSetUpdate.hpp> #include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> -#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> #include <com/sun/star/sdb/XCompletedExecution.hpp> -#include <com/sun/star/sdb/RowSetVetoException.hpp> -#include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdb/XRowsChangeBroadcaster.hpp> diff --git a/dbaccess/source/core/api/RowSetBase.cxx b/dbaccess/source/core/api/RowSetBase.cxx index 81ba20a3b7c1..62c0c41723e9 100644 --- a/dbaccess/source/core/api/RowSetBase.cxx +++ b/dbaccess/source/core/api/RowSetBase.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> +#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index f5ca34c20667..e13a79226335 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -35,6 +35,7 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ResultSetConcurrency.hpp> +#include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbcx/CompareBookmark.hpp> #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/Privilege.hpp> diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index e727c72a0d40..082b6522c098 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -20,21 +20,10 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_ROWSETCACHE_HXX #include <connectivity/CommonTools.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbc/XPreparedStatement.hpp> +#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdb/XSingleSelectQueryAnalyzer.hpp> -#include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> -#include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#include <com/sun/star/sdb/XResultSetAccess.hpp> -#include <com/sun/star/sdbc/XRow.hpp> -#include <com/sun/star/sdbc/XColumnLocate.hpp> -#include <com/sun/star/sdbcx/XRowLocate.hpp> -#include <com/sun/star/sdbc/XRowUpdate.hpp> -#include <com/sun/star/sdbc/XResultSetUpdate.hpp> -#include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> -#include <com/sun/star/sdbc/ResultSetType.hpp> -#include <com/sun/star/sdbcx/XDeleteRows.hpp> +#include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include "RowSetRow.hxx" #include "RowSetCacheIterator.hxx" diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index 81f7a549d8a3..e6c5831c51b6 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XResultSetMetaDataSupplier.hpp> #include <com/sun/star/sdbc/XParameters.hpp> @@ -48,6 +49,8 @@ #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> +#include <connectivity/dbtools.hxx> +#include <connectivity/PColumn.hxx> #include <connectivity/predicateinput.hxx> #include <unotools/syslocale.hxx> #include <tools/debug.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index ddc04e4750bd..3bde5a092527 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -20,6 +20,7 @@ #include <string.h> #include <TableDeco.hxx> +#include <apitools.hxx> #include <definitioncolumn.hxx> #include <stringconstants.hxx> #include <core_resource.hxx> diff --git a/dbaccess/source/core/api/WrappedResultSet.hxx b/dbaccess/source/core/api/WrappedResultSet.hxx index 96a82b3780ce..8f0b07953605 100644 --- a/dbaccess/source/core/api/WrappedResultSet.hxx +++ b/dbaccess/source/core/api/WrappedResultSet.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_API_WRAPPEDRESULTSET_HXX #include "CacheSet.hxx" +#include <com/sun/star/sdbcx/XRowLocate.hpp> #include <com/sun/star/sdbc/XRowUpdate.hpp> #include <com/sun/star/sdbc/XResultSetUpdate.hpp> diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index 51ad61d4c0ca..40a83522bd6b 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -19,11 +19,14 @@ #include "query.hxx" #include <stringconstants.hxx> +#include <connectivity/dbexception.hxx> +#include <connectivity/PColumn.hxx> #include <connectivity/warningscontainer.hxx> #include "HelperCollections.hxx" #include <core_resource.hxx> #include <strings.hrc> +#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/queryinterface.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/table.cxx b/dbaccess/source/core/api/table.cxx index 34d7298d82a2..a17398b03378 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -19,6 +19,7 @@ #include <string.h> +#include <apitools.hxx> #include <table.hxx> #include <definitioncolumn.hxx> #include <stringconstants.hxx> diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx index fb14a5f4170c..9a7584125889 100644 --- a/dbaccess/source/core/api/tablecontainer.cxx +++ b/dbaccess/source/core/api/tablecontainer.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <apitools.hxx> #include <tablecontainer.hxx> #include <stringconstants.hxx> #include <table.hxx> diff --git a/dbaccess/source/core/api/viewcontainer.cxx b/dbaccess/source/core/api/viewcontainer.cxx index 32fd35a7b704..6d0aee7258fc 100644 --- a/dbaccess/source/core/api/viewcontainer.cxx +++ b/dbaccess/source/core/api/viewcontainer.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <apitools.hxx> #include <viewcontainer.hxx> #include <stringconstants.hxx> #include <View.hxx> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index ca088bb080fe..a6110bdb2dab 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -23,6 +23,7 @@ #include <osl/diagnose.h> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> #include <definitioncolumn.hxx> diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index fcd6629640cd..c3ddcca6e182 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -32,7 +32,9 @@ #include <ucbhelper/contentidentifier.hxx> #include "myucp_resultset.hxx" #include <com/sun/star/container/XNameContainer.hpp> +#include <cppuhelper/interfacecontainer.hxx> #include <comphelper/servicehelper.hxx> +#include <cppuhelper/typeprovider.hxx> #include <sdbcoretools.hxx> #include <stringconstants.hxx> diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 988d47038d52..2accd7cae25d 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/embed/StorageFactory.hpp> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/frame/theGlobalEventBroadcaster.hpp> +#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> #include <com/sun/star/sdb/BooleanComparisonMode.hpp> #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> diff --git a/dbaccess/source/core/dataaccess/SharedConnection.hxx b/dbaccess/source/core/dataaccess/SharedConnection.hxx index 75a328dfbc87..6121d3d37532 100644 --- a/dbaccess/source/core/dataaccess/SharedConnection.hxx +++ b/dbaccess/source/core/dataaccess/SharedConnection.hxx @@ -20,19 +20,11 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_SHAREDCONNECTION_HXX #include <connectivity/ConnectionWrapper.hxx> -#include <cppuhelper/component.hxx> #include <connectivity/CommonTools.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/sdbc/XWarningsSupplier.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/sdb/XSQLQueryComposerFactory.hpp> -#include <com/sun/star/sdb/XCommandPreparation.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/sdbcx/XViewsSupplier.hpp> -#include <com/sun/star/sdb/XQueriesSupplier.hpp> #include <comphelper/sequence.hxx> namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index a0a88dea9934..352eabfde368 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -31,7 +31,6 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; -using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::osl; using namespace ::comphelper; diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 3827cb28d27e..3b0058a51c82 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -40,6 +40,7 @@ #include <com/sun/star/embed/XTransactionBroadcaster.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/ModuleManager.hpp> +#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XOutputStream.hpp> diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx b/dbaccess/source/core/dataaccess/databasedocument.hxx index 0d4c0196d18b..8adb30c541a1 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.hxx +++ b/dbaccess/source/core/dataaccess/databasedocument.hxx @@ -40,6 +40,7 @@ #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> +#include <com/sun/star/lang/NotInitializedException.hpp> #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/document/XStorageBasedDocument.hpp> diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.hxx b/dbaccess/source/core/dataaccess/databaseregistrations.hxx index 8ab2e36fbce1..5e6680cc3f13 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.hxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_DATABASEREGISTRATIONS_HXX #include <com/sun/star/uno/XAggregation.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index a9944bd6dac0..e8a5f5d6a30a 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -39,6 +39,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> +#include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/sdbc/ConnectionPool.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/sdbc/XDriverManager.hpp> diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index 1926d7e59348..abb9386e2ad1 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -36,7 +36,9 @@ #include <com/sun/star/sdb/ErrorCondition.hpp> #include <comphelper/servicehelper.hxx> #include <comphelper/types.hxx> +#include <cppuhelper/interfacecontainer.hxx> #include <ucbhelper/contentidentifier.hxx> +#include <rtl/ref.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/core/dataaccess/documentcontainer.hxx b/dbaccess/source/core/dataaccess/documentcontainer.hxx index d43896f2db15..cec13d1f185e 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.hxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.hxx @@ -22,10 +22,12 @@ #include <definitioncontainer.hxx> #include <cppuhelper/implbase5.hxx> +#include <connectivity/CommonTools.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/container/XHierarchicalNameContainer.hpp> #include <com/sun/star/container/XHierarchicalName.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> #include <comphelper/propertystatecontainer.hxx> #include <comphelper/proparrhlp.hxx> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 501433e7b3d7..9910d61d8d02 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -31,9 +31,12 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/embed/XStateChangeListener.hpp> +#include <com/sun/star/embed/XEmbeddedObject.hpp> +#include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/sdb/XSubDocument.hpp> #include <com/sun/star/util/XCloseListener.hpp> #include <com/sun/star/container/XHierarchicalName.hpp> +#include <rtl/ref.hxx> namespace comphelper { diff --git a/dbaccess/source/core/inc/ContainerMediator.hxx b/dbaccess/source/core/inc/ContainerMediator.hxx index fdf0edf392a1..8d1bf9d8d752 100644 --- a/dbaccess/source/core/inc/ContainerMediator.hxx +++ b/dbaccess/source/core/inc/ContainerMediator.hxx @@ -21,7 +21,7 @@ #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/basemutex.hxx> diff --git a/dbaccess/source/core/inc/ContentHelper.hxx b/dbaccess/source/core/inc/ContentHelper.hxx index 8e848fee4be6..e78c7bf06be7 100644 --- a/dbaccess/source/core/inc/ContentHelper.hxx +++ b/dbaccess/source/core/inc/ContentHelper.hxx @@ -24,12 +24,8 @@ #include <com/sun/star/beans/XPropertiesChangeNotifier.hpp> #include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/sdbc/XRow.hpp> -#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> diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 9241d181af41..68c066412a20 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -27,13 +27,11 @@ #include <com/sun/star/chart2/XInternalDataProvider.hpp> #include <com/sun/star/chart/XComplexDescriptionAccess.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> -#include <com/sun/star/sdbc/XParameters.hpp> #include <com/sun/star/container/XChild.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propertysetmixin.hxx> -#include <cppuhelper/implementationentry.hxx> #include <connectivity/parameters.hxx> #include <connectivity/filtermanager.hxx> diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index 84bce5c9c724..d86ac74ef7fc 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -20,46 +20,20 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_MODELIMPL_HXX -#include <apitools.hxx> -#include "bookmarkcontainer.hxx" #include "ContentHelper.hxx" #include "documentevents.hxx" -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertyBag.hpp> -#include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> -#include <com/sun/star/document/XEventListener.hpp> -#include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/embed/XTransactionListener.hpp> #include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/lang/NotInitializedException.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/script/XStorageBasedLibraryContainer.hpp> -#include <com/sun/star/sdb/XBookmarksSupplier.hpp> -#include <com/sun/star/sdb/XCompletedConnection.hpp> -#include <com/sun/star/sdb/XFormDocumentsSupplier.hpp> -#include <com/sun/star/sdb/XQueryDefinitionsSupplier.hpp> -#include <com/sun/star/sdb/XReportDocumentsSupplier.hpp> #include <com/sun/star/sdbc/XDataSource.hpp> -#include <com/sun/star/sdbc/XIsolatedConnection.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> -#include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/util/XFlushable.hpp> -#include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/util/XNumberFormatter.hpp> -#include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/solarmutex.hxx> -#include <connectivity/CommonTools.hxx> -#include <cppuhelper/propshlp.hxx> #include <cppuhelper/weakref.hxx> #include <vcl/svapp.hxx> #include <sfx2/docmacromode.hxx> diff --git a/dbaccess/source/core/inc/PropertyForward.hxx b/dbaccess/source/core/inc/PropertyForward.hxx index 94a351b78d10..1b20e76e9c6f 100644 --- a/dbaccess/source/core/inc/PropertyForward.hxx +++ b/dbaccess/source/core/inc/PropertyForward.hxx @@ -22,7 +22,7 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> -#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/dbaccess/source/core/inc/TableDeco.hxx b/dbaccess/source/core/inc/TableDeco.hxx index cd1bb3161c20..f7bec41b9d28 100644 --- a/dbaccess/source/core/inc/TableDeco.hxx +++ b/dbaccess/source/core/inc/TableDeco.hxx @@ -29,10 +29,9 @@ #include <com/sun/star/sdbcx/XRename.hpp> #include <com/sun/star/sdbcx/XAlterTable.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbc/XRow.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <cppuhelper/compbase.hxx> -#include <apitools.hxx> #include "datasettings.hxx" #include "column.hxx" diff --git a/dbaccess/source/core/inc/bookmarkcontainer.hxx b/dbaccess/source/core/inc/bookmarkcontainer.hxx index 400bddcdb092..10da82a6ced3 100644 --- a/dbaccess/source/core/inc/bookmarkcontainer.hxx +++ b/dbaccess/source/core/inc/bookmarkcontainer.hxx @@ -34,9 +34,6 @@ #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/DisposedException.hpp> namespace dbaccess { diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index 75f0895420d3..3744715c7d6f 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -23,32 +23,16 @@ #include "columnsettings.hxx" #include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XObjectInputStream.hpp> -#include <com/sun/star/io/XObjectOutputStream.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/sdbc/XResultSet.hpp> -#include <com/sun/star/sdbcx/XAppend.hpp> -#include <com/sun/star/sdbcx/XDrop.hpp> -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <comphelper/propertycontainer.hxx> -#include <connectivity/CommonTools.hxx> -#include <connectivity/FValue.hxx> #include <connectivity/TColumnsHelper.hxx> #include <connectivity/sdbcx/IRefreshable.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase1.hxx> -#include <cppuhelper/propshlp.hxx> -#include <osl/diagnose.h> namespace dbaccess { diff --git a/dbaccess/source/core/inc/containerapprove.hxx b/dbaccess/source/core/inc/containerapprove.hxx index 5c0582904381..d350470adac0 100644 --- a/dbaccess/source/core/inc/containerapprove.hxx +++ b/dbaccess/source/core/inc/containerapprove.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERAPPROVE_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_CONTAINERAPPROVE_HXX -#include <com/sun/star/uno/XInterface.hpp> +#include <rtl/ustring.hxx> #include <memory> diff --git a/dbaccess/source/core/inc/databasecontext.hxx b/dbaccess/source/core/inc/databasecontext.hxx index 6f5c2cb19d55..209e44ce1c05 100644 --- a/dbaccess/source/core/inc/databasecontext.hxx +++ b/dbaccess/source/core/inc/databasecontext.hxx @@ -28,19 +28,10 @@ #include "ModelImpl.hxx" -#include <com/sun/star/container/ElementExistException.hpp> -#include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/sdb/XDatabaseContext.hpp> -#include <com/sun/star/sdb/XDatabaseEnvironment.hpp> #include <com/sun/star/sdb/XDatabaseRegistrations.hpp> -#include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/uno/XAggregation.hpp> #if HAVE_FEATURE_SCRIPTING @@ -49,7 +40,6 @@ #include <basic/basicmanagerrepository.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> // needed for registration namespace com { namespace sun { namespace star { diff --git a/dbaccess/source/core/inc/datasettings.hxx b/dbaccess/source/core/inc/datasettings.hxx index c2d086173ca7..8b35ad1c0b51 100644 --- a/dbaccess/source/core/inc/datasettings.hxx +++ b/dbaccess/source/core/inc/datasettings.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DATASETTINGS_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_DATASETTINGS_HXX -#include <com/sun/star/beans/Property.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <rtl/ustring.hxx> #include <comphelper/propertystatecontainer.hxx> diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index f057b378d9a8..69d2c3c8490d 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCOLUMN_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_DEFINITIONCOLUMN_HXX -#include <apitools.hxx> #include "column.hxx" #include "columnsettings.hxx" diff --git a/dbaccess/source/core/inc/definitioncontainer.hxx b/dbaccess/source/core/inc/definitioncontainer.hxx index da58ff9daf7d..98a4c3f140a3 100644 --- a/dbaccess/source/core/inc/definitioncontainer.hxx +++ b/dbaccess/source/core/inc/definitioncontainer.hxx @@ -25,24 +25,18 @@ #include <map> #include <vector> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/implbase7.hxx> #include <osl/mutex.hxx> -#include <com/sun/star/container/XChild.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/XVetoableChangeListener.hpp> #include <com/sun/star/container/XContainerApproveBroadcaster.hpp> #include "ContentHelper.hxx" #include "containerapprove.hxx" #include <comphelper/uno3.hxx> -#include <rtl/ref.hxx> -#include <apitools.hxx> namespace dbaccess { diff --git a/dbaccess/source/core/inc/querycomposer.hxx b/dbaccess/source/core/inc/querycomposer.hxx index a512e9745363..1e5ef2ab07ec 100644 --- a/dbaccess/source/core/inc/querycomposer.hxx +++ b/dbaccess/source/core/inc/querycomposer.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCOMPOSER_HXX -#include <connectivity/CommonTools.hxx> #include <com/sun/star/sdb/XSQLQueryComposer.hpp> #include <com/sun/star/sdb/XParametersSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> @@ -28,7 +27,6 @@ #include <cppuhelper/implbase5.hxx> #include <cppuhelper/basemutex.hxx> #include <connectivity/sqliterator.hxx> -#include <connectivity/sqlparse.hxx> #include <apitools.hxx> #include <com/sun/star/sdb/XSingleSelectQueryComposer.hpp> diff --git a/dbaccess/source/core/inc/querycontainer.hxx b/dbaccess/source/core/inc/querycontainer.hxx index c603cd40dbe6..b6797aa91e58 100644 --- a/dbaccess/source/core/inc/querycontainer.hxx +++ b/dbaccess/source/core/inc/querycontainer.hxx @@ -21,27 +21,19 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_INC_QUERYCONTAINER_HXX #include <cppuhelper/implbase5.hxx> -#include <cppuhelper/interfacecontainer.hxx> +#include <connectivity/CommonTools.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XContainer.hpp> -#include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XAppend.hpp> #include <com/sun/star/sdbcx/XDrop.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/container/XContainerApproveListener.hpp> #include "definitioncontainer.hxx" -#include <apitools.hxx> namespace dbtools { diff --git a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx index c98baf9253cf..c5dadce4549d 100644 --- a/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx +++ b/dbaccess/source/core/inc/recovery/dbdocrecovery.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_RECOVERY_DBDOCRECOVERY_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_RECOVERY_DBDOCRECOVERY_HXX -#include <dbaccess/dbaccessdllapi.h> - #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/dbaccess/source/core/inc/sdbcoretools.hxx b/dbaccess/source/core/inc/sdbcoretools.hxx index 72f62194144f..41097c676f58 100644 --- a/dbaccess/source/core/inc/sdbcoretools.hxx +++ b/dbaccess/source/core/inc/sdbcoretools.hxx @@ -20,12 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_SDBCORETOOLS_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_SDBCORETOOLS_HXX -#include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> namespace dbaccess diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 883849c90156..ec851f3b50d6 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -20,17 +20,8 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLE_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_INC_TABLE_HXX -#include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#include <com/sun/star/sdbcx/XIndexesSupplier.hpp> -#include <com/sun/star/sdbcx/XKeysSupplier.hpp> -#include <com/sun/star/sdbcx/XRename.hpp> -#include <com/sun/star/sdbcx/XAlterTable.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/sdbc/XConnection.hpp> -#include <apitools.hxx> #include "datasettings.hxx" #include "column.hxx" #include <connectivity/CommonTools.hxx> diff --git a/dbaccess/source/core/inc/tablecontainer.hxx b/dbaccess/source/core/inc/tablecontainer.hxx index 0374f3e5121b..d2a70af2bfcb 100644 --- a/dbaccess/source/core/inc/tablecontainer.hxx +++ b/dbaccess/source/core/inc/tablecontainer.hxx @@ -26,19 +26,12 @@ #include <cstddef> #include <cppuhelper/implbase1.hxx> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include "FilteredContainer.hxx" -#include <connectivity/warningscontainer.hxx> #include "RefreshListener.hxx" -#include <apitools.hxx> namespace dbaccess { diff --git a/dbaccess/source/core/inc/viewcontainer.hxx b/dbaccess/source/core/inc/viewcontainer.hxx index 4fc2134f7e87..12d7f74805fb 100644 --- a/dbaccess/source/core/inc/viewcontainer.hxx +++ b/dbaccess/source/core/inc/viewcontainer.hxx @@ -27,15 +27,8 @@ #include <cppuhelper/implbase1.hxx> -#include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/util/XRefreshable.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> -#include <com/sun/star/sdb/SQLContext.hpp> #include <com/sun/star/container/XContainerListener.hpp> -#include <apitools.hxx> #include "FilteredContainer.hxx" diff --git a/dbaccess/source/core/misc/ContainerMediator.cxx b/dbaccess/source/core/misc/ContainerMediator.cxx index ac96e77f6a78..30ffb903425e 100644 --- a/dbaccess/source/core/misc/ContainerMediator.cxx +++ b/dbaccess/source/core/misc/ContainerMediator.cxx @@ -22,6 +22,7 @@ #include <PropertyForward.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/sdbcx/XRename.hpp> diff --git a/dbaccess/source/core/recovery/storagestream.hxx b/dbaccess/source/core/recovery/storagestream.hxx index 5d567f314517..6dffdf7a175e 100644 --- a/dbaccess/source/core/recovery/storagestream.hxx +++ b/dbaccess/source/core/recovery/storagestream.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGESTREAM_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_STORAGESTREAM_HXX -#include <dbaccess/dbaccessdllapi.h> - #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> namespace dbaccess { diff --git a/dbaccess/source/core/recovery/storagetextstream.hxx b/dbaccess/source/core/recovery/storagetextstream.hxx index 1bbcc58c8403..5d7c889862e2 100644 --- a/dbaccess/source/core/recovery/storagetextstream.hxx +++ b/dbaccess/source/core/recovery/storagetextstream.hxx @@ -22,6 +22,8 @@ #include "storagestream.hxx" +#include <com/sun/star/uno/XComponentContext.hpp> + #include <memory> namespace dbaccess diff --git a/dbaccess/source/core/recovery/storagexmlstream.hxx b/dbaccess/source/core/recovery/storagexmlstream.hxx index de094ecf2ae4..ca0f3d3433a2 100644 --- a/dbaccess/source/core/recovery/storagexmlstream.hxx +++ b/dbaccess/source/core/recovery/storagexmlstream.hxx @@ -22,8 +22,9 @@ #include "storagestream.hxx" -#include <com/sun/star/xml/sax/Parser.hpp> +#include <com/sun/star/xml/sax/XParser.hpp> #include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <memory> diff --git a/dbaccess/source/core/recovery/subcomponentloader.hxx b/dbaccess/source/core/recovery/subcomponentloader.hxx index a977a4f7eca0..a8f12071f7c1 100644 --- a/dbaccess/source/core/recovery/subcomponentloader.hxx +++ b/dbaccess/source/core/recovery/subcomponentloader.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTLOADER_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTLOADER_HXX -#include <dbaccess/dbaccessdllapi.h> - #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/dbaccess/source/core/recovery/subcomponents.hxx b/dbaccess/source/core/recovery/subcomponents.hxx index aa0b89b47060..029b31c9527c 100644 --- a/dbaccess/source/core/recovery/subcomponents.hxx +++ b/dbaccess/source/core/recovery/subcomponents.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTS_HXX #define INCLUDED_DBACCESS_SOURCE_CORE_RECOVERY_SUBCOMPONENTS_HXX -#include <dbaccess/dbaccessdllapi.h> - #include <com/sun/star/sdb/application/DatabaseObject.hpp> #include <rtl/ustring.hxx> diff --git a/dbaccess/source/filter/hsqldb/alterparser.hxx b/dbaccess/source/filter/hsqldb/alterparser.hxx index 9b0fb011bb5c..710cd3c798c7 100644 --- a/dbaccess/source/filter/hsqldb/alterparser.hxx +++ b/dbaccess/source/filter/hsqldb/alterparser.hxx @@ -10,7 +10,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_ALTERPARSER_HXX #define INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_ALTERPARSER_HXX -#include <rtl/ustrbuf.hxx> +#include <rtl/ustring.hxx> namespace dbahsql { diff --git a/dbaccess/source/filter/hsqldb/hsqlbinarynode.hxx b/dbaccess/source/filter/hsqldb/hsqlbinarynode.hxx index e03a88a72de8..7f57aae24da8 100644 --- a/dbaccess/source/filter/hsqldb/hsqlbinarynode.hxx +++ b/dbaccess/source/filter/hsqldb/hsqlbinarynode.hxx @@ -11,7 +11,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_HSQLBINARYNODE_HXX #include <vector> -#include <cppuhelper/implbase.hxx> #include "rowinputbinary.hxx" #include "columndef.hxx" diff --git a/dbaccess/source/filter/hsqldb/parseschema.hxx b/dbaccess/source/filter/hsqldb/parseschema.hxx index f5fd5259603f..6530eb263041 100644 --- a/dbaccess/source/filter/hsqldb/parseschema.hxx +++ b/dbaccess/source/filter/hsqldb/parseschema.hxx @@ -11,7 +11,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_HSQLDB_PARSECHEMA_HXX #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/sdbc/XConnection.hpp> #include <vector> #include <map> diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.hxx b/dbaccess/source/filter/hsqldb/rowinputbinary.hxx index 10196b679992..b5c50a602431 100644 --- a/dbaccess/source/filter/hsqldb/rowinputbinary.hxx +++ b/dbaccess/source/filter/hsqldb/rowinputbinary.hxx @@ -12,7 +12,6 @@ #include <vector> #include <tools/stream.hxx> -#include <cppuhelper/implbase.hxx> #include <com/sun/star/io/XInputStream.hpp> diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index 7287d4ef4320..3d81a93279a9 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLAUTOSTYLE_HXX #include <xmloff/maptype.hxx> #include <xmloff/xmlaustp.hxx> -#include <xmloff/xmltypes.hxx> -#include <xmloff/xmlprmap.hxx> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 07dcc09ed7f8..7fcb6de52ade 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XChild.hpp> #include "xmlStyleImport.hxx" +#include <osl/diagnose.h> #include <sal/log.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 20c552e42fec..88ef09315520 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONDATA_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 7b2bb478f0c4..c73651e986c1 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLCONNECTIONRESOURCE_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index 4b0ba10c900d..22bb90f76e5d 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATASOURCE_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index bd0506401f14..57157250bdf2 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -32,6 +32,7 @@ #include <xmloff/ProgressBarHelper.hxx> #include "xmlEnums.hxx" #include <stringconstants.hxx> +#include <osl/diagnose.h> #include <rtl/strbuf.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 331f98dd832c..0da571da0d24 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDATABASEDESCRIPTION_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 027274267650..35f642cf35ce 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLDOCUMENTS_HXX #include <xmloff/xmlictxt.hxx> -#include "xmlEnums.hxx" #include <com/sun/star/container/XNameAccess.hpp> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index a1b9a2ed29e7..337163f648db 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -23,18 +23,13 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <osl/diagnose.h> -#include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> +#include <xmloff/maptype.hxx> +#include <xmloff/txtprmap.hxx> #include <xmloff/xmlexp.hxx> -#include <xmloff/xmlimp.hxx> #include <xmloff/xmlexppr.hxx> #include <dsntypes.hxx> #include <comphelper/stl_types.hxx> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 6ffcd44dbc92..e82bf1876354 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLFILEBASEDDATABASE_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 3ed0e3aabfaa..1accf38d9528 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <comphelper/propertysequence.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 758fc6321926..d1dbe0d3730f 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -20,7 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLHIERARCHYCOLLECTION_HXX #include <xmloff/xmlictxt.hxx> -#include "xmlEnums.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 88bc13f74322..e30320fa00de 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameContainer.hpp> +#include <osl/diagnose.h> #include <sal/log.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index 211764b49b1f..bd13072e0f27 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLQUERY_HXX #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLQUERY_HXX -#include <xmloff/xmlictxt.hxx> #include "xmlTable.hxx" namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 41c7186c13c1..4f0378de4345 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -20,8 +20,6 @@ #define INCLUDED_DBACCESS_SOURCE_FILTER_XML_XMLSERVERDATABASE_HXX #include <xmloff/xmlictxt.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index 7027e0f0d4a2..e308f23d5c54 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.cxx @@ -19,6 +19,7 @@ #include "xmlStyleImport.hxx" +#include <xmloff/maptype.hxx> #include <xmloff/nmspmap.hxx> #include <xmloff/xmlnmspe.hxx> #include <xmloff/xmlimppr.hxx> diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index d0a1a4151d63..06c02bf16291 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -22,15 +22,8 @@ #include <rtl/ustring.hxx> #include <xmloff/xmlimp.hxx> -#include <xmloff/xmlictxt.hxx> -#include <xmloff/maptype.hxx> #include <xmloff/prstylei.hxx> #include <xmloff/xmlimppr.hxx> -#include <xmloff/XMLTextMasterPageContext.hxx> -#include <xmloff/XMLTextMasterStylesContext.hxx> -#include <xmloff/contextid.hxx> -#include <xmloff/controlpropertyhdl.hxx> -#include <vector> namespace dbaxml { diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index fb12f83f24ae..92c8fb680ff7 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/propertysequence.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> namespace dbaxml diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index 7025c49b655c..983b7da5f6bf 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -23,16 +23,9 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/document/XExporter.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> -#include <osl/diagnose.h> -#include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> #include <xmloff/xmlimp.hxx> #include <xmloff/xmlprmap.hxx> diff --git a/dbaccess/source/filter/xml/xmlservices.hxx b/dbaccess/source/filter/xml/xmlservices.hxx index 429ac4c20224..3691c472c5f8 100644 --- a/dbaccess/source/filter/xml/xmlservices.hxx +++ b/dbaccess/source/filter/xml/xmlservices.hxx @@ -22,8 +22,6 @@ #include <sal/config.h> -#include <sal/types.h> - extern "C" { void createRegistryInfo_DBContentLoader2(); diff --git a/dbaccess/source/inc/apitools.hxx b/dbaccess/source/inc/apitools.hxx index 3271c35f6fba..72e93b7a98fe 100644 --- a/dbaccess/source/inc/apitools.hxx +++ b/dbaccess/source/inc/apitools.hxx @@ -25,11 +25,8 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/component.hxx> #include <osl/mutex.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <osl/diagnose.h> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/sequence.hxx> -#include <connectivity/CommonTools.hxx> #include <strings.hxx> // OSubComponent - a component which holds a hard ref to its parent diff --git a/dbaccess/source/inc/dbu_reghelper.hxx b/dbaccess/source/inc/dbu_reghelper.hxx index 746b1da6e696..1e105b25dddd 100644 --- a/dbaccess/source/inc/dbu_reghelper.hxx +++ b/dbaccess/source/inc/dbu_reghelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX #define INCLUDED_DBACCESS_SOURCE_INC_DBU_REGHELPER_HXX -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> diff --git a/dbaccess/source/inc/flt_reghelper.hxx b/dbaccess/source/inc/flt_reghelper.hxx index 3760fe30ef40..df43de320be7 100644 --- a/dbaccess/source/inc/flt_reghelper.hxx +++ b/dbaccess/source/inc/flt_reghelper.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX #define INCLUDED_DBACCESS_SOURCE_INC_FLT_REGHELPER_HXX -#include <com/sun/star/registry/XRegistryKey.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> diff --git a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx index 49ee2afae411..7539450095f7 100644 --- a/dbaccess/source/ui/querydesign/limitboxcontroller.hxx +++ b/dbaccess/source/ui/querydesign/limitboxcontroller.hxx @@ -11,6 +11,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_QUERYDESIGN_LIMITBOXCONTROLLER_HXX #include <com/sun/star/lang/XServiceInfo.hpp> +#include <connectivity/CommonTools.hxx> #include <svtools/toolboxcontroller.hxx> #include <rtl/ustring.hxx> #include <vcl/vclptr.hxx> diff --git a/dbaccess/source/ui/uno/ColumnControl.hxx b/dbaccess/source/ui/uno/ColumnControl.hxx index 1c0f7ffbfdbb..d0e96a4ab6bf 100644 --- a/dbaccess/source/ui/uno/ColumnControl.hxx +++ b/dbaccess/source/ui/uno/ColumnControl.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNCONTROL_HXX #define INCLUDED_DBACCESS_SOURCE_UI_UNO_COLUMNCONTROL_HXX +#include <connectivity/CommonTools.hxx> #include <toolkit/controls/unocontrol.hxx> #include <apitools.hxx> diff --git a/dbaccess/source/ui/uno/ColumnModel.hxx b/dbaccess/source/ui/uno/ColumnModel.hxx index f3bbb7aec199..f89b26e91588 100644 --- a/dbaccess/source/ui/uno/ColumnModel.hxx +++ b/dbaccess/source/ui/uno/ColumnModel.hxx @@ -29,6 +29,7 @@ #include <comphelper/broadcasthelper.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/compbase4.hxx> +#include <connectivity/CommonTools.hxx> #include <apitools.hxx> namespace dbaui diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index a94b136199f9..b887469221de 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <comphelper/proparrhlp.hxx> +#include <connectivity/CommonTools.hxx> #include <svtools/genericunodialog.hxx> #include <apitools.hxx> diff --git a/dbaccess/source/ui/uno/dbinteraction.hxx b/dbaccess/source/ui/uno/dbinteraction.hxx index e0c510cbc11a..36e93c202b4b 100644 --- a/dbaccess/source/ui/uno/dbinteraction.hxx +++ b/dbaccess/source/ui/uno/dbinteraction.hxx @@ -21,6 +21,7 @@ #define INCLUDED_DBACCESS_SOURCE_UI_UNO_DBINTERACTION_HXX #include <cppuhelper/implbase.hxx> +#include <connectivity/CommonTools.hxx> #include <apitools.hxx> diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 879a633cc00e..87913b5880ca 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -31,6 +31,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> +#include <connectivity/CommonTools.hxx> #include <svtools/genericunodialog.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index 7e34160c26da..6de19899debd 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -27,6 +27,7 @@ #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <comphelper/proparrhlp.hxx> +#include <connectivity/CommonTools.hxx> namespace dbaui { |