diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess')
16 files changed, 11 insertions, 95 deletions
diff --git a/dbaccess/source/core/dataaccess/ContentHelper.cxx b/dbaccess/source/core/dataaccess/ContentHelper.cxx index c3ddcca6e182..424d3e8c9cf4 100644 --- a/dbaccess/source/core/dataaccess/ContentHelper.cxx +++ b/dbaccess/source/core/dataaccess/ContentHelper.cxx @@ -17,27 +17,29 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> #include <ContentHelper.hxx> +#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <ucbhelper/cancelcommandexecution.hxx> #include <com/sun/star/ucb/UnsupportedCommandException.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XActiveDataSink.hpp> #include <com/sun/star/beans/IllegalTypeException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/container/ElementExistException.hpp> #include <ucbhelper/propertyvalueset.hxx> #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 <apitools.hxx> #include <sdbcoretools.hxx> #include <stringconstants.hxx> +#include <map> + namespace dbaccess { using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 2accd7cae25d..c446950afa54 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -17,22 +17,18 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "commandcontainer.hxx" -#include "connection.hxx" #include <databasecontext.hxx> #include "databasedocument.hxx" #include "datasource.hxx" -#include <stringconstants.hxx> +#include <definitioncontainer.hxx> #include <ModelImpl.hxx> #include <sdbcoretools.hxx> #include <com/sun/star/beans/PropertyBag.hpp> #include <com/sun/star/container/XSet.hpp> #include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XTransactionBroadcaster.hpp> #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> @@ -41,20 +37,14 @@ #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> -#include <connectivity/dbexception.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/typeprovider.hxx> #include <comphelper/types.hxx> -#include <rtl/digest.h> #include <sfx2/signaturestate.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <vcl/errcode.hxx> #include <tools/urlobj.hxx> -#include <unotools/sharedunocomponent.hxx> #include <unotools/configmgr.hxx> #include <i18nlangtag/languagetag.hxx> @@ -78,7 +68,6 @@ using namespace ::com::sun::star::task; using namespace ::com::sun::star::script; using namespace ::cppu; using namespace ::osl; -using namespace ::dbtools; using namespace ::comphelper; namespace dbaccess diff --git a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx index 352eabfde368..647aaf557f97 100644 --- a/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx +++ b/dbaccess/source/core/dataaccess/bookmarkcontainer.cxx @@ -18,15 +18,11 @@ */ #include <bookmarkcontainer.hxx> -#include <stringconstants.hxx> -#include <apitools.hxx> #include <osl/diagnose.h> #include <comphelper/enumhelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/NoSupportException.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> using namespace ::com::sun::star::uno; diff --git a/dbaccess/source/core/dataaccess/commandcontainer.cxx b/dbaccess/source/core/dataaccess/commandcontainer.cxx index 9f75b5bcc67b..55087272b992 100644 --- a/dbaccess/source/core/dataaccess/commandcontainer.cxx +++ b/dbaccess/source/core/dataaccess/commandcontainer.cxx @@ -20,7 +20,6 @@ #include "commandcontainer.hxx" #include "commanddefinition.hxx" -#include <stringconstants.hxx> #include <com/sun/star/sdb/TableDefinition.hpp> #include <com/sun/star/sdb/CommandDefinition.hpp> diff --git a/dbaccess/source/core/dataaccess/commanddefinition.cxx b/dbaccess/source/core/dataaccess/commanddefinition.cxx index 03af40113d72..41ce139a8dc1 100644 --- a/dbaccess/source/core/dataaccess/commanddefinition.cxx +++ b/dbaccess/source/core/dataaccess/commanddefinition.cxx @@ -22,7 +22,6 @@ #include <stringconstants.hxx> #include <com/sun/star/container/ElementExistException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx index 7f21a8cebf11..2754a2c7d56e 100644 --- a/dbaccess/source/core/dataaccess/connection.cxx +++ b/dbaccess/source/core/dataaccess/connection.cxx @@ -22,35 +22,27 @@ #include <iterator> #include "connection.hxx" -#include <stringconstants.hxx> #include "datasource.hxx" #include <strings.hrc> #include <core_resource.hxx> #include <statement.hxx> #include <preparedstatement.hxx> #include <callablestatement.hxx> -#include <ContainerMediator.hxx> #include <SingleSelectQueryComposer.hxx> #include <querycomposer.hxx> -#include <sdbcoretools.hxx> #include <com/sun/star/lang/NoSupportException.hpp> #include <com/sun/star/sdb/CommandType.hpp> #include <com/sun/star/sdb/tools/ConnectionTools.hpp> -#include <com/sun/star/sdbc/XDriverAccess.hpp> -#include <com/sun/star/sdbcx/XDataDefinitionSupplier.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <connectivity/dbtools.hxx> #include <connectivity/dbmetadata.hxx> -#include <connectivity/dbexception.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <comphelper/sequence.hxx> #include <comphelper/types.hxx> #include <cppuhelper/supportsservice.hxx> -#include <cppuhelper/typeprovider.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/dbaccess/source/core/dataaccess/databasecontext.cxx b/dbaccess/source/core/dataaccess/databasecontext.cxx index 6b4ab7f15ba7..c2c347698fa3 100644 --- a/dbaccess/source/core/dataaccess/databasecontext.cxx +++ b/dbaccess/source/core/dataaccess/databasecontext.cxx @@ -19,23 +19,18 @@ #include <config_features.h> -#include <apitools.hxx> #include <strings.hrc> #include <core_resource.hxx> #include <databasecontext.hxx> -#include "databasedocument.hxx" #include "databaseregistrations.hxx" #include "datasource.hxx" -#include <stringconstants.hxx> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> +#include <com/sun/star/frame/XLoadable.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/XModel2.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> @@ -62,12 +57,9 @@ #include <rtl/uri.hxx> #include <sal/log.hxx> #include <svl/filenotation.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/urlobj.hxx> #include <ucbhelper/content.hxx> -#include <unotools/confignode.hxx> -#include <unotools/pathoptions.hxx> #include <unotools/sharedunocomponent.hxx> #include <vector> diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx b/dbaccess/source/core/dataaccess/databasedocument.cxx index 3b0058a51c82..ff4e68ef3c15 100644 --- a/dbaccess/source/core/dataaccess/databasedocument.cxx +++ b/dbaccess/source/core/dataaccess/databasedocument.cxx @@ -19,29 +19,21 @@ #include <core_resource.hxx> #include <strings.hrc> -#include "datasource.hxx" #include "databasedocument.hxx" -#include <stringconstants.hxx> #include "documenteventexecutor.hxx" #include <databasecontext.hxx> #include "documentcontainer.hxx" #include <sdbcoretools.hxx> #include <recovery/dbdocrecovery.hxx> -#include <com/sun/star/beans/Optional.hpp> #include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/document/XFilter.hpp> #include <com/sun/star/document/XImporter.hpp> #include <com/sun/star/document/XGraphicStorageHandler.hpp> #include <com/sun/star/document/GraphicStorageHandler.hpp> -#include <com/sun/star/embed/EntryInitModes.hpp> -#include <com/sun/star/embed/XEmbedPersist.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> -#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> #include <com/sun/star/io/XTruncate.hpp> @@ -51,10 +43,8 @@ #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/application/XDatabaseDocumentUI.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ui/UIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> @@ -79,13 +69,8 @@ #include <cppuhelper/supportsservice.hxx> #include <framework/titlehelper.hxx> #include <unotools/saveopt.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> -#include <vcl/errcode.hxx> -#include <sal/log.hxx> - -#include <list> #include <vcl/GraphicObject.hxx> #include <tools/urlobj.hxx> diff --git a/dbaccess/source/core/dataaccess/databaseregistrations.cxx b/dbaccess/source/core/dataaccess/databaseregistrations.cxx index 516873746d7a..c147f99ec694 100644 --- a/dbaccess/source/core/dataaccess/databaseregistrations.cxx +++ b/dbaccess/source/core/dataaccess/databaseregistrations.cxx @@ -28,7 +28,6 @@ #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> #include <cppuhelper/implbase1.hxx> -#include <rtl/ustrbuf.hxx> #include <osl/diagnose.h> #include <unotools/pathoptions.hxx> #include <tools/urlobj.hxx> diff --git a/dbaccess/source/core/dataaccess/datasource.cxx b/dbaccess/source/core/dataaccess/datasource.cxx index e8a5f5d6a30a..7931fc425163 100644 --- a/dbaccess/source/core/dataaccess/datasource.cxx +++ b/dbaccess/source/core/dataaccess/datasource.cxx @@ -33,9 +33,7 @@ #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyState.hpp> -#include <com/sun/star/beans/XPropertyContainer.hpp> #include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> @@ -44,11 +42,8 @@ #include <com/sun/star/sdbc/XDriverAccess.hpp> #include <com/sun/star/sdbc/XDriverManager.hpp> #include <com/sun/star/sdbc/DriverManager.hpp> -#include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/ucb/AuthenticationRequest.hpp> #include <com/sun/star/ucb/XInteractionSupplyAuthentication.hpp> -#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/view/XPrintable.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interaction.hxx> @@ -59,15 +54,12 @@ #include <connectivity/dbexception.hxx> #include <connectivity/dbtools.hxx> #include <cppuhelper/typeprovider.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <osl/process.h> #include <sal/log.hxx> #include <svtools/miscopt.hxx> #include <tools/urlobj.hxx> -#include <typelib/typedescription.hxx> -#include <unotools/confignode.hxx> #include <unotools/sharedunocomponent.hxx> #include <rtl/digest.h> diff --git a/dbaccess/source/core/dataaccess/definitioncontainer.cxx b/dbaccess/source/core/dataaccess/definitioncontainer.cxx index abb9386e2ad1..e31eee40b0dc 100644 --- a/dbaccess/source/core/dataaccess/definitioncontainer.cxx +++ b/dbaccess/source/core/dataaccess/definitioncontainer.cxx @@ -18,26 +18,21 @@ */ #include <definitioncontainer.hxx> -#include <stringconstants.hxx> #include <apitools.hxx> #include <core_resource.hxx> #include <strings.hrc> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <comphelper/enumhelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ucb/CommandInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #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; diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index db5bed5ceb43..9d88d27222f5 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -20,6 +20,7 @@ #include "documentcontainer.hxx" #include <stringconstants.hxx> #include "documentdefinition.hxx" +#include <ModelImpl.hxx> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/ucb/OpenMode.hpp> #include <connectivity/dbtools.hxx> @@ -29,8 +30,6 @@ #include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/sdb/ErrorCondition.hpp> -#include "datasource.hxx" -#include <comphelper/classids.hxx> #include <comphelper/mimeconfighelper.hxx> #include <connectivity/sqlerror.hxx> #include <core_resource.hxx> diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index d1e569afd2a9..8115fd9fe6d2 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -18,9 +18,9 @@ */ #include "documentdefinition.hxx" +#include <ModelImpl.hxx> #include <stringconstants.hxx> #include <sdbcoretools.hxx> -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> #include <comphelper/sequence.hxx> @@ -37,33 +37,26 @@ #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <com/sun/star/ucb/InsertCommandArgument.hpp> #include <com/sun/star/report/XReportDefinition.hpp> #include <com/sun/star/report/XReportEngine.hpp> #include <com/sun/star/ucb/OpenMode.hpp> #include <com/sun/star/embed/WrongStateException.hpp> -#include <com/sun/star/embed/XEmbedObjectFactory.hpp> #include <com/sun/star/embed/EmbeddedObjectCreator.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/embed/OOoEmbeddedObjectFactory.hpp> #include <ucbhelper/cancelcommandexecution.hxx> -#include <com/sun/star/ucb/UnsupportedDataSinkException.hpp> #include <com/sun/star/ucb/UnsupportedOpenModeException.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XEmbedPersist.hpp> #include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/embed/XComponentSupplier.hpp> #include <com/sun/star/embed/EntryInitModes.hpp> #include <com/sun/star/ucb/MissingPropertiesException.hpp> -#include <com/sun/star/ucb/MissingInputStreamException.hpp> #include <com/sun/star/ucb/OpenCommandArgument2.hpp> #include <com/sun/star/util/CloseVetoException.hpp> -#include <com/sun/star/util/XCloseBroadcaster.hpp> #include <com/sun/star/frame/XModule.hpp> #include <com/sun/star/datatransfer/DataFlavor.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> #include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/XCommonEmbedPersist.hpp> #include "intercept.hxx" #include <com/sun/star/sdb/ErrorCondition.hpp> @@ -73,19 +66,15 @@ #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/drawing/XDrawPageSupplier.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/form/XFormsSupplier.hpp> #include <com/sun/star/form/XForm.hpp> #include <comphelper/interaction.hxx> #include <connectivity/dbtools.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <sal/macros.h> #include <com/sun/star/view/XViewSettingsSupplier.hpp> #include <core_resource.hxx> #include <strings.hrc> -#include "datasource.hxx" -#include <com/sun/star/embed/XStateChangeBroadcaster.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionDisapprove.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/dbaccess/source/core/dataaccess/documentevents.cxx b/dbaccess/source/core/dataaccess/documentevents.cxx index aa89a64c2b43..d3c6a03ceeec 100644 --- a/dbaccess/source/core/dataaccess/documentevents.cxx +++ b/dbaccess/source/core/dataaccess/documentevents.cxx @@ -25,10 +25,6 @@ #include <comphelper/namedvaluecollection.hxx> #include <comphelper/sequence.hxx> -#include <algorithm> -#include <functional> -#include <o3tl/functional.hxx> - namespace dbaccess { diff --git a/dbaccess/source/core/dataaccess/intercept.cxx b/dbaccess/source/core/dataaccess/intercept.cxx index b0143978df73..3b42df4ed6a1 100644 --- a/dbaccess/source/core/dataaccess/intercept.cxx +++ b/dbaccess/source/core/dataaccess/intercept.cxx @@ -19,13 +19,7 @@ #include "intercept.hxx" -#include <stringconstants.hxx> -#include <com/sun/star/embed/EmbedStates.hpp> -#include <com/sun/star/util/XModifiable.hpp> -#include <cppuhelper/weak.hxx> - -#include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <memory> diff --git a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx index 04db3216cef0..52d6bd6a2b91 100644 --- a/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx +++ b/dbaccess/source/core/dataaccess/myucp_datasupplier.cxx @@ -20,11 +20,9 @@ #include <vector> #include <ucbhelper/contentidentifier.hxx> -#include <ucbhelper/providerhelper.hxx> #include "myucp_datasupplier.hxx" #include <ContentHelper.hxx> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/ucb/IllegalIdentifierException.hpp> using namespace ::com::sun::star::uno; |