diff options
Diffstat (limited to 'dbaccess/source')
87 files changed, 26 insertions, 91 deletions
diff --git a/dbaccess/source/core/api/CRowSetColumn.cxx b/dbaccess/source/core/api/CRowSetColumn.cxx index 7fff37490a36..ce0016bfbc3a 100644 --- a/dbaccess/source/core/api/CRowSetColumn.cxx +++ b/dbaccess/source/core/api/CRowSetColumn.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdb/XColumn.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#include <comphelper/types.hxx> #include <cppuhelper/typeprovider.hxx> using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/core/api/FilteredContainer.cxx b/dbaccess/source/core/api/FilteredContainer.cxx index 5cb93dd40bf9..ae9cf694e891 100644 --- a/dbaccess/source/core/api/FilteredContainer.cxx +++ b/dbaccess/source/core/api/FilteredContainer.cxx @@ -23,6 +23,7 @@ #include <RefreshListener.hxx> #include <sdbcoretools.hxx> #include <com/sun/star/sdbc/XRow.hpp> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <tools/wldcrd.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/RowSet.cxx b/dbaccess/source/core/api/RowSet.cxx index f7c7f95cdac5..0ce715ed1a8a 100644 --- a/dbaccess/source/core/api/RowSet.cxx +++ b/dbaccess/source/core/api/RowSet.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/uno/XNamingService.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <comphelper/interaction.hxx> #include <comphelper/property.hxx> #include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.cxx b/dbaccess/source/core/api/RowSetCache.cxx index a4b082a21583..4c3f5706935b 100644 --- a/dbaccess/source/core/api/RowSetCache.cxx +++ b/dbaccess/source/core/api/RowSetCache.cxx @@ -43,7 +43,6 @@ #include <comphelper/extract.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/sqliterator.hxx> diff --git a/dbaccess/source/core/api/RowSetCache.hxx b/dbaccess/source/core/api/RowSetCache.hxx index 4a8373d1ee85..08be66c40108 100644 --- a/dbaccess/source/core/api/RowSetCache.hxx +++ b/dbaccess/source/core/api/RowSetCache.hxx @@ -35,8 +35,6 @@ #include <com/sun/star/sdb/XRowSetApproveBroadcaster.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> #include <com/sun/star/sdbcx/XDeleteRows.hpp> -#include <comphelper/propertycontainer.hxx> -#include <comphelper/proparrhlp.hxx> #include "RowSetRow.hxx" #include "RowSetCacheIterator.hxx" diff --git a/dbaccess/source/core/api/RowSetRow.hxx b/dbaccess/source/core/api/RowSetRow.hxx index 673af3d290c5..11337dec7cb6 100644 --- a/dbaccess/source/core/api/RowSetRow.hxx +++ b/dbaccess/source/core/api/RowSetRow.hxx @@ -22,7 +22,6 @@ #include <rtl/ref.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> -#include <comphelper/types.hxx> #include <salhelper/simplereferenceobject.hxx> namespace dbaccess diff --git a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx index e7a7af6870e9..6e0797e55f84 100644 --- a/dbaccess/source/core/api/SingleSelectQueryComposer.cxx +++ b/dbaccess/source/core/api/SingleSelectQueryComposer.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/util/NumberFormatter.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/api/TableDeco.cxx b/dbaccess/source/core/api/TableDeco.cxx index a57883ba2ba2..d2798165b36c 100644 --- a/dbaccess/source/core/api/TableDeco.cxx +++ b/dbaccess/source/core/api/TableDeco.cxx @@ -27,7 +27,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> diff --git a/dbaccess/source/core/api/callablestatement.cxx b/dbaccess/source/core/api/callablestatement.cxx index 64a91cdbcb48..cbf9ad8ab874 100644 --- a/dbaccess/source/core/api/callablestatement.cxx +++ b/dbaccess/source/core/api/callablestatement.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/queryinterface.hxx> -#include <comphelper/property.hxx> #include <stringconstants.hxx> #include <strings.hxx> diff --git a/dbaccess/source/core/api/column.cxx b/dbaccess/source/core/api/column.cxx index fcbd4e9fb456..c344b31c21a6 100644 --- a/dbaccess/source/core/api/column.cxx +++ b/dbaccess/source/core/api/column.cxx @@ -29,10 +29,9 @@ #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/DataType.hpp> -#include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> +#include <comphelper/uno3.hxx> #include <connectivity/TTableHelper.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/api/datasettings.cxx b/dbaccess/source/core/api/datasettings.cxx index ac10ab6c5d8f..37ec588f4de3 100644 --- a/dbaccess/source/core/api/datasettings.cxx +++ b/dbaccess/source/core/api/datasettings.cxx @@ -20,7 +20,6 @@ #include <datasettings.hxx> #include <apitools.hxx> #include <stringconstants.hxx> -#include <comphelper/property.hxx> #include <comphelper/types.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/core/api/preparedstatement.cxx b/dbaccess/source/core/api/preparedstatement.cxx index 69e5138d689a..5f7926ce34c0 100644 --- a/dbaccess/source/core/api/preparedstatement.cxx +++ b/dbaccess/source/core/api/preparedstatement.cxx @@ -24,8 +24,6 @@ #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/dbaccess/source/core/api/query.cxx b/dbaccess/source/core/api/query.cxx index de12b938c00e..6e1eca3faaa5 100644 --- a/dbaccess/source/core/api/query.cxx +++ b/dbaccess/source/core/api/query.cxx @@ -28,8 +28,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/propagg.hxx> -#include <comphelper/sequence.hxx> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/dbaccess/source/core/api/querycontainer.cxx b/dbaccess/source/core/api/querycontainer.cxx index 8215be2e48ce..26bbec26c13d 100644 --- a/dbaccess/source/core/api/querycontainer.cxx +++ b/dbaccess/source/core/api/querycontainer.cxx @@ -36,7 +36,6 @@ #include <osl/diagnose.h> #include <comphelper/uno3.hxx> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> using namespace dbtools; diff --git a/dbaccess/source/core/api/querydescriptor.cxx b/dbaccess/source/core/api/querydescriptor.cxx index 84b4ae657bfa..1ec9a990b97e 100644 --- a/dbaccess/source/core/api/querydescriptor.cxx +++ b/dbaccess/source/core/api/querydescriptor.cxx @@ -22,8 +22,6 @@ #include "querydescriptor.hxx" #include <apitools.hxx> #include <stringconstants.hxx> -#include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> @@ -35,7 +33,6 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; using namespace ::com::sun::star::util; -using namespace ::comphelper; using namespace ::osl; using namespace ::cppu; diff --git a/dbaccess/source/core/api/resultcolumn.hxx b/dbaccess/source/core/api/resultcolumn.hxx index 400838008388..6698429bc03e 100644 --- a/dbaccess/source/core/api/resultcolumn.hxx +++ b/dbaccess/source/core/api/resultcolumn.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <column.hxx> #include <boost/optional.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaccess { diff --git a/dbaccess/source/core/api/resultset.cxx b/dbaccess/source/core/api/resultset.cxx index 4942597e9774..ae663eaf5c84 100644 --- a/dbaccess/source/core/api/resultset.cxx +++ b/dbaccess/source/core/api/resultset.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/typeprovider.hxx> #include <comphelper/property.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/api/statement.cxx b/dbaccess/source/core/api/statement.cxx index 1a63e8b7f99a..aaff69dada25 100644 --- a/dbaccess/source/core/api/statement.cxx +++ b/dbaccess/source/core/api/statement.cxx @@ -22,7 +22,6 @@ #include <stringconstants.hxx> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> -#include <comphelper/sequence.hxx> #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 eec18f7a8952..3590e93613aa 100644 --- a/dbaccess/source/core/api/table.cxx +++ b/dbaccess/source/core/api/table.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <com/sun/star/util/XRefreshListener.hpp> #include <com/sun/star/sdbc/XConnection.hpp> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx index 72dbde0c2e44..41de9c5f995c 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.cxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.cxx @@ -22,7 +22,6 @@ #include <stringconstants.hxx> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/property.hxx> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx index adc7ea3839d5..58f78745a4bc 100644 --- a/dbaccess/source/core/dataaccess/ComponentDefinition.hxx +++ b/dbaccess/source/core/dataaccess/ComponentDefinition.hxx @@ -21,7 +21,6 @@ #define INCLUDED_DBACCESS_SOURCE_CORE_DATAACCESS_COMPONENTDEFINITION_HXX #include <commandbase.hxx> -#include <comphelper/propertycontainer.hxx> #include <com/sun/star/sdbcx/XRename.hpp> #include <cppuhelper/implbase1.hxx> #include <comphelper/proparrhlp.hxx> diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index 18db105b95d9..39f341ddb901 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -21,7 +21,6 @@ #include <ContentHelper.hxx> #include <rtl/ustrbuf.hxx> #include <ucbhelper/cancelcommandexecution.hxx> -#include <comphelper/property.hxx> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> @@ -47,7 +46,6 @@ using namespace ::com::sun::star::io; using namespace ::com::sun::star::util; using namespace ::com::sun::star::embed; using namespace ::com::sun::star::container; -using namespace ::comphelper; using namespace ::cppu; OContentHelper_Impl::OContentHelper_Impl() diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index af71c72510c4..0e1df6750176 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -41,9 +41,6 @@ #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> -#include <comphelper/interaction.hxx> -#include <comphelper/seqstream.hxx> -#include <comphelper/sequence.hxx> #include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 57ba4ebae1f8..47d08357a5a7 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -22,7 +22,6 @@ #include <apitools.hxx> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> diff --git a/dbaccess/source/core/dataaccess/commanddefinition.hxx b/dbaccess/source/core/dataaccess/commanddefinition.hxx index 59a530e71662..112a0eaa2b7c 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.hxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.hxx @@ -29,7 +29,6 @@ #include <ContentHelper.hxx> #include "ComponentDefinition.hxx" -#include <comphelper/propertycontainer.hxx> #include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> diff --git a/dbaccess/source/core/dataaccess/connection.hxx b/dbaccess/source/core/dataaccess/connection.hxx index 0e548f9508d7..a17325b2e1e8 100644 --- a/dbaccess/source/core/dataaccess/connection.hxx +++ b/dbaccess/source/core/dataaccess/connection.hxx @@ -45,7 +45,6 @@ #include <com/sun/star/sdb/application/XTableUIProvider.hpp> #include <cppuhelper/implbase13.hxx> -#include <comphelper/stl_types.hxx> #include <connectivity/ConnectionWrapper.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/warningscontainer.hxx> diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 3f4a443abaa1..85683e6a5367 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -54,7 +54,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequence.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/typeprovider.hxx> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index e147cf0281de..516766ca81e3 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -65,10 +65,8 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/enumhelper.hxx> #include <comphelper/genericpropertyset.hxx> -#include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/numberedcollection.hxx> -#include <comphelper/property.hxx> #include <comphelper/storagehelper.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index ffe45b4521a0..4f1bb6d477be 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -50,11 +50,9 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/view/XPrintable.hpp> -#include <comphelper/guarding.hxx> #include <cppuhelper/implbase.hxx> #include <comphelper/interaction.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <connectivity/dbexception.hxx> diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index ae52ecc5e67b..4acaa00fcc52 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -26,7 +26,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/sequence.hxx> #include <comphelper/enumhelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index b48f27ba0144..cf72ef2d2520 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -23,7 +23,6 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/classids.hxx> @@ -93,9 +92,7 @@ #include <cppuhelper/compbase.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/storagehelper.hxx> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/io/WrongFormatException.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index c54dc9ee95a1..a6837692d691 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/util/XModifiable.hpp> #include <cppuhelper/weak.hxx> -#include <comphelper/types.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/dbaccess/source/core/inc/DatabaseDataProvider.hxx b/dbaccess/source/core/inc/DatabaseDataProvider.hxx index 21616edaa3da..cb63c28eb9c2 100644 --- a/dbaccess/source/core/inc/DatabaseDataProvider.hxx +++ b/dbaccess/source/core/inc/DatabaseDataProvider.hxx @@ -35,8 +35,6 @@ #include <cppuhelper/propertysetmixin.hxx> #include <cppuhelper/implementationentry.hxx> -#include <comphelper/sequence.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 4a763c577912..ab4276c4e5cf 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -56,8 +56,6 @@ #include <com/sun/star/sdb/XDocumentDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/proparrhlp.hxx> -#include <comphelper/sharedmutex.hxx> #include <comphelper/solarmutex.hxx> #include <connectivity/CommonTools.hxx> #include <cppuhelper/propshlp.hxx> diff --git a/dbaccess/source/core/inc/column.hxx b/dbaccess/source/core/inc/column.hxx index f32a00f6c8d8..eca1a728e841 100644 --- a/dbaccess/source/core/inc/column.hxx +++ b/dbaccess/source/core/inc/column.hxx @@ -39,7 +39,6 @@ #include <com/sun/star/sdbcx/XDrop.hpp> #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <comphelper/proparrhlp.hxx> #include <comphelper/propertycontainer.hxx> #include <connectivity/CommonTools.hxx> #include <connectivity/FValue.hxx> diff --git a/dbaccess/source/core/inc/definitioncolumn.hxx b/dbaccess/source/core/inc/definitioncolumn.hxx index 8ec104584b2c..b7683f30e709 100644 --- a/dbaccess/source/core/inc/definitioncolumn.hxx +++ b/dbaccess/source/core/inc/definitioncolumn.hxx @@ -28,6 +28,7 @@ #include <com/sun/star/container/XChild.hpp> #include <comphelper/IdPropArrayHelper.hxx> +#include <comphelper/proparrhlp.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/dbaccess/source/core/inc/table.hxx b/dbaccess/source/core/inc/table.hxx index 28ae2b42470e..0b4b284558df 100644 --- a/dbaccess/source/core/inc/table.hxx +++ b/dbaccess/source/core/inc/table.hxx @@ -35,7 +35,6 @@ #include "column.hxx" #include <connectivity/CommonTools.hxx> #include <connectivity/TTableHelper.hxx> -#include <comphelper/uno3.hxx> #include <comphelper/IdPropArrayHelper.hxx> namespace dbaccess diff --git a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx index c2ed8b02f66f..1ba2e973cb63 100644 --- a/dbaccess/source/ext/macromigration/macromigrationwizard.hxx +++ b/dbaccess/source/ext/macromigration/macromigrationwizard.hxx @@ -23,6 +23,7 @@ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> #include <com/sun/star/frame/XStorable.hpp> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> namespace dbmm diff --git a/dbaccess/source/ext/macromigration/migrationengine.cxx b/dbaccess/source/ext/macromigration/migrationengine.cxx index 1c4c26f435cd..8e17e81c6f58 100644 --- a/dbaccess/source/ext/macromigration/migrationengine.cxx +++ b/dbaccess/source/ext/macromigration/migrationengine.cxx @@ -51,10 +51,8 @@ #include <com/sun/star/io/XInputStreamProvider.hpp> #include <comphelper/documentinfo.hxx> -#include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/storagehelper.hxx> -#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <tools/diagnose_ex.h> #include <rtl/ustrbuf.hxx> diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 410c3cfa501e..0872891cf1e3 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.cxx @@ -55,7 +55,6 @@ #include <comphelper/documentconstants.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <comphelper/storagehelper.hxx> #include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index 8afd0c9190bd..e81ab45933f3 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx @@ -27,7 +27,6 @@ #include <strings.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> -#include <comphelper/sequence.hxx> #include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> #include <dsntypes.hxx> diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx index e9889c442f83..39e470259e2b 100644 --- a/dbaccess/source/ui/app/AppControllerDnD.cxx +++ b/dbaccess/source/ui/app/AppControllerDnD.cxx @@ -19,7 +19,6 @@ #include <memory> #include "AppController.hxx" -#include <comphelper/sequence.hxx> #include <comphelper/property.hxx> #include <core_resource.hxx> #include <stringconstants.hxx> @@ -43,7 +42,6 @@ #include <com/sun/star/sdbcx/XDrop.hpp> #include <unotools/ucbhelper.hxx> #include <dlgsave.hxx> -#include <comphelper/types.hxx> #include <vcl/weld.hxx> #include <cppuhelper/typeprovider.hxx> #include <cppuhelper/exc_hlp.hxx> diff --git a/dbaccess/source/ui/app/AppView.cxx b/dbaccess/source/ui/app/AppView.cxx index 78931828a8dd..8a2e9d1419e3 100644 --- a/dbaccess/source/ui/app/AppView.cxx +++ b/dbaccess/source/ui/app/AppView.cxx @@ -24,7 +24,6 @@ #include <vcl/toolbox.hxx> #include <unotools/configmgr.hxx> #include <vcl/waitobj.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/dbaccess/source/ui/browser/dataview.cxx b/dbaccess/source/ui/browser/dataview.cxx index 18241bf19778..d5ce5952b3a9 100644 --- a/dbaccess/source/ui/browser/dataview.cxx +++ b/dbaccess/source/ui/browser/dataview.cxx @@ -20,7 +20,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XModel.hpp> #include <dbaccess/dataview.hxx> -#include <comphelper/types.hxx> #include <comphelper/namedvaluecollection.hxx> #include <sfx2/app.hxx> #include <dbaccess/IController.hxx> diff --git a/dbaccess/source/ui/browser/dbloader.cxx b/dbaccess/source/ui/browser/dbloader.cxx index 97c56ae88f92..2836c3bfd6af 100644 --- a/dbaccess/source/ui/browser/dbloader.cxx +++ b/dbaccess/source/ui/browser/dbloader.cxx @@ -43,6 +43,7 @@ #include <com/sun/star/sdbc/XDataSource.hpp> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <toolkit/awt/vclxwindow.hxx> diff --git a/dbaccess/source/ui/browser/sbagrid.cxx b/dbaccess/source/ui/browser/sbagrid.cxx index 5556e0f02cc6..0f83166db4e1 100644 --- a/dbaccess/source/ui/browser/sbagrid.cxx +++ b/dbaccess/source/ui/browser/sbagrid.cxx @@ -32,6 +32,7 @@ #include <sbagrid.hxx> #include <dlgattr.hxx> #include <dlgsize.hxx> +#include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/form/XLoadable.hpp> #include <com/sun/star/form/ControlFontDialog.hpp> #include <com/sun/star/sdb/CommandType.hpp> diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index c884e31e55f5..4f22d829ff10 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -48,7 +48,7 @@ #include <connectivity/dbtools.hxx> #include <connectivity/dbconversion.hxx> #include <comphelper/numbers.hxx> -#include <comphelper/string.hxx> +#include <comphelper/types.hxx> #include <UITools.hxx> #include <strings.hrc> #include <osl/diagnose.h> diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index f25f0cde10e5..e78cde9de379 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -35,7 +35,6 @@ #include <vcl/weld.hxx> #include <sfx2/filedlghelper.hxx> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPage.cxx b/dbaccess/source/ui/dlg/ConnectionPage.cxx index 9575384f1009..ea87983a665d 100644 --- a/dbaccess/source/ui/dlg/ConnectionPage.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPage.cxx @@ -36,7 +36,6 @@ #include <helpids.h> #include <osl/process.h> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx index a6f2203eed6d..d9a96fa9b5cd 100644 --- a/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx +++ b/dbaccess/source/ui/dlg/ConnectionPageSetup.cxx @@ -29,7 +29,6 @@ #include <dsitems.hxx> #include <osl/process.h> #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <vcl/stdtext.hxx> #include <sqlmessage.hxx> #include "odbcconfig.hxx" diff --git a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx index b2ca1e21182e..3334dac786e4 100644 --- a/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx +++ b/dbaccess/source/ui/dlg/DBSetupConnectionPages.cxx @@ -41,7 +41,6 @@ #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include <dbadmin.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/sdbc/XDriverAccess.hpp> diff --git a/dbaccess/source/ui/dlg/DbAdminImpl.cxx b/dbaccess/source/ui/dlg/DbAdminImpl.cxx index 0cce73ebbba6..a0318b05d6be 100644 --- a/dbaccess/source/ui/dlg/DbAdminImpl.cxx +++ b/dbaccess/source/ui/dlg/DbAdminImpl.cxx @@ -52,11 +52,8 @@ #include <com/sun/star/ucb/XInteractionSupplyAuthentication2.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> -#include <comphelper/guarding.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/property.hxx> #include <comphelper/sequence.hxx> -#include <comphelper/string.hxx> #include <connectivity/DriversConfig.hxx> #include <connectivity/dbexception.hxx> #include <osl/file.hxx> diff --git a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx index f036b655d8cb..a26ae5b69b2f 100644 --- a/dbaccess/source/ui/dlg/TextConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/TextConnectionHelper.cxx @@ -42,7 +42,6 @@ #include "DriverSettings.hxx" #include <dbadmin.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> #include <svl/filenotation.hxx> #include <unotools/localfilehelper.hxx> diff --git a/dbaccess/source/ui/dlg/UserAdmin.cxx b/dbaccess/source/ui/dlg/UserAdmin.cxx index 0daf9f8f13d9..e3cf3e7f28e6 100644 --- a/dbaccess/source/ui/dlg/UserAdmin.cxx +++ b/dbaccess/source/ui/dlg/UserAdmin.cxx @@ -20,7 +20,6 @@ #include "UserAdmin.hxx" #include <UITools.hxx> #include <dbu_dlg.hxx> -#include <comphelper/types.hxx> #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 37a1db875882..f00712dc408c 100644 --- a/dbaccess/source/ui/dlg/UserAdminDlg.cxx +++ b/dbaccess/source/ui/dlg/UserAdminDlg.cxx @@ -30,6 +30,7 @@ #include <UserAdminDlg.hxx> #include <connectivity/dbmetadata.hxx> +#include <comphelper/types.hxx> #include <cppuhelper/exc_hlp.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> diff --git a/dbaccess/source/ui/dlg/dbwizsetup.cxx b/dbaccess/source/ui/dlg/dbwizsetup.cxx index 03b520739f25..fc6bd8996ae1 100644 --- a/dbaccess/source/ui/dlg/dbwizsetup.cxx +++ b/dbaccess/source/ui/dlg/dbwizsetup.cxx @@ -74,7 +74,6 @@ #include <svl/filenotation.hxx> #include <comphelper/interaction.hxx> #include <comphelper/namedvaluecollection.hxx> -#include <comphelper/sequenceashashmap.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <connectivity/DriversConfig.hxx> diff --git a/dbaccess/source/ui/dlg/detailpages.cxx b/dbaccess/source/ui/dlg/detailpages.cxx index a78a7526416d..e5300105392a 100644 --- a/dbaccess/source/ui/dlg/detailpages.cxx +++ b/dbaccess/source/ui/dlg/detailpages.cxx @@ -43,7 +43,6 @@ #include <connectivity/CommonTools.hxx> #include "DriverSettings.hxx" #include <dbadmin.hxx> -#include <comphelper/types.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/dlg/dsselect.cxx b/dbaccess/source/ui/dlg/dsselect.cxx index 3c6485405282..5b4ee249b4b1 100644 --- a/dbaccess/source/ui/dlg/dsselect.cxx +++ b/dbaccess/source/ui/dlg/dsselect.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <stringconstants.hxx> -#include <comphelper/types.hxx> #include <dsitems.hxx> #include <svl/stritem.hxx> #include <svl/intitem.hxx> diff --git a/dbaccess/source/ui/dlg/paramdialog.cxx b/dbaccess/source/ui/dlg/paramdialog.cxx index 36aa35494d20..425c9e0936df 100644 --- a/dbaccess/source/ui/dlg/paramdialog.cxx +++ b/dbaccess/source/ui/dlg/paramdialog.cxx @@ -25,6 +25,7 @@ #include <commontypes.hxx> #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/sdbc/DataType.hpp> +#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <stringconstants.hxx> #include <vcl/svapp.hxx> diff --git a/dbaccess/source/ui/inc/unosqlmessage.hxx b/dbaccess/source/ui/inc/unosqlmessage.hxx index 7015be4581db..948803be278e 100644 --- a/dbaccess/source/ui/inc/unosqlmessage.hxx +++ b/dbaccess/source/ui/inc/unosqlmessage.hxx @@ -22,6 +22,7 @@ #include <svtools/genericunodialog.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/misc/UITools.cxx b/dbaccess/source/ui/misc/UITools.cxx index fec1afc95b63..0ab2ec4c0614 100644 --- a/dbaccess/source/ui/misc/UITools.cxx +++ b/dbaccess/source/ui/misc/UITools.cxx @@ -69,6 +69,7 @@ #include <TypeInfo.hxx> #include <FieldDescriptions.hxx> #include <comphelper/stl_types.hxx> +#include <comphelper/types.hxx> #include <comphelper/propertysequence.hxx> #include <svx/svxids.hrc> diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx index 301fac338545..676b26cbf92f 100644 --- a/dbaccess/source/ui/misc/databaseobjectview.cxx +++ b/dbaccess/source/ui/misc/databaseobjectview.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/awt/Rectangle.hpp> -#include <comphelper/sequence.hxx> #include <connectivity/dbtools.hxx> #include <osl/diagnose.h> #include <toolkit/helper/vclunohelper.hxx> diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx index 136e83014e5a..d3003aa2aac9 100644 --- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx +++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx @@ -36,7 +36,6 @@ #include <com/sun/star/util/NumberFormatter.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinController.cxx b/dbaccess/source/ui/querydesign/JoinController.cxx index a76706572b2d..34efc1019ae5 100644 --- a/dbaccess/source/ui/querydesign/JoinController.cxx +++ b/dbaccess/source/ui/querydesign/JoinController.cxx @@ -19,7 +19,6 @@ #include <sfx2/sfxsids.hrc> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/container/XChild.hpp> @@ -36,8 +35,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <connectivity/dbexception.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <comphelper/streamsection.hxx> -#include <comphelper/seqstream.hxx> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <sqlmessage.hxx> diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx index f3eced0bc113..d93e8a36a50a 100644 --- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx +++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx @@ -24,7 +24,6 @@ #include <adtabdlg.hxx> #include <vcl/svapp.hxx> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/querydesign/QTableWindow.cxx b/dbaccess/source/ui/querydesign/QTableWindow.cxx index b5acfc05bbcd..cba04bb093e9 100644 --- a/dbaccess/source/ui/querydesign/QTableWindow.cxx +++ b/dbaccess/source/ui/querydesign/QTableWindow.cxx @@ -35,7 +35,6 @@ #include <com/sun/star/sdbcx/KeyType.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include "TableFieldInfo.hxx" -#include <comphelper/string.hxx> #include <UITools.hxx> #include <svtools/treelistentry.hxx> diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx index 077376b66ceb..abce427f98e7 100644 --- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx +++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx @@ -37,7 +37,6 @@ #include <strings.hxx> #include <unotools/configmgr.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <connectivity/dbexception.hxx> #include <com/sun/star/i18n/XLocaleData.hpp> diff --git a/dbaccess/source/ui/querydesign/QueryTextView.cxx b/dbaccess/source/ui/querydesign/QueryTextView.cxx index a2da22fc1304..1b192ce1dcca 100644 --- a/dbaccess/source/ui/querydesign/QueryTextView.cxx +++ b/dbaccess/source/ui/querydesign/QueryTextView.cxx @@ -27,7 +27,6 @@ #include <stringconstants.hxx> #include <vcl/split.hxx> #include <vcl/svapp.hxx> -#include <comphelper/types.hxx> #include <QueryDesignView.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx index 39f1c0a5866e..455adc02121d 100644 --- a/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx +++ b/dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx @@ -27,7 +27,6 @@ #include <browserids.hxx> #include <comphelper/stl_types.hxx> #include <comphelper/string.hxx> -#include <comphelper/types.hxx> #include "TableFieldInfo.hxx" #include <core_resource.hxx> #include <strings.hrc> diff --git a/dbaccess/source/ui/querydesign/TableConnection.cxx b/dbaccess/source/ui/querydesign/TableConnection.cxx index 25ce126c306d..6aede7e64b54 100644 --- a/dbaccess/source/ui/querydesign/TableConnection.cxx +++ b/dbaccess/source/ui/querydesign/TableConnection.cxx @@ -21,7 +21,6 @@ #include <ConnectionLine.hxx> #include <TableConnectionData.hxx> #include <JoinTableView.hxx> -#include <comphelper/stl_types.hxx> #include <ConnectionLineAccess.hxx> using namespace dbaui; diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx index 8f065adb3a43..f7659b211088 100644 --- a/dbaccess/source/ui/querydesign/querycontroller.cxx +++ b/dbaccess/source/ui/querydesign/querycontroller.cxx @@ -68,8 +68,6 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/property.hxx> -#include <comphelper/seqstream.hxx> -#include <comphelper/streamsection.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationController.cxx b/dbaccess/source/ui/relationdesign/RelationController.cxx index 78ffb0d342d8..1ccb6d649d12 100644 --- a/dbaccess/source/ui/relationdesign/RelationController.cxx +++ b/dbaccess/source/ui/relationdesign/RelationController.cxx @@ -52,8 +52,6 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbmetadata.hxx> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> -#include <comphelper/streamsection.hxx> -#include <comphelper/seqstream.hxx> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XActiveDataSink.hpp> #include <sqlmessage.hxx> diff --git a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx index eafa83720b28..6b46690fb5b8 100644 --- a/dbaccess/source/ui/relationdesign/RelationDesignView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationDesignView.cxx @@ -23,7 +23,6 @@ #include <svl/undo.hxx> #include <vcl/svapp.hxx> #include <browserids.hxx> -#include <comphelper/types.hxx> #include <connectivity/dbtools.hxx> #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/dbaccess/source/ui/relationdesign/RelationTableView.cxx b/dbaccess/source/ui/relationdesign/RelationTableView.cxx index 2346efadd685..86b5b44e48be 100644 --- a/dbaccess/source/ui/relationdesign/RelationTableView.cxx +++ b/dbaccess/source/ui/relationdesign/RelationTableView.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <stringconstants.hxx> #include <connectivity/dbtools.hxx> -#include <comphelper/sequence.hxx> #include <helpids.h> #include <RelationDesignView.hxx> #include <JoinController.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableController.cxx b/dbaccess/source/ui/tabledesign/TableController.cxx index de6d7fef6aa1..71c6e722fecc 100644 --- a/dbaccess/source/ui/tabledesign/TableController.cxx +++ b/dbaccess/source/ui/tabledesign/TableController.cxx @@ -56,7 +56,6 @@ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/streamsection.hxx> #include <comphelper/types.hxx> #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> diff --git a/dbaccess/source/ui/tabledesign/TableDesignView.cxx b/dbaccess/source/ui/tabledesign/TableDesignView.cxx index 683d84c2abe7..748b47ff8a5c 100644 --- a/dbaccess/source/ui/tabledesign/TableDesignView.cxx +++ b/dbaccess/source/ui/tabledesign/TableDesignView.cxx @@ -25,7 +25,6 @@ #include "TableFieldDescWin.hxx" #include <TableRow.hxx> #include <unotools/configmgr.hxx> -#include <comphelper/types.hxx> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <unotools/syslocale.hxx> #include <vcl/settings.hxx> diff --git a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx index 8f1d34334555..4b361e5ef3e6 100644 --- a/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx +++ b/dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx @@ -24,6 +24,7 @@ #include <dbu_reghelper.hxx> #include <advancedsettingsdlg.hxx> #include <comphelper/processfactory.hxx> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/uno/ColumnModel.cxx b/dbaccess/source/ui/uno/ColumnModel.cxx index 716add82c7db..63799e50dabf 100644 --- a/dbaccess/source/ui/uno/ColumnModel.cxx +++ b/dbaccess/source/ui/uno/ColumnModel.cxx @@ -26,7 +26,6 @@ #include <cppuhelper/queryinterface.hxx> #include <stringconstants.hxx> #include <dbu_reghelper.hxx> -#include <comphelper/property.hxx> extern "C" void createRegistryInfo_OColumnControlModel() { diff --git a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx index 6be18eba68df..7177ace3845b 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlg.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODBTypeWizDialog final diff --git a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx index d70aac205b57..a65062ce083e 100644 --- a/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx +++ b/dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODBTypeWizDialogSetup final diff --git a/dbaccess/source/ui/uno/TableFilterDlg.hxx b/dbaccess/source/ui/uno/TableFilterDlg.hxx index 3a8d9b7f3f6e..075f703f4c2b 100644 --- a/dbaccess/source/ui/uno/TableFilterDlg.hxx +++ b/dbaccess/source/ui/uno/TableFilterDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { diff --git a/dbaccess/source/ui/uno/UserSettingsDlg.hxx b/dbaccess/source/ui/uno/UserSettingsDlg.hxx index b7b7cc66e469..3d54cc9e3940 100644 --- a/dbaccess/source/ui/uno/UserSettingsDlg.hxx +++ b/dbaccess/source/ui/uno/UserSettingsDlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { // OUserSettingsDialog diff --git a/dbaccess/source/ui/uno/admindlg.hxx b/dbaccess/source/ui/uno/admindlg.hxx index e0e80e8586ae..394ad2db53c2 100644 --- a/dbaccess/source/ui/uno/admindlg.hxx +++ b/dbaccess/source/ui/uno/admindlg.hxx @@ -22,6 +22,8 @@ #include <unoadmin.hxx> +#include <comphelper/proparrhlp.hxx> + namespace dbaui { class ODataSourcePropertyDialog final diff --git a/dbaccess/source/ui/uno/composerdialogs.hxx b/dbaccess/source/ui/uno/composerdialogs.hxx index ddc09cb37d32..5ceef84c9fb9 100644 --- a/dbaccess/source/ui/uno/composerdialogs.hxx +++ b/dbaccess/source/ui/uno/composerdialogs.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include <apitools.hxx> diff --git a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx index 965fd6291a98..46f17eb47a45 100644 --- a/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx +++ b/dbaccess/source/ui/uno/textconnectionsettings_uno.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdb/XTextConnectionSettings.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/proparrhlp.hxx> #include <svtools/genericunodialog.hxx> #include <cppuhelper/implbase.hxx> diff --git a/dbaccess/source/ui/uno/unoDirectSql.hxx b/dbaccess/source/ui/uno/unoDirectSql.hxx index c100adee7dd5..9855e31cf1bf 100644 --- a/dbaccess/source/ui/uno/unoDirectSql.hxx +++ b/dbaccess/source/ui/uno/unoDirectSql.hxx @@ -26,6 +26,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/sdbc/XRowSet.hpp> #include <com/sun/star/sdbc/XConnection.hpp> +#include <comphelper/proparrhlp.hxx> namespace dbaui { diff --git a/dbaccess/source/ui/uno/unoadmin.cxx b/dbaccess/source/ui/uno/unoadmin.cxx index 7c665ce21ef3..c19e4d09c9f3 100644 --- a/dbaccess/source/ui/uno/unoadmin.cxx +++ b/dbaccess/source/ui/uno/unoadmin.cxx @@ -23,7 +23,6 @@ #include <unoadmin.hxx> #include <dbadmin.hxx> #include <cppuhelper/typeprovider.hxx> -#include <comphelper/property.hxx> // --- needed because of the solar mutex #include <osl/mutex.hxx> |