diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-11-01 23:29:42 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-11 09:48:23 +0100 |
| commit | e4bf92ae344e0db16177de7fc9eed432339d8705 (patch) | |
| tree | f758b8791b31638c889464ca57e3bda67da1c449 /framework | |
| parent | 56b124c36cff09257d8373aaa6661a88cfb1926d (diff) | |
tdf#42949 Fix IWYU warnings in framework/*/*hxx
Also drop unused framework/inc/fwkdllapi.h
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I9e79266f273b778f4a8bd3330b1b0353a2e01a61
Reviewed-on: https://gerrit.libreoffice.org/81927
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'framework')
160 files changed, 148 insertions, 451 deletions
diff --git a/framework/IwyuFilter_framework.yaml b/framework/IwyuFilter_framework.yaml new file mode 100644 index 000000000000..35ebcb080a33 --- /dev/null +++ b/framework/IwyuFilter_framework.yaml @@ -0,0 +1,46 @@ +--- +assumeFilename: framework/source/services/autorecovery.cxx +blacklist: + framework/inc/stdtypes.h: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx + framework/inc/macros/xinterface.hxx: + # Used in macros + - com/sun/star/uno/Any.hxx + - com/sun/star/uno/Type.hxx + - cppuhelper/queryinterface.hxx + framework/inc/macros/xserviceinfo.hxx: + # Used in macros + - com/sun/star/lang/XServiceInfo.hpp + - com/sun/star/lang/XSingleServiceFactory.hpp + - com/sun/star/uno/Reference.hxx + - com/sun/star/uno/Sequence.hxx + - com/sun/star/uno/XComponentContext.hpp + - comphelper/processfactory.hxx + - cppuhelper/factory.hxx + - cppuhelper/supportsservice.hxx + - rtl/ustring.hxx + framework/inc/macros/registration.hxx: + # Used in macros + - com/sun/star/lang/XMultiServiceFactory.hpp + framework/inc/macros/xtypeprovider.hxx: + # Used in macros + - com/sun/star/lang/XTypeProvider.hpp + - com/sun/star/uno/Sequence.hxx + - com/sun/star/uno/Type.hxx + - cppuhelper/typeprovider.hxx + framework/inc/services/layoutmanager.hxx: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx + framework/inc/tabwin/tabwindow.hxx: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx + framework/inc/uielement/statusbarmanager.hxx: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx + framework/inc/uielement/toolbarmanager.hxx: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx + framework/source/uiconfiguration/imagemanagerimpl.hxx: + # Don't propose hxx -> h change in URE libs + - cppuhelper/interfacecontainer.hxx diff --git a/framework/inc/acceleratorconst.h b/framework/inc/acceleratorconst.h index de798bf8a3ca..0a1cad5fa8ab 100644 --- a/framework/inc/acceleratorconst.h +++ b/framework/inc/acceleratorconst.h @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H #define INCLUDED_FRAMEWORK_INC_ACCELERATORCONST_H -#include "general.h" - namespace framework{ #define ATTRIBUTE_TYPE_CDATA "CDATA" diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 19a2a5e0dfd3..be40992c8e5b 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <framework/fwedllapi.h> #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index 33bd3c76083c..8ef20621311a 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -26,8 +26,6 @@ #include <rtl/ustring.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <framework/fwedllapi.h> #define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 9299120824bf..1df3a6a050ab 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX -#include <general.h> -#include <stdtypes.h> +#include <vector> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/framework/inc/classes/framecontainer.hxx b/framework/inc/classes/framecontainer.hxx index f28e314ed3cd..72a868f66d34 100644 --- a/framework/inc/classes/framecontainer.hxx +++ b/framework/inc/classes/framecontainer.hxx @@ -23,18 +23,11 @@ #include <sal/config.h> #include <vector> -#include <stdexcept> -#include <algorithm> - -#include <threadhelp/transactionbase.hxx> -#include <general.h> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/Reference.hxx> -#include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> -#include <vcl/evntpost.hxx> namespace framework{ diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 14b93c1e1e3c..0a752a90b51d 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/implbase.hxx> #include <vcl/image.hxx> #include <framework/fwedllapi.h> diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index a23acb57bc39..48dd25cac5fa 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX -#include <general.h> -#include <stdtypes.h> +#include <unordered_map> #include <com/sun/star/util/URL.hpp> diff --git a/framework/inc/classes/taskcreator.hxx b/framework/inc/classes/taskcreator.hxx index b6a9bdb3b966..e9e98df4e79c 100644 --- a/framework/inc/classes/taskcreator.hxx +++ b/framework/inc/classes/taskcreator.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_TASKCREATOR_HXX -#include <general.h> - #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/dispatch/closedispatcher.hxx b/framework/inc/dispatch/closedispatcher.hxx index aa75a3acdab6..63732507126c 100644 --- a/framework/inc/dispatch/closedispatcher.hxx +++ b/framework/inc/dispatch/closedispatcher.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_CLOSEDISPATCHER_HXX -#include <stdtypes.h> -#include <general.h> - -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> @@ -31,7 +27,6 @@ #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/frame/DispatchResultState.hpp> #include <memory> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/dispatch/dispatchinformationprovider.hxx b/framework/inc/dispatch/dispatchinformationprovider.hxx index 20161e3ff786..12504abb2b6e 100644 --- a/framework/inc/dispatch/dispatchinformationprovider.hxx +++ b/framework/inc/dispatch/dispatchinformationprovider.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_DISPATCHINFORMATIONPROVIDER_HXX -#include <general.h> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <cppuhelper/weakref.hxx> -#include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> #include <vcl/svapp.hxx> diff --git a/framework/inc/dispatch/dispatchprovider.hxx b/framework/inc/dispatch/dispatchprovider.hxx index 99c342957c18..fa719abfaff4 100644 --- a/framework/inc/dispatch/dispatchprovider.hxx +++ b/framework/inc/dispatch/dispatchprovider.hxx @@ -22,14 +22,10 @@ #include <classes/protocolhandlercache.hxx> -#include <stdtypes.h> - -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/DispatchDescriptor.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/dispatch/interceptionhelper.hxx b/framework/inc/dispatch/interceptionhelper.hxx index fbc8c33927bc..2409c3eefbec 100644 --- a/framework/inc/dispatch/interceptionhelper.hxx +++ b/framework/inc/dispatch/interceptionhelper.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_INTERCEPTIONHELPER_HXX -#include <general.h> - #include <com/sun/star/frame/XDispatchProviderInterception.hpp> #include <com/sun/star/frame/XDispatchProviderInterceptor.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/inc/dispatch/mailtodispatcher.hxx b/framework/inc/dispatch/mailtodispatcher.hxx index 2e15607cf70b..18f505ec8edf 100644 --- a/framework/inc/dispatch/mailtodispatcher.hxx +++ b/framework/inc/dispatch/mailtodispatcher.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_MAILTODISPATCHER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 71ff88902eb6..63de4f7ab4ae 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index b93d806f93d3..c383d015629d 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_POPUPMENUDISPATCHER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> @@ -35,7 +32,6 @@ #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uri/XUriReferenceFactory.hpp> -#include <com/sun/star/uri/XUriReference.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/dispatch/servicehandler.hxx b/framework/inc/dispatch/servicehandler.hxx index 14eb8fd9bccb..d73f5f1cf472 100644 --- a/framework/inc/dispatch/servicehandler.hxx +++ b/framework/inc/dispatch/servicehandler.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_SERVICEHANDLER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/inc/dispatch/startmoduledispatcher.hxx b/framework/inc/dispatch/startmoduledispatcher.hxx index 37812a79589e..440c8f069a0a 100644 --- a/framework/inc/dispatch/startmoduledispatcher.hxx +++ b/framework/inc/dispatch/startmoduledispatcher.hxx @@ -20,21 +20,14 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_STARTMODULEDISPATCHER_HXX -#include <stdtypes.h> -#include <general.h> - -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatchInformationProvider.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/frame/DispatchResultState.hpp> #include <cppuhelper/implbase.hxx> -#include <vcl/evntpost.hxx> namespace framework{ diff --git a/framework/inc/dispatch/systemexec.hxx b/framework/inc/dispatch/systemexec.hxx index d90fbecec3ad..7c9e10418440 100644 --- a/framework/inc/dispatch/systemexec.hxx +++ b/framework/inc/dispatch/systemexec.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_DISPATCH_SYSTEMEXEC_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> diff --git a/framework/inc/fwkdllapi.h b/framework/inc/fwkdllapi.h deleted file mode 100644 index e4d502708b1e..000000000000 --- a/framework/inc/fwkdllapi.h +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H -#define INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H - -#include <sal/types.h> - -#include "fwidllapi.h" - -#endif // INCLUDED_FRAMEWORK_INC_FWKDLLAPI_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/helper/dockingareadefaultacceptor.hxx b/framework/inc/helper/dockingareadefaultacceptor.hxx index f3a3f54c32fc..281c9811499a 100644 --- a/framework/inc/helper/dockingareadefaultacceptor.hxx +++ b/framework/inc/helper/dockingareadefaultacceptor.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_DOCKINGAREADEFAULTACCEPTOR_HXX -#include <classes/framecontainer.hxx> - #include <com/sun/star/ui/XDockingAreaAcceptor.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/mischelper.hxx b/framework/inc/helper/mischelper.hxx index 487d0f3d569c..23e0c249002c 100644 --- a/framework/inc/helper/mischelper.hxx +++ b/framework/inc/helper/mischelper.hxx @@ -21,9 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_MISCHELPER_HXX #include <com/sun/star/linguistic2/XLanguageGuessing.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/util/XChangesListener.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/ocomponentaccess.hxx b/framework/inc/helper/ocomponentaccess.hxx index 4e0751905a85..0ab674a33156 100644 --- a/framework/inc/helper/ocomponentaccess.hxx +++ b/framework/inc/helper/ocomponentaccess.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTACCESS_HXX -#include <general.h> - #include <com/sun/star/frame/XFramesSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/container/XElementAccess.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/framework/inc/helper/ocomponentenumeration.hxx b/framework/inc/helper/ocomponentenumeration.hxx index 3f30a2ef2b75..10de97dd5806 100644 --- a/framework/inc/helper/ocomponentenumeration.hxx +++ b/framework/inc/helper/ocomponentenumeration.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_OCOMPONENTENUMERATION_HXX -#include <general.h> - #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/framework/inc/helper/oframes.hxx b/framework/inc/helper/oframes.hxx index 091b757b7e22..1da482c4e86f 100644 --- a/framework/inc/helper/oframes.hxx +++ b/framework/inc/helper/oframes.hxx @@ -21,9 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_HELPER_OFRAMES_HXX #include <classes/framecontainer.hxx> -#include <general.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrames.hpp> #include <com/sun/star/frame/XFrame.hpp> diff --git a/framework/inc/helper/persistentwindowstate.hxx b/framework/inc/helper/persistentwindowstate.hxx index e0e86226c7ef..ce6f0ed434ba 100644 --- a/framework/inc/helper/persistentwindowstate.hxx +++ b/framework/inc/helper/persistentwindowstate.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_PERSISTENTWINDOWSTATE_HXX -#include <general.h> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <unotools/moduleoptions.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> diff --git a/framework/inc/helper/statusindicatorfactory.hxx b/framework/inc/helper/statusindicatorfactory.hxx index 4f6e183e8a54..da02dbfc626a 100644 --- a/framework/inc/helper/statusindicatorfactory.hxx +++ b/framework/inc/helper/statusindicatorfactory.hxx @@ -26,28 +26,20 @@ // include files of own module #include <helper/wakeupthread.hxx> -#include <general.h> // include uno interfaces -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/task/XStatusIndicatorFactory.hpp> #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/awt/WindowEvent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XUpdatable.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/supportsservice.hxx> -#include <vcl/status.hxx> #include <cppuhelper/implbase.hxx> -#include <osl/thread.hxx> +#include <rtl/ref.hxx> namespace framework{ diff --git a/framework/inc/helper/tagwindowasmodified.hxx b/framework/inc/helper/tagwindowasmodified.hxx index 13e46851727d..ef749f030cfc 100644 --- a/framework/inc/helper/tagwindowasmodified.hxx +++ b/framework/inc/helper/tagwindowasmodified.hxx @@ -20,13 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_TAGWINDOWASMODIFIED_HXX -#include <general.h> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/helper/titlebarupdate.hxx b/framework/inc/helper/titlebarupdate.hxx index ac2d97533d17..88030f9cee88 100644 --- a/framework/inc/helper/titlebarupdate.hxx +++ b/framework/inc/helper/titlebarupdate.hxx @@ -20,17 +20,13 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_TITLEBARUPDATE_HXX -#include <general.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/frame/XTitleChangeListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <unotools/moduleoptions.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> -#include <rtl/ustrbuf.hxx> namespace framework{ diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index e5ce9b11d73a..f3ea3d9c4944 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX #define INCLUDED_FRAMEWORK_INC_HELPER_VCLSTATUSINDICATOR_HXX -#include <general.h> - #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/helper/wakeupthread.hxx b/framework/inc/helper/wakeupthread.hxx index 50e234f23713..6632d4b049f3 100644 --- a/framework/inc/helper/wakeupthread.hxx +++ b/framework/inc/helper/wakeupthread.hxx @@ -26,7 +26,6 @@ #include <cppuhelper/weakref.hxx> #include <osl/conditn.hxx> #include <osl/mutex.hxx> -#include <sal/types.h> #include <salhelper/thread.hxx> namespace com { namespace sun { namespace star { namespace util { diff --git a/framework/inc/interaction/quietinteraction.hxx b/framework/inc/interaction/quietinteraction.hxx index 75d6c05a089b..c6e6cc9cf403 100644 --- a/framework/inc/interaction/quietinteraction.hxx +++ b/framework/inc/interaction/quietinteraction.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX #define INCLUDED_FRAMEWORK_INC_INTERACTION_QUIETINTERACTION_HXX -#include <general.h> - #include <com/sun/star/task/XInteractionHandler.hpp> #include <com/sun/star/task/XInteractionRequest.hpp> diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index a6812f0b5520..cd77b42a298d 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX -#include <general.h> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ustring.hxx> diff --git a/framework/inc/jobs/job.hxx b/framework/inc/jobs/job.hxx index 28f9d269c483..f5f2ea96fe1c 100644 --- a/framework/inc/jobs/job.hxx +++ b/framework/inc/jobs/job.hxx @@ -20,13 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOB_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_JOB_HXX -#include <jobs/jobresult.hxx> #include <jobs/jobdata.hxx> -#include <stdtypes.h> -#include <general.h> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> @@ -35,7 +30,6 @@ #include <cppuhelper/implbase.hxx> #include <osl/conditn.hxx> -#include <rtl/ustring.hxx> namespace framework{ diff --git a/framework/inc/jobs/jobconst.hxx b/framework/inc/jobs/jobconst.hxx index e66e7e55919b..80e78f4d991a 100644 --- a/framework/inc/jobs/jobconst.hxx +++ b/framework/inc/jobs/jobconst.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_JOBCONST_HXX -#include <stdtypes.h> -#include <general.h> - #include <rtl/ustring.hxx> #include <fwidllapi.h> diff --git a/framework/inc/jobs/jobdata.hxx b/framework/inc/jobs/jobdata.hxx index c96c8bca32e9..5d64bcb8ce98 100644 --- a/framework/inc/jobs/jobdata.hxx +++ b/framework/inc/jobs/jobdata.hxx @@ -20,17 +20,13 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBDATA_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_JOBDATA_HXX -#include <jobs/configaccess.hxx> -#include <jobs/jobresult.hxx> -#include <stdtypes.h> -#include <general.h> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <rtl/ustring.hxx> +#include <vector> + namespace framework{ /** diff --git a/framework/inc/jobs/jobresult.hxx b/framework/inc/jobs/jobresult.hxx index aa6989708d62..2178a541a895 100644 --- a/framework/inc/jobs/jobresult.hxx +++ b/framework/inc/jobs/jobresult.hxx @@ -20,13 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBRESULT_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_JOBRESULT_HXX -#include <stdtypes.h> -#include <general.h> - #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/DispatchResultEvent.hpp> -#include <rtl/ustring.hxx> +#include <vector> namespace framework{ diff --git a/framework/inc/jobs/joburl.hxx b/framework/inc/jobs/joburl.hxx index 2e3e2cb0c0c9..5ea812d52ff1 100644 --- a/framework/inc/jobs/joburl.hxx +++ b/framework/inc/jobs/joburl.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_JOBURL_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_JOBURL_HXX -#include <stdtypes.h> -#include <general.h> - #include <rtl/ustring.hxx> namespace framework{ diff --git a/framework/inc/jobs/shelljob.hxx b/framework/inc/jobs/shelljob.hxx index b1408858819b..1c2aaec0c656 100644 --- a/framework/inc/jobs/shelljob.hxx +++ b/framework/inc/jobs/shelljob.hxx @@ -25,8 +25,6 @@ #include <cppuhelper/implbase.hxx> #include <com/sun/star/task/XJob.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/container/XNameAccess.hpp> namespace framework{ diff --git a/framework/inc/macros/registration.hxx b/framework/inc/macros/registration.hxx index 4d41818a9321..55581ed3f9f6 100644 --- a/framework/inc/macros/registration.hxx +++ b/framework/inc/macros/registration.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_REGISTRATION_HXX -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> //namespace framework{ diff --git a/framework/inc/macros/xserviceinfo.hxx b/framework/inc/macros/xserviceinfo.hxx index 2eff0d2b14be..9849c5d0e1a3 100644 --- a/framework/inc/macros/xserviceinfo.hxx +++ b/framework/inc/macros/xserviceinfo.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_MACROS_XSERVICEINFO_HXX #define INCLUDED_FRAMEWORK_INC_MACROS_XSERVICEINFO_HXX -#include <general.h> - -#include <com/sun/star/uno/Exception.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/framework/inc/properties.h b/framework/inc/properties.h index de3eb86c5694..8cb35b1ac5f7 100644 --- a/framework/inc/properties.h +++ b/framework/inc/properties.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_INC_PROPERTIES_H #define INCLUDED_FRAMEWORK_INC_PROPERTIES_H -#include "general.h" +#include <com/sun/star/uno/Any.hxx> namespace framework{ diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 361c3f868b5f..b4a0a5ffafe6 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -26,17 +26,14 @@ #include <vector> #include <macros/xserviceinfo.hxx> -#include <general.h> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatchRecorder.hpp> #include <com/sun/star/frame/DispatchStatement.hpp> #include <com/sun/star/container/XIndexReplace.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> #include <com/sun/star/script/XTypeConverter.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index 685d91770a0d..7f20f641edf9 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -21,10 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> -#include <stdtypes.h> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index fd952e74f348..c49b62f4cf14 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -26,6 +26,7 @@ #include <vector> #include <classes/framecontainer.hxx> +#include <threadhelp/transactionbase.hxx> #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> @@ -38,7 +39,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XTasksSupplier.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> -#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index a1b7eecf360f..955b2e42587e 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -20,26 +20,18 @@ #ifndef INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_SERVICES_LAYOUTMANAGER_HXX -#include <properties.h> -#include <stdtypes.h> #include <uielement/menubarmanager.hxx> -#include <framework/addonsoptions.hxx> #include <uielement/uielement.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/frame/XLayoutManager2.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/awt/XWindowListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/XUIElementFactoryManager.hpp> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/XTopWindow2.hpp> -#include <com/sun/star/awt/XDockableWindow.hpp> -#include <com/sun/star/awt/XDockableWindowListener.hpp> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/propshlp.hxx> @@ -48,9 +40,6 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertycontainer.hxx> #include <comphelper/uno3.hxx> -#include <tools/wintypes.hxx> -#include <svtools/miscopt.hxx> -#include <vcl/toolbox.hxx> #include <vcl/timer.hxx> class MenuBar; diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 6265071ae285..38b2f9ade4b1 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_SERVICES_MEDIATYPEDETECTIONHELPER_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> #include <com/sun/star/util/XStringMapping.hpp> diff --git a/framework/inc/services/uriabbreviation.hxx b/framework/inc/services/uriabbreviation.hxx index 3e172bc6956b..ca6d32eb8344 100644 --- a/framework/inc/services/uriabbreviation.hxx +++ b/framework/inc/services/uriabbreviation.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_SERVICES_URIABBREVIATION_HXX #include <macros/xserviceinfo.hxx> -#include <general.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XStringAbbreviation.hpp> diff --git a/framework/inc/stdtypes.h b/framework/inc/stdtypes.h index 7973cdd6147e..ba4933b7d607 100644 --- a/framework/inc/stdtypes.h +++ b/framework/inc/stdtypes.h @@ -20,13 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_STDTYPES_H #define INCLUDED_FRAMEWORK_INC_STDTYPES_H -#include <algorithm> -#include <queue> -#include <unordered_map> -#include <vector> - -#include "general.h" - #include <com/sun/star/awt/KeyEvent.hpp> #include <cppuhelper/interfacecontainer.hxx> diff --git a/framework/inc/tabwin/tabwindow.hxx b/framework/inc/tabwin/tabwindow.hxx index fb370b2bcf19..c7bac5a37925 100644 --- a/framework/inc/tabwin/tabwindow.hxx +++ b/framework/inc/tabwin/tabwindow.hxx @@ -20,17 +20,13 @@ #ifndef INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX #define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINDOW_HXX -#include <stdtypes.h> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> #include <macros/xserviceinfo.hxx> -#include <services.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/lang/XComponent.hpp> diff --git a/framework/inc/tabwin/tabwinfactory.hxx b/framework/inc/tabwin/tabwinfactory.hxx index 6680e3dd3e42..83315a6c3a8f 100644 --- a/framework/inc/tabwin/tabwinfactory.hxx +++ b/framework/inc/tabwin/tabwinfactory.hxx @@ -20,19 +20,14 @@ #ifndef INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX #define INCLUDED_FRAMEWORK_INC_TABWIN_TABWINFACTORY_HXX -#include <stdtypes.h> #include <macros/xserviceinfo.hxx> -#include <services.h> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/XToolkit2.hpp> #include <cppuhelper/implbase.hxx> -#include <rtl/ustring.hxx> namespace framework { diff --git a/framework/inc/threadhelp/gate.hxx b/framework/inc/threadhelp/gate.hxx index f0113f398878..627a3a7cb4fb 100644 --- a/framework/inc/threadhelp/gate.hxx +++ b/framework/inc/threadhelp/gate.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX #define INCLUDED_FRAMEWORK_INC_THREADHELP_GATE_HXX -#include <osl/time.h> #include <osl/mutex.hxx> #include <osl/conditn.hxx> diff --git a/framework/inc/threadhelp/transactionmanager.hxx b/framework/inc/threadhelp/transactionmanager.hxx index 1653c57335df..e909900958ea 100644 --- a/framework/inc/threadhelp/transactionmanager.hxx +++ b/framework/inc/threadhelp/transactionmanager.hxx @@ -22,10 +22,6 @@ #include <threadhelp/gate.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/lang/DisposedException.hpp> - #include <osl/mutex.hxx> #include <fwidllapi.h> diff --git a/framework/inc/uiconfiguration/globalsettings.hxx b/framework/inc/uiconfiguration/globalsettings.hxx index 574beacfdcb9..c90ab14538ea 100644 --- a/framework/inc/uiconfiguration/globalsettings.hxx +++ b/framework/inc/uiconfiguration/globalsettings.hxx @@ -20,19 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GLOBALSETTINGS_HXX -#include <stdtypes.h> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <cppuhelper/weak.hxx> -#include <rtl/ustring.hxx> - -#include <vector> -#include <list> - namespace framework { diff --git a/framework/inc/uiconfiguration/graphicnameaccess.hxx b/framework/inc/uiconfiguration/graphicnameaccess.hxx index 7b6405033aba..469ff079368b 100644 --- a/framework/inc/uiconfiguration/graphicnameaccess.hxx +++ b/framework/inc/uiconfiguration/graphicnameaccess.hxx @@ -20,9 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GRAPHICNAMEACCESS_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_GRAPHICNAMEACCESS_HXX -#include <stdtypes.h> +#include <unordered_map> -#include <com/sun/star/container/XNameContainer.hpp> +#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/uiconfiguration/imagemanager.hxx b/framework/inc/uiconfiguration/imagemanager.hxx index ff6f5bd3aa88..f498b8607349 100644 --- a/framework/inc/uiconfiguration/imagemanager.hxx +++ b/framework/inc/uiconfiguration/imagemanager.hxx @@ -22,29 +22,14 @@ #include <memory> -#include <stdtypes.h> -#include <uiconfiguration/imagetype.hxx> - #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/ui/ConfigurationEvent.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustring.hxx> -#include <vcl/image.hxx> -#include <rtl/ref.hxx> - namespace framework { class ImageManagerImpl; diff --git a/framework/inc/uiconfiguration/moduleimagemanager.hxx b/framework/inc/uiconfiguration/moduleimagemanager.hxx index c0559bfcba75..4d7b3d6f5b30 100644 --- a/framework/inc/uiconfiguration/moduleimagemanager.hxx +++ b/framework/inc/uiconfiguration/moduleimagemanager.hxx @@ -20,31 +20,13 @@ #ifndef INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UICONFIGURATION_MODULEIMAGEMANAGER_HXX -#include <stdtypes.h> -#include <uiconfiguration/imagetype.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <rtl/ustring.hxx> -#include <vcl/image.hxx> -#include <rtl/ref.hxx> - -#include <list> #include <memory> -#include <vector> namespace framework { diff --git a/framework/inc/uielement/addonstoolbarmanager.hxx b/framework/inc/uielement/addonstoolbarmanager.hxx index 8842ad608c79..d13c3f14b58a 100644 --- a/framework/inc/uielement/addonstoolbarmanager.hxx +++ b/framework/inc/uielement/addonstoolbarmanager.hxx @@ -23,13 +23,8 @@ #include <uielement/toolbarmanager.hxx> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <rtl/ustring.hxx> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/interfacecontainer.hxx> class ToolBox; diff --git a/framework/inc/uielement/buttontoolbarcontroller.hxx b/framework/inc/uielement/buttontoolbarcontroller.hxx index 913f2997bdb3..92a4e6aa8a63 100644 --- a/framework/inc/uielement/buttontoolbarcontroller.hxx +++ b/framework/inc/uielement/buttontoolbarcontroller.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index 891e25bb05fd..2c9941eca8ac 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/commandinfo.hxx b/framework/inc/uielement/commandinfo.hxx index eed42f2238e6..b2c7c3e880a9 100644 --- a/framework/inc/uielement/commandinfo.hxx +++ b/framework/inc/uielement/commandinfo.hxx @@ -20,7 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_COMMANDINFO_HXX -#include <stdtypes.h> +#include <rtl/ustring.hxx> + +#include <unordered_map> +#include <vector> namespace framework { diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index 1778f71d1b81..769652a403ae 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -20,12 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> +#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <rtl/ustring.hxx> diff --git a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx index c8721758627a..3303ada03172 100644 --- a/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/dropdownboxtoolbarcontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_DROPDOWNBOXTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 20924416c78d..7779224ef059 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -20,11 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_EDITTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/edit.hxx> +#include <vcl/event.hxx> class ToolBox; diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index b01246101c01..e0f4f4ba1854 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -21,17 +21,11 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> namespace framework diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index c3654f5c465d..9ffa4aac1dbf 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -21,19 +21,13 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <memory> diff --git a/framework/inc/uielement/generictoolbarcontroller.hxx b/framework/inc/uielement/generictoolbarcontroller.hxx index ba86ab2e3ebc..b1d7c5b70b99 100644 --- a/framework/inc/uielement/generictoolbarcontroller.hxx +++ b/framework/inc/uielement/generictoolbarcontroller.hxx @@ -24,6 +24,7 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <tools/link.hxx> +#include <vcl/menu.hxx> #include <vcl/vclptr.hxx> class PopupMenu; diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index 1b7cf4b72aa7..b92cb9755b1d 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -21,18 +21,11 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModel.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> -#include <rtl/ustring.hxx> namespace framework { diff --git a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx index 3c1f3a9f4e7e..ced9b2005ceb 100644 --- a/framework/inc/uielement/imagebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/imagebuttontoolbarcontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_IMAGEBUTTONTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index 156d7ffd4904..1e0fdd62cae5 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -24,9 +24,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> #include <vector> diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index 4f2d9b4c9644..5ce72880b151 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -21,17 +21,11 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <helper/mischelper.hxx> diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index 616470ae2811..ec4568a40e82 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -21,17 +21,9 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> #include <vcl/menu.hxx> -#include <rtl/ustring.hxx> namespace framework { diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 407814a7640b..4fa42c8e8fd1 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -23,34 +23,26 @@ /** Attention: stl headers must(!) be included at first. Otherwise it can make trouble with solaris headers ... */ +#include <unordered_map> #include <vector> -#include <stdtypes.h> - #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/ui/XImageManager.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> #include <vcl/menu.hxx> -#include <vcl/accel.hxx> #include <vcl/timer.hxx> -#include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <framework/addonsoptions.hxx> diff --git a/framework/inc/uielement/menubarwrapper.hxx b/framework/inc/uielement/menubarwrapper.hxx index ee5345d1d450..1b20375b3154 100644 --- a/framework/inc/uielement/menubarwrapper.hxx +++ b/framework/inc/uielement/menubarwrapper.hxx @@ -26,7 +26,6 @@ #include <uielement/menubarmanager.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/container/XNameAccess.hpp> namespace framework diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index 58a001ed7c11..3fae20bed266 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -21,23 +21,13 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <framework/menuconfiguration.hxx> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> -#include <vcl/accel.hxx> #include <vcl/menu.hxx> -#include <unordered_map> namespace framework { diff --git a/framework/inc/uielement/progressbarwrapper.hxx b/framework/inc/uielement/progressbarwrapper.hxx index d2e9a3dca5ef..d38467949f8d 100644 --- a/framework/inc/uielement/progressbarwrapper.hxx +++ b/framework/inc/uielement/progressbarwrapper.hxx @@ -22,10 +22,8 @@ #include <helper/uielementwrapperbase.hxx> -#include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/awt/XWindow.hpp> -#include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> namespace framework{ diff --git a/framework/inc/uielement/rootitemcontainer.hxx b/framework/inc/uielement/rootitemcontainer.hxx index a0238b94579e..a71282b993a0 100644 --- a/framework/inc/uielement/rootitemcontainer.hxx +++ b/framework/inc/uielement/rootitemcontainer.hxx @@ -26,7 +26,6 @@ #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/lang/XSingleComponentFactory.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <rtl/ustring.hxx> diff --git a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx index 42d121971259..89e1bc9598d8 100644 --- a/framework/inc/uielement/spinfieldtoolbarcontroller.hxx +++ b/framework/inc/uielement/spinfieldtoolbarcontroller.hxx @@ -20,11 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_SPINFIELDTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/spinfld.hxx> +#include <vcl/event.hxx> #include <vcl/vclptr.hxx> class ToolBox; diff --git a/framework/inc/uielement/statusbarmanager.hxx b/framework/inc/uielement/statusbarmanager.hxx index e2c4966c091b..5fc341ae1588 100644 --- a/framework/inc/uielement/statusbarmanager.hxx +++ b/framework/inc/uielement/statusbarmanager.hxx @@ -20,16 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMANAGER_HXX -#include <stdtypes.h> - #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusbarController.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> +#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <vcl/status.hxx> diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 4f61ed7c3ff5..73aa7fd472f0 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -20,8 +20,9 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARMERGER_HXX #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/Sequence.hxx> #include <rtl/ustring.hxx> -#include <uielement/statusbar.hxx> +#include <vcl/status.hxx> namespace framework { diff --git a/framework/inc/uielement/statusbarwrapper.hxx b/framework/inc/uielement/statusbarwrapper.hxx index 7be5e5e47bb9..1fba23221b80 100644 --- a/framework/inc/uielement/statusbarwrapper.hxx +++ b/framework/inc/uielement/statusbarwrapper.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSBARWRAPPER_HXX #include <helper/uiconfigelementwrapperbase.hxx> -#include <uielement/statusbarmanager.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx index 1037ecb905f4..a587c02b183f 100644 --- a/framework/inc/uielement/statusindicatorinterfacewrapper.hxx +++ b/framework/inc/uielement/statusindicatorinterfacewrapper.hxx @@ -21,15 +21,12 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_STATUSINDICATORINTERFACEWRAPPER_HXX #include <com/sun/star/task/XStatusIndicator.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> -#include <vector> - namespace framework { diff --git a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx index ae532858d25b..45e953c9e51f 100644 --- a/framework/inc/uielement/togglebuttontoolbarcontroller.hxx +++ b/framework/inc/uielement/togglebuttontoolbarcontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOGGLEBUTTONTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> diff --git a/framework/inc/uielement/toolbarmanager.hxx b/framework/inc/uielement/toolbarmanager.hxx index 7219e8770899..f43a3511b85d 100644 --- a/framework/inc/uielement/toolbarmanager.hxx +++ b/framework/inc/uielement/toolbarmanager.hxx @@ -20,12 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMANAGER_HXX -#include <stdtypes.h> #include <uielement/commandinfo.hxx> #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> @@ -34,8 +31,6 @@ #include <com/sun/star/frame/XToolbarController.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/ui/ItemStyle.hpp> -#include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index bb41a2bece60..95ca6cc01458 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -20,21 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMERGER_HXX -#include <uielement/comboboxtoolbarcontroller.hxx> -#include <uielement/imagebuttontoolbarcontroller.hxx> -#include <uielement/togglebuttontoolbarcontroller.hxx> -#include <uielement/buttontoolbarcontroller.hxx> -#include <uielement/spinfieldtoolbarcontroller.hxx> -#include <uielement/edittoolbarcontroller.hxx> -#include <uielement/dropdownboxtoolbarcontroller.hxx> -#include <uielement/FixedImageToolbarController.hxx> -#include <uielement/FixedTextToolbarController.hxx> #include <uielement/commandinfo.hxx> #include <com/sun/star/beans/PropertyValue.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> -#include <svtools/toolboxcontroller.hxx> - +#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx index c341781c4d31..5a6767f93ef0 100644 --- a/framework/inc/uielement/toolbarmodemenucontroller.hxx +++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx @@ -21,20 +21,11 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMODEMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> -#include <rtl/ustring.hxx> - -#include <vector> namespace framework { diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 2ce73d2bc1de..4b919cba2541 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -21,11 +21,7 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX #include <macros/xserviceinfo.hxx> -#include <stdtypes.h> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> @@ -33,8 +29,6 @@ #include <com/sun/star/ui/XUIConfigurationManager.hpp> #include <svtools/popupmenucontrollerbase.hxx> -#include <toolkit/awt/vclxmenu.hxx> -#include <cppuhelper/weak.hxx> #include <rtl/ustring.hxx> #include <unotools/intlwrapper.hxx> diff --git a/framework/inc/uielement/toolbarwrapper.hxx b/framework/inc/uielement/toolbarwrapper.hxx index 0e8da868a5a4..9b04569a29f8 100644 --- a/framework/inc/uielement/toolbarwrapper.hxx +++ b/framework/inc/uielement/toolbarwrapper.hxx @@ -23,7 +23,6 @@ #include <helper/uiconfigelementwrapperbase.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XUIFunctionListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> diff --git a/framework/inc/uielement/uicommanddescription.hxx b/framework/inc/uielement/uicommanddescription.hxx index e78dbab99a15..d2eb672cd71d 100644 --- a/framework/inc/uielement/uicommanddescription.hxx +++ b/framework/inc/uielement/uicommanddescription.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_UIELEMENT_UICOMMANDDESCRIPTION_HXX #include <unordered_map> -#include <stdtypes.h> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> diff --git a/framework/inc/uifactory/factoryconfiguration.hxx b/framework/inc/uifactory/factoryconfiguration.hxx index dcbf4daae09f..a6a31b5ad311 100644 --- a/framework/inc/uifactory/factoryconfiguration.hxx +++ b/framework/inc/uifactory/factoryconfiguration.hxx @@ -20,14 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX #define INCLUDED_FRAMEWORK_INC_UIFACTORY_FACTORYCONFIGURATION_HXX -#include <stdtypes.h> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/container/XContainerListener.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/uifactory/menubarfactory.hxx b/framework/inc/uifactory/menubarfactory.hxx index edc976db3634..cadb67363edd 100644 --- a/framework/inc/uifactory/menubarfactory.hxx +++ b/framework/inc/uifactory/menubarfactory.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/acceleratorconfigurationreader.hxx b/framework/inc/xml/acceleratorconfigurationreader.hxx index 5d122e661d6c..2e54dc3e540d 100644 --- a/framework/inc/xml/acceleratorconfigurationreader.hxx +++ b/framework/inc/xml/acceleratorconfigurationreader.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONREADER_HXX #include <accelerators/acceleratorcache.hxx> -#include <general.h> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> diff --git a/framework/inc/xml/acceleratorconfigurationwriter.hxx b/framework/inc/xml/acceleratorconfigurationwriter.hxx index 503c7b04cc72..f66b5f6da143 100644 --- a/framework/inc/xml/acceleratorconfigurationwriter.hxx +++ b/framework/inc/xml/acceleratorconfigurationwriter.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_XML_ACCELERATORCONFIGURATIONWRITER_HXX #include <accelerators/acceleratorcache.hxx> -#include <general.h> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <rtl/ustring.hxx> diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/xml/imagesconfiguration.hxx index 1e3ec096e7f7..cadf20e92272 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/xml/imagesconfiguration.hxx @@ -20,16 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_IMAGESCONFIGURATION_HXX #define INCLUDED_FRAMEWORK_INC_XML_IMAGESCONFIGURATION_HXX -#include <framework/fwedllapi.h> -#include <tools/color.hxx> - -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <vector> -#include <memory> namespace framework { diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index c6d0917840cc..2b356670e9db 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_IMAGESDOCUMENTHANDLER_HXX #define INCLUDED_FRAMEWORK_INC_XML_IMAGESDOCUMENTHANDLER_HXX -#include <framework/fwedllapi.h> - #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <xml/imagesconfiguration.hxx> @@ -29,7 +27,6 @@ #include <cppuhelper/implbase.hxx> #include <unordered_map> -#include <stdtypes.h> namespace framework{ diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 8469280cc481..d6079c096757 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -29,7 +29,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <framework/fwedllapi.h> namespace framework{ diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 8fcb84534998..5222d7454283 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <xml/xmlnamespaces.hxx> #include <rtl/ustring.hxx> -#include <vcl/menu.hxx> #include <cppuhelper/implbase.hxx> #include <stack> diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 759699aa61ce..78e5fd1babf5 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase.hxx> #include <unordered_map> -#include <stdtypes.h> #include <framework/fwedllapi.h> namespace framework{ diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index dd13ee53eba5..18f30820f082 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -23,13 +23,13 @@ #include <framework/toolboxconfiguration.hxx> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <stdtypes.h> #include <framework/fwedllapi.h> +#include <unordered_map> + namespace framework{ // Hash code function for using in all hash maps of follow implementation. diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index 0343f42ce6c4..a5c4dde0a1e3 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX #define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX -#include <com/sun/star/xml/sax/SAXException.hpp> - #include <map> #include <framework/fwedllapi.h> +#include <rtl/ustring.hxx> + namespace framework { diff --git a/framework/source/accelerators/keymapping.cxx b/framework/source/accelerators/keymapping.cxx index b1bbe79cc858..5f78d6dd65b0 100644 --- a/framework/source/accelerators/keymapping.cxx +++ b/framework/source/accelerators/keymapping.cxx @@ -20,6 +20,7 @@ #include <accelerators/keymapping.hxx> #include <com/sun/star/awt/Key.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <rtl/instance.hxx> namespace framework diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 3b4aa1704ed7..4fe082a863ca 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -37,6 +37,7 @@ #include <vcl/svapp.hxx> #include <cppuhelper/exc_hlp.hxx> #include <rtl/ustrbuf.hxx> +#include <osl/diagnose.h> #include <i18nlangtag/languagetag.hxx> static const ::sal_Int32 ID_CORRUPT_UICONFIG_SHARE = 1; diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index 843a4b1b57d9..c5da1bb44d15 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -26,6 +26,7 @@ #include <com/sun/star/bridge/BridgeFactory.hpp> #include <com/sun/star/bridge/XBridgeFactory2.hpp> #include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/StartModule.hpp> @@ -35,6 +36,7 @@ #include <com/sun/star/beans/XFastPropertySet.hpp> #include <toolkit/helper/vclunohelper.hxx> +#include <osl/diagnose.h> #include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 90842801c454..12e9c78f158b 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -27,6 +27,8 @@ #include <comphelper/sequence.hxx> +#include <unordered_map> + namespace framework{ DispatchInformationProvider::DispatchInformationProvider(const css::uno::Reference< css::uno::XComponentContext >& xContext , diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 1138f68e74e3..44c8a9d1049c 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/uno/Exception.hpp> #include <com/sun/star/ucb/XContentProviderManager.hpp> #include <com/sun/star/document/XTypeDetection.hpp> +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <rtl/string.h> diff --git a/framework/source/dispatch/isstartmoduledispatch.hxx b/framework/source/dispatch/isstartmoduledispatch.hxx index 491d0affac78..1ae23e7c8704 100644 --- a/framework/source/dispatch/isstartmoduledispatch.hxx +++ b/framework/source/dispatch/isstartmoduledispatch.hxx @@ -20,6 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_DISPATCH_ISSTARTMODULEDISPATCH_HXX #define INCLUDED_FRAMEWORK_SOURCE_DISPATCH_ISSTARTMODULEDISPATCH_HXX +#include <com/sun/star/util/URL.hpp> + namespace framework { inline bool isStartModuleDispatch(css::util::URL const & url) { diff --git a/framework/source/dispatch/loaddispatcher.cxx b/framework/source/dispatch/loaddispatcher.cxx index eb6f5e1ae32a..92c15de422ab 100644 --- a/framework/source/dispatch/loaddispatcher.cxx +++ b/framework/source/dispatch/loaddispatcher.cxx @@ -18,6 +18,7 @@ */ #include <dispatch/loaddispatcher.hxx> +#include <loadenv/loadenvexception.hxx> #include <sal/log.hxx> #include <com/sun/star/frame/DispatchResultState.hpp> diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 1ee62b70ae9e..b655aae92b12 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -23,6 +23,7 @@ #include <framework/addonmenu.hxx> #include <services.h> #include <properties.h> +#include <stdtypes.h> #include <com/sun/star/frame/XLayoutManager2.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 8d24ff9ae5c0..2d42f643827d 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -27,6 +27,7 @@ #include "isstartmoduledispatch.hxx" #include <com/sun/star/frame/Desktop.hpp> +#include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/StartModule.hpp> #include <com/sun/star/awt/XTopWindow.hpp> diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index b4d8c7164c00..7794dbb140c9 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <cppuhelper/exc_hlp.hxx> diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index dcb5ca645bea..bb9f8377a404 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -24,6 +24,8 @@ #include <stdio.h> +#include <com/sun/star/xml/sax/SAXException.hpp> + #include <xml/saxnamespacefilter.hxx> #include <comphelper/attributelist.hxx> diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index eff42bd7c85f..732af0e60e35 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 3c4d8c117e21..378c2474ce5f 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -24,6 +24,7 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/framework/source/fwe/xml/xmlnamespaces.cxx b/framework/source/fwe/xml/xmlnamespaces.cxx index 07f5d22fa9be..dfd79edde6b0 100644 --- a/framework/source/fwe/xml/xmlnamespaces.cxx +++ b/framework/source/fwe/xml/xmlnamespaces.cxx @@ -19,6 +19,8 @@ #include <xml/xmlnamespaces.hxx> +#include <com/sun/star/xml/sax/SAXException.hpp> + using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; diff --git a/framework/source/inc/accelerators/acceleratorcache.hxx b/framework/source/inc/accelerators/acceleratorcache.hxx index 9dfd5374f20c..666d1eb4eb7a 100644 --- a/framework/source/inc/accelerators/acceleratorcache.hxx +++ b/framework/source/inc/accelerators/acceleratorcache.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCACHE_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_ACCELERATORCACHE_HXX -#include <general.h> #include <stdtypes.h> #include <com/sun/star/awt/KeyEvent.hpp> +#include <unordered_map> #include <vector> // definition diff --git a/framework/source/inc/accelerators/acceleratorconfiguration.hxx b/framework/source/inc/accelerators/acceleratorconfiguration.hxx index 34d3043a21f6..8066a63ff760 100644 --- a/framework/source/inc/accelerators/acceleratorconfiguration.hxx +++ b/framework/source/inc/accelerators/acceleratorconfiguration.hxx @@ -22,18 +22,10 @@ #include <accelerators/presethandler.hxx> #include <accelerators/acceleratorcache.hxx> -#include <general.h> -#include <stdtypes.h> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/util/XChangesListener.hpp> @@ -41,7 +33,6 @@ // TODO use XPresetHandler interface instead if available #include <com/sun/star/form/XReset.hpp> -#include <cppuhelper/propshlp.hxx> #include <cppuhelper/implbase.hxx> // definition diff --git a/framework/source/inc/accelerators/keymapping.hxx b/framework/source/inc/accelerators/keymapping.hxx index 108cee42e56d..3b9a8a3e46d5 100644 --- a/framework/source/inc/accelerators/keymapping.hxx +++ b/framework/source/inc/accelerators/keymapping.hxx @@ -20,10 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_KEYMAPPING_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_KEYMAPPING_HXX -#include <general.h> -#include <stdtypes.h> - -#include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <rtl/ustring.hxx> +#include <unordered_map> // definition diff --git a/framework/source/inc/accelerators/presethandler.hxx b/framework/source/inc/accelerators/presethandler.hxx index 027f4656cab7..05aaf6eb02fc 100644 --- a/framework/source/inc/accelerators/presethandler.hxx +++ b/framework/source/inc/accelerators/presethandler.hxx @@ -21,12 +21,9 @@ #define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_PRESETHANDLER_HXX #include <accelerators/storageholder.hxx> -#include <general.h> -#include <stdtypes.h> #include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <i18nlangtag/languagetag.hxx> diff --git a/framework/source/inc/accelerators/storageholder.hxx b/framework/source/inc/accelerators/storageholder.hxx index 5ccb443b18f0..e9be85bd7cb9 100644 --- a/framework/source/inc/accelerators/storageholder.hxx +++ b/framework/source/inc/accelerators/storageholder.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_STORAGEHOLDER_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_ACCELERATORS_STORAGEHOLDER_HXX -#include <general.h> -#include <stdtypes.h> - #include <com/sun/star/embed/XStorage.hpp> +#include <unordered_map> +#include <vector> + namespace framework { diff --git a/framework/source/inc/dispatch/dispatchdisabler.hxx b/framework/source/inc/dispatch/dispatchdisabler.hxx index 9ae44931b289..ed64a656ea7a 100644 --- a/framework/source/inc/dispatch/dispatchdisabler.hxx +++ b/framework/source/inc/dispatch/dispatchdisabler.hxx @@ -12,7 +12,6 @@ #include <set> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/weakref.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XInitialization.hpp> diff --git a/framework/source/inc/dispatch/windowcommanddispatch.hxx b/framework/source/inc/dispatch/windowcommanddispatch.hxx index 5ae5dfc41ef6..55ecb81bb16c 100644 --- a/framework/source/inc/dispatch/windowcommanddispatch.hxx +++ b/framework/source/inc/dispatch/windowcommanddispatch.hxx @@ -22,8 +22,6 @@ #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <cppuhelper/weakref.hxx> #include <tools/link.hxx> diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx index 44ba54dfcac6..9f907e49ccfc 100644 --- a/framework/source/inc/loadenv/loadenv.hxx +++ b/framework/source/inc/loadenv/loadenv.hxx @@ -19,14 +19,10 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENV_HXX -#include <loadenv/loadenvexception.hxx> #include <loadenv/actionlockguard.hxx> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/io/IOException.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URL.hpp> #include <rtl/ref.hxx> diff --git a/framework/source/inc/loadenv/loadenvexception.hxx b/framework/source/inc/loadenv/loadenvexception.hxx index a59fc9cb48ef..e4c4eefa63da 100644 --- a/framework/source/inc/loadenv/loadenvexception.hxx +++ b/framework/source/inc/loadenv/loadenvexception.hxx @@ -20,10 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENVEXCEPTION_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_LOADENVEXCEPTION_HXX -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/uno/Exception.hpp> - -#include <rtl/string.hxx> +#include <com/sun/star/uno/Any.hxx> namespace framework{ diff --git a/framework/source/inc/loadenv/targethelper.hxx b/framework/source/inc/loadenv/targethelper.hxx index 48b892856063..046cdfeb1bdc 100644 --- a/framework/source/inc/loadenv/targethelper.hxx +++ b/framework/source/inc/loadenv/targethelper.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_LOADENV_TARGETHELPER_HXX -#include <sal/types.h> #include <rtl/ustring.hxx> -#include <targets.h> namespace framework{ diff --git a/framework/source/inc/pattern/frame.hxx b/framework/source/inc/pattern/frame.hxx index 5a8a6c005d48..963c97d33c9f 100644 --- a/framework/source/inc/pattern/frame.hxx +++ b/framework/source/inc/pattern/frame.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_FRAME_HXX -#include <general.h> - #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/CloseVetoException.hpp> diff --git a/framework/source/inc/pattern/window.hxx b/framework/source/inc/pattern/window.hxx index 70956470025d..f64d65a35e12 100644 --- a/framework/source/inc/pattern/window.hxx +++ b/framework/source/inc/pattern/window.hxx @@ -20,15 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_WINDOW_HXX #define INCLUDED_FRAMEWORK_SOURCE_INC_PATTERN_WINDOW_HXX -#include <general.h> - #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <vcl/svapp.hxx> -#include <rtl/ustring.hxx> // namespaces diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 4233c502d57f..27ed74b7a8f4 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -21,6 +21,7 @@ #include <jobs/helponstartup.hxx> #include <loadenv/targethelper.hxx> #include <services.h> +#include <targets.h> // include others #include <comphelper/configurationhelper.hxx> diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 0ebb44e064a1..740d7eda4c4d 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -18,6 +18,7 @@ */ #include <jobs/job.hxx> +#include <jobs/jobresult.hxx> #include <general.h> #include <services.h> diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index fa22465e2b65..d524aa653a1d 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <jobs/configaccess.hxx> #include <jobs/jobdata.hxx> #include <classes/converter.hxx> #include <general.h> diff --git a/framework/source/layoutmanager/helpers.hxx b/framework/source/layoutmanager/helpers.hxx index 200a2fc43402..6d5b00705746 100644 --- a/framework/source/layoutmanager/helpers.hxx +++ b/framework/source/layoutmanager/helpers.hxx @@ -20,13 +20,8 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX #define INCLUDED_FRAMEWORK_SOURCE_LAYOUTMANAGER_HELPERS_HXX -#include <stdtypes.h> -#include <properties.h> - #include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/awt/XToolkit2.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XUIElement.hpp> #include <com/sun/star/awt/Rectangle.hpp> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 387749d14a45..3283798bd7e3 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -20,6 +20,7 @@ #include <memory> #include <config_feature_desktop.h> +#include <properties.h> #include <services/layoutmanager.hxx> #include "helpers.hxx" diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index 377929309fdc..6a1df781dde3 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -25,23 +25,15 @@ */ #include <vector> -#include <stdtypes.h> -#include <properties.h> #include <uiconfiguration/globalsettings.hxx> #include <framework/addonsoptions.hxx> #include <uielement/uielement.hxx> #include <services/layoutmanager.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/ui/XUIConfigurationManager.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/awt/XWindowListener.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> #include <com/sun/star/ui/DockingArea.hpp> -#include <com/sun/star/awt/XToolkit2.hpp> -#include <com/sun/star/awt/XTopWindow2.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/awt/XDockableWindow.hpp> #include <com/sun/star/awt/XDockableWindowListener.hpp> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index cb5b5aaf45db..5c1414f3cbdf 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -19,6 +19,7 @@ #include <loadenv/loadenv.hxx> +#include <loadenv/loadenvexception.hxx> #include <loadenv/targethelper.hxx> #include <framework/framelistanalyzer.hxx> @@ -26,6 +27,7 @@ #include <properties.h> #include <protocols.h> #include <services.h> +#include <targets.h> #include <comphelper/interaction.hxx> #include <comphelper/lok.hxx> #include <comphelper/namedvaluecollection.hxx> @@ -55,6 +57,7 @@ #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> +#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/framework/source/loadenv/targethelper.cxx b/framework/source/loadenv/targethelper.cxx index 80a096e963c4..aab509b0fc6d 100644 --- a/framework/source/loadenv/targethelper.cxx +++ b/framework/source/loadenv/targethelper.cxx @@ -18,6 +18,7 @@ */ #include <loadenv/targethelper.hxx> +#include <targets.h> namespace framework{ diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 9d8479166411..74b62628ba58 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -28,6 +28,7 @@ #include <classes/fwkresid.hxx> #include <protocols.h> #include <properties.h> +#include <targets.h> #include <helper/mischelper.hxx> diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index c2cf82709ad1..cce5892f0646 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -31,6 +31,7 @@ #include <threadhelp/transactionguard.hxx> #include <general.h> #include <properties.h> +#include <targets.h> #include <strings.hrc> #include <classes/fwkresid.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index e7d6e6fd064e..d116d372b6a6 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -39,6 +39,8 @@ #include <pattern/window.hxx> #include <properties.h> +#include <stdtypes.h> +#include <targets.h> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/XDevice.hpp> diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 9ad1f9ac1a4d..25c8305d94d9 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -20,6 +20,7 @@ #include <sal/config.h> #include <utility> +#include <unordered_map> #include <properties.h> #include <stdtypes.h> diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 317d9468bd2a..969fe3578136 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -19,6 +19,7 @@ #include <tabwin/tabwindow.hxx> #include <properties.h> +#include <services.h> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/Toolkit.hpp> diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index a1d3f8bff5ed..c723f597c631 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <services.h> #include <tabwin/tabwinfactory.hxx> #include <tabwin/tabwindow.hxx> diff --git a/framework/source/uiconfiguration/CommandImageResolver.hxx b/framework/source/uiconfiguration/CommandImageResolver.hxx index 094229b3ab9e..fe9a4ed958fe 100644 --- a/framework/source/uiconfiguration/CommandImageResolver.hxx +++ b/framework/source/uiconfiguration/CommandImageResolver.hxx @@ -10,7 +10,6 @@ #ifndef INCLUDED_VCL_COMMANDICONRESOLVER_HXX #define INCLUDED_VCL_COMMANDICONRESOLVER_HXX -#include <vcl/dllapi.h> #include <vcl/image.hxx> #include <o3tl/enumarray.hxx> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index ed21dd818d5e..a24e3a05c33c 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -19,6 +19,7 @@ #include "imagemanagerimpl.hxx" #include <xml/imagesconfiguration.hxx> +#include <uiconfiguration/imagetype.hxx> #include <uiconfiguration/graphicnameaccess.hxx> #include <services.h> diff --git a/framework/source/uiconfiguration/imagemanagerimpl.hxx b/framework/source/uiconfiguration/imagemanagerimpl.hxx index 13cbfd4c7ec2..fa224e09f3c0 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.hxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.hxx @@ -20,18 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX #define INCLUDED_FRAMEWORK_SOURCE_UICONFIGURATION_IMAGEMANAGERIMPL_HXX -#include <stdtypes.h> -#include <uiconfiguration/imagetype.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> -#include <com/sun/star/ui/XUIConfiguration.hpp> -#include <com/sun/star/ui/XImageManager.hpp> -#include <com/sun/star/lang/XInitialization.hpp> +#include <com/sun/star/embed/XStorage.hpp> +#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> +#include <com/sun/star/ui/XUIConfigurationListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> @@ -42,7 +34,6 @@ #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> -#include <list> #include <unordered_map> #include <vector> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 036aa3f24b55..28bae54e4a1e 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -44,6 +44,7 @@ #include <toolkit/awt/vclxmenu.hxx> #include <osl/mutex.hxx> #include <memory> +#include <unordered_map> #include <svx/svxids.hrc> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index 9d3265bb701b..c095ef746010 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -27,6 +27,7 @@ #include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> #include <vcl/event.hxx> +#include <vcl/edit.hxx> using namespace ::com::sun::star; using namespace css::uno; diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index d54385931fdd..59ddb0b73ac1 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 7d75282c5983..e32f22076b35 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/view/XPrintable.hpp> #include <com/sun/star/util/XURLTransformer.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <tools/mapunit.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f846b0ba429e..991d3a3fe4d2 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -31,6 +31,7 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index 33a59f8e1d97..abaf795b4d38 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -27,6 +27,7 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index c1335518f31f..68932229c692 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XContentEnumerationAccess.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/commandinfoprovider.hxx> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ea679171f898..2dbb5f9950ce 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -61,6 +61,7 @@ #include <unotools/pathoptions.hxx> #include <unotools/cmdoptions.hxx> #include <unotools/localfilehelper.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 0ea69d657e0f..36e756c6db71 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/sequence.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/svapp.hxx> using namespace com::sun::star; diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index c02923a8d762..f2da491d0dce 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -18,6 +18,7 @@ */ #include <uielement/newmenucontroller.hxx> +#include <framework/menuconfiguration.hxx> #include <services.h> @@ -40,6 +41,7 @@ #include <svtools/menuoptions.hxx> #include <svtools/acceleratorexecute.hxx> #include <svtools/imagemgr.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <tools/urlobj.hxx> #include <unotools/dynamicmenuoptions.hxx> #include <unotools/moduleoptions.hxx> diff --git a/framework/source/uielement/resourcemenucontroller.cxx b/framework/source/uielement/resourcemenucontroller.cxx index 18195dfc0071..0594bfea8ddf 100644 --- a/framework/source/uielement/resourcemenucontroller.cxx +++ b/framework/source/uielement/resourcemenucontroller.cxx @@ -11,6 +11,7 @@ #include <cppuhelper/implbase.hxx> #include <svtools/popupmenucontrollerbase.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/svapp.hxx> #include <sal/log.hxx> diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 3ad582a464ae..2196dc3c90e5 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -29,6 +29,7 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/event.hxx> +#include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index e9dc5ef78745..5fdb7b223bc4 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -46,6 +46,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/theToolbarControllerFactory.hpp> +#include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/XUIElementSettings.hpp> #include <com/sun/star/ui/XUIConfigurationPersistence.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index b2496cf7a2ca..dc4f0509032a 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -20,6 +20,16 @@ #include <uielement/toolbarmerger.hxx> #include <uielement/generictoolbarcontroller.hxx> +#include <uielement/buttontoolbarcontroller.hxx> +#include <uielement/comboboxtoolbarcontroller.hxx> +#include <uielement/dropdownboxtoolbarcontroller.hxx> +#include <uielement/edittoolbarcontroller.hxx> +#include <uielement/imagebuttontoolbarcontroller.hxx> +#include <uielement/spinfieldtoolbarcontroller.hxx> +#include <uielement/togglebuttontoolbarcontroller.hxx> +#include <uielement/FixedTextToolbarController.hxx> +#include <uielement/FixedImageToolbarController.hxx> + #include <svtools/miscopt.hxx> namespace framework diff --git a/framework/source/uielement/toolbarmodemenucontroller.cxx b/framework/source/uielement/toolbarmodemenucontroller.cxx index df76e7d0ced7..8e68e19c446c 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/util/XURLTransformer.hpp> +#include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 13f9a4b803cf..91c81511766e 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -21,6 +21,7 @@ #include <algorithm> #include <string_view> +#include <unordered_map> #include <services.h> #include <strings.hrc> @@ -51,6 +52,7 @@ #include <vcl/commandinfoprovider.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> +#include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> #include <svtools/menuoptions.hxx> diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 12fa4bd84aa8..8d70adc1b97a 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -25,6 +25,7 @@ #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/Writer.hpp> +#include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/io/IOException.hpp> #include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/io/XInputStream.hpp> |