diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-11-14 23:28:58 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-11-20 10:47:20 +0100 |
| commit | 0f25e181c1a8ccd8dd47475ed6ed63e37c841c13 (patch) | |
| tree | 90d757a54111db0d07285157688ff31ecd6765c9 | |
| parent | c1346f75145415a6a28b3b0f4e83d09bdfbc67e0 (diff) | |
tdf#42949 Fix IWYU warnings in framework/*/*cxx
Also drop the now unused framework/inc/general.h
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I8e19036a507dbdcd178835b6ac4182719d27a654
Reviewed-on: https://gerrit.libreoffice.org/82744
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
132 files changed, 104 insertions, 657 deletions
diff --git a/framework/IwyuFilter_framework.yaml b/framework/IwyuFilter_framework.yaml index 35ebcb080a33..03c1788972ab 100644 --- a/framework/IwyuFilter_framework.yaml +++ b/framework/IwyuFilter_framework.yaml @@ -44,3 +44,93 @@ blacklist: framework/source/uiconfiguration/imagemanagerimpl.hxx: # Don't propose hxx -> h change in URE libs - cppuhelper/interfacecontainer.hxx + framework/source/dispatch/closedispatcher.cxx: + # Needed on MAC + - com/sun/star/beans/XFastPropertySet.hpp + - services.h + framework/source/dispatch/servicehandler.cxx: + # Actually used + - com/sun/star/lang/XMultiServiceFactory.hpp + framework/source/fwe/classes/framelistanalyzer.cxx: + # Actually used + - com/sun/star/frame/XFrame.hpp + framework/source/fwe/classes/addonmenu.cxx: + # Actually used + - com/sun/star/uno/Reference.hxx + - com/sun/star/beans/PropertyValue.hpp + framework/source/fwe/helper/configimporter.cxx: + # Actually used + - com/sun/star/ui/XUIConfigurationManager2.hpp + framework/source/fwe/helper/undomanagerhelper.cxx: + # Actually used + - com/sun/star/document/XUndoManager.hpp + framework/source/fwe/xml/toolboxconfiguration.cxx: + # Actually used + - com/sun/star/io/XInputStream.hpp + framework/source/fwe/xml/statusbarconfiguration.cxx: + # Actually used + - com/sun/star/io/XInputStream.hpp + framework/source/helper/persistentwindowstate.cxx: + # Actually used + - com/sun/star/awt/XWindow.hpp + framework/source/layoutmanager/uielement.cxx: + # Actually used + - com/sun/star/ui/DockingArea.hpp + framework/source/layoutmanager/helpers.cxx: + # Actually used + - com/sun/star/ui/DockingArea.hpp + - com/sun/star/ui/XUIElement.hpp + framework/source/services/substitutepathvars.cxx: + # Don't propose hxx -> h change in URE libs + - osl/thread.hxx + framework/source/uifactory/menubarfactory.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + framework/source/xml/imagesconfiguration.cxx: + # Actually used + - com/sun/star/io/XInputStream.hpp + framework/source/uielement/genericstatusbarcontroller.cxx: + # Actually used + - com/sun/star/ui/XStatusbarItem.hpp + framework/source/uielement/complextoolbarcontroller.cxx: + # Actually used + - com/sun/star/util/XURLTransformer.hpp + - com/sun/star/beans/PropertyValue.hpp + - com/sun/star/frame/XFrame.hpp + framework/source/uielement/generictoolbarcontroller.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + framework/source/uielement/dropdownboxtoolbarcontroller.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + framework/source/uielement/comboboxtoolbarcontroller.cxx:: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + framework/source/uielement/edittoolbarcontroller.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + framework/source/uielement/comboboxtoolbarcontroller.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + framework/source/uielement/imagebuttontoolbarcontroller.cxx: + # Actually used + - com/sun/star/uno/XComponentContext.hpp + framework/source/uielement/menubarmanager.cxx: + # Needed on WIN32 + - com/sun/star/lang/SystemDependent.hpp + # Actually used + - com/sun/star/frame/XDispatch.hpp + - com/sun/star/uno/XComponentContext.hpp + framework/source/uielement/menubarwrapper.cxx: + # Actually used + - com/sun/star/container/XNameAccess.hpp + framework/source/uielement/spinfieldtoolbarcontroller.cxx: + # Needed on WIN32 + - o3tl/char16_t2wchar_t.hxx + framework/source/uielement/styletoolbarcontroller.cxx: + # Actually used + - com/sun/star/util/XURLTransformer.hpp + framework/source/uielement/toolbarsmenucontroller.cxx: + # Actually used + - com/sun/star/beans/PropertyValue.hpp + - com/sun/star/frame/XLayoutManager.hpp diff --git a/framework/inc/general.h b/framework/inc/general.h deleted file mode 100644 index 4ca92bfe6c37..000000000000 --- a/framework/inc/general.h +++ /dev/null @@ -1,32 +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_GENERAL_H -#define INCLUDED_FRAMEWORK_INC_GENERAL_H - -/* Normally XInterface isn't used here ... - But we need it to be able to define namespace alias css to anything related to ::com::sun::star - :-) */ -#include <com/sun/star/uno/XInterface.hpp> - -#include <rtl/ustring.hxx> - -#endif // INCLUDED_FRAMEWORK_INC_GENERAL_H - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index b9bee838ab03..2ae7536bd701 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -298,7 +298,6 @@ #include <framework/addonsoptions.hxx> #include <framework/fwedllapi.h> #include <fwidllapi.h> -#include <general.h> #include <properties.h> #include <services.h> #include <stdtypes.h> diff --git a/framework/inc/pch/precompiled_fwl.hxx b/framework/inc/pch/precompiled_fwl.hxx index da727624f70c..59b5fffd471d 100644 --- a/framework/inc/pch/precompiled_fwl.hxx +++ b/framework/inc/pch/precompiled_fwl.hxx @@ -261,7 +261,6 @@ #if PCH_LEVEL >= 4 #include <framework/fwedllapi.h> #include <fwidllapi.h> -#include <general.h> #include <services.h> #include <stdtypes.h> #endif // PCH_LEVEL >= 4 diff --git a/framework/inc/uielement/FixedImageToolbarController.hxx b/framework/inc/uielement/FixedImageToolbarController.hxx index bfe197bb44a6..a408801c66e0 100644 --- a/framework/inc/uielement/FixedImageToolbarController.hxx +++ b/framework/inc/uielement/FixedImageToolbarController.hxx @@ -20,10 +20,10 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDIMAGETOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDIMAGETOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> +#include <vcl/fixed.hxx> class ToolBox; class FixedImage; diff --git a/framework/inc/uielement/FixedTextToolbarController.hxx b/framework/inc/uielement/FixedTextToolbarController.hxx index cd8afb9499eb..bc60cfbd73c9 100644 --- a/framework/inc/uielement/FixedTextToolbarController.hxx +++ b/framework/inc/uielement/FixedTextToolbarController.hxx @@ -20,10 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDTEXTTOOLBARCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDTEXTTOOLBARCONTROLLER_HXX -#include <com/sun/star/beans/NamedValue.hpp> +#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> +#include <vcl/fixed.hxx> class ToolBox; class FixedText; @@ -52,4 +53,4 @@ private: #endif // INCLUDED_FRAMEWORK_INC_UIELEMENT_FIXEDTEXTTOOLBARCONTROLLER_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/accelerators/acceleratorcache.cxx b/framework/source/accelerators/acceleratorcache.cxx index 03de31befedc..99350dda9f95 100644 --- a/framework/source/accelerators/acceleratorcache.cxx +++ b/framework/source/accelerators/acceleratorcache.cxx @@ -19,10 +19,6 @@ #include <accelerators/acceleratorcache.hxx> -#include <xml/acceleratorconfigurationreader.hxx> - -#include <com/sun/star/container/ElementExistException.hpp> - #include <com/sun/star/container/NoSuchElementException.hpp> #include <vcl/svapp.hxx> diff --git a/framework/source/accelerators/acceleratorconfiguration.cxx b/framework/source/accelerators/acceleratorconfiguration.cxx index 0f0485355668..6daa18b33a6c 100644 --- a/framework/source/accelerators/acceleratorconfiguration.cxx +++ b/framework/source/accelerators/acceleratorconfiguration.cxx @@ -29,18 +29,13 @@ #include <xml/acceleratorconfigurationreader.hxx> #include <xml/acceleratorconfigurationwriter.hxx> -#include <acceleratorconst.h> -#include <services.h> - #include <com/sun/star/xml/sax/Parser.hpp> #include <com/sun/star/xml/sax/InputSource.hpp> #include <com/sun/star/xml/sax/Writer.hpp> #include <com/sun/star/io/IOException.hpp> -#include <com/sun/star/io/XActiveDataSource.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/io/XTruncate.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/svapp.hxx> #include <com/sun/star/container/XNamed.hpp> diff --git a/framework/source/accelerators/documentacceleratorconfiguration.cxx b/framework/source/accelerators/documentacceleratorconfiguration.cxx index 74b01f157a31..33f4e877a534 100644 --- a/framework/source/accelerators/documentacceleratorconfiguration.cxx +++ b/framework/source/accelerators/documentacceleratorconfiguration.cxx @@ -20,20 +20,12 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <accelerators/presethandler.hxx> -#include <xml/acceleratorconfigurationreader.hxx> -#include <xml/acceleratorconfigurationwriter.hxx> -#include <xml/saxnamespacefilter.hxx> - -#include <acceleratorconst.h> - #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/ui/XUIConfigurationStorage.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequenceashashmap.hxx> #include <i18nlangtag/languagetag.hxx> -#include <rtl/ref.hxx> #include <vcl/svapp.hxx> using namespace framework; diff --git a/framework/source/accelerators/globalacceleratorconfiguration.cxx b/framework/source/accelerators/globalacceleratorconfiguration.cxx index da4a177db175..359fbcd5be42 100644 --- a/framework/source/accelerators/globalacceleratorconfiguration.cxx +++ b/framework/source/accelerators/globalacceleratorconfiguration.cxx @@ -18,20 +18,15 @@ */ #include <accelerators/acceleratorconfiguration.hxx> -#include <accelerators/presethandler.hxx> #include <accelerators/keymapping.hxx> #include <helper/mischelper.hxx> -#include <acceleratorconst.h> - #include <com/sun/star/util/XChangesNotifier.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <rtl/ref.hxx> -#include <vcl/svapp.hxx> -#include <i18nlangtag/languagetag.hxx> using namespace framework; diff --git a/framework/source/accelerators/moduleacceleratorconfiguration.cxx b/framework/source/accelerators/moduleacceleratorconfiguration.cxx index b785ddd6ecc4..71f33bc5b0ab 100644 --- a/framework/source/accelerators/moduleacceleratorconfiguration.cxx +++ b/framework/source/accelerators/moduleacceleratorconfiguration.cxx @@ -18,15 +18,9 @@ */ #include <accelerators/acceleratorconfiguration.hxx> -#include <accelerators/presethandler.hxx> #include <helper/mischelper.hxx> -#include <acceleratorconst.h> - -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/embed/ElementModes.hpp> #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequenceashashmap.hxx> @@ -35,7 +29,6 @@ #include <com/sun/star/util/XChangesNotifier.hpp> #include <cppuhelper/implbase.hxx> -#include <rtl/ref.hxx> using namespace framework; diff --git a/framework/source/accelerators/presethandler.cxx b/framework/source/accelerators/presethandler.cxx index 4fe082a863ca..28f880d06560 100644 --- a/framework/source/accelerators/presethandler.cxx +++ b/framework/source/accelerators/presethandler.cxx @@ -22,14 +22,10 @@ #include <classes/fwkresid.hxx> #include <strings.hrc> -#include <services.h> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/CorruptedUIConfigurationException.hpp> -#include <com/sun/star/container/NoSuchElementException.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/embed/XTransactedObject.hpp> #include <com/sun/star/embed/FileSystemStorageFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/thePathSettings.hpp> diff --git a/framework/source/accelerators/storageholder.cxx b/framework/source/accelerators/storageholder.cxx index d12a13fbc47a..4c7702e579ca 100644 --- a/framework/source/accelerators/storageholder.cxx +++ b/framework/source/accelerators/storageholder.cxx @@ -21,23 +21,10 @@ #include <accelerators/acceleratorconfiguration.hxx> #include <sal/log.hxx> -#include <services.h> - -#include <com/sun/star/container/NoSuchElementException.hpp> - -#include <com/sun/star/container/XNameAccess.hpp> - -#include <com/sun/star/beans/XPropertySet.hpp> - #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> -#include <com/sun/star/embed/XPackageStructureCreator.hpp> - -#include <com/sun/star/lang/XSingleServiceFactory.hpp> - -#include <com/sun/star/io/XSeekable.hpp> #include <rtl/ustrbuf.hxx> #include <algorithm> diff --git a/framework/source/classes/taskcreator.cxx b/framework/source/classes/taskcreator.cxx index 3ff36e0e9734..63547511e5c8 100644 --- a/framework/source/classes/taskcreator.cxx +++ b/framework/source/classes/taskcreator.cxx @@ -27,8 +27,6 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/beans/NamedValue.hpp> -#include <vcl/svapp.hxx> - #include <officecfg/Office/TabBrowse.hxx> namespace framework{ diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index c5da1bb44d15..f5fe3eecefdc 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -21,7 +21,6 @@ #include <pattern/frame.hxx> #include <framework/framelistanalyzer.hxx> #include <services.h> -#include <general.h> #include <com/sun/star/bridge/BridgeFactory.hpp> #include <com/sun/star/bridge/XBridgeFactory2.hpp> diff --git a/framework/source/dispatch/dispatchinformationprovider.cxx b/framework/source/dispatch/dispatchinformationprovider.cxx index 12e9c78f158b..47234f4d6a02 100644 --- a/framework/source/dispatch/dispatchinformationprovider.cxx +++ b/framework/source/dispatch/dispatchinformationprovider.cxx @@ -19,10 +19,7 @@ #include <dispatch/dispatchinformationprovider.hxx> #include <dispatch/closedispatcher.hxx> -#include <stdtypes.h> -#include <services.h> -#include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/AppDispatchProvider.hpp> #include <comphelper/sequence.hxx> diff --git a/framework/source/dispatch/dispatchprovider.cxx b/framework/source/dispatch/dispatchprovider.cxx index 44c8a9d1049c..c573cd487e48 100644 --- a/framework/source/dispatch/dispatchprovider.cxx +++ b/framework/source/dispatch/dispatchprovider.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <stdio.h> #include <dispatch/dispatchprovider.hxx> #include <loadenv/loadenv.hxx> #include <dispatch/loaddispatcher.hxx> @@ -25,25 +24,17 @@ #include <dispatch/startmoduledispatcher.hxx> #include <pattern/window.hxx> -#include <threadhelp/transactionguard.hxx> -#include <protocols.h> -#include <services.h> #include <targets.h> -#include <general.h> #include "isstartmoduledispatch.hxx" #include <com/sun/star/frame/XDesktop.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #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> #include <rtl/ustring.hxx> #include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> namespace framework{ diff --git a/framework/source/dispatch/mailtodispatcher.cxx b/framework/source/dispatch/mailtodispatcher.cxx index 81186506a33a..a29a8a1413dd 100644 --- a/framework/source/dispatch/mailtodispatcher.cxx +++ b/framework/source/dispatch/mailtodispatcher.cxx @@ -18,7 +18,6 @@ */ #include <dispatch/mailtodispatcher.hxx> -#include <general.h> #include <services.h> #include <com/sun/star/lang/IllegalArgumentException.hpp> @@ -27,8 +26,6 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <vcl/svapp.hxx> - namespace framework{ // XInterface, XTypeProvider, XServiceInfo diff --git a/framework/source/dispatch/oxt_handler.cxx b/framework/source/dispatch/oxt_handler.cxx index 6795671d6927..8eed74832b3c 100644 --- a/framework/source/dispatch/oxt_handler.cxx +++ b/framework/source/dispatch/oxt_handler.cxx @@ -18,16 +18,12 @@ */ #include <dispatch/oxt_handler.hxx> -#include <threadhelp/transactionguard.hxx> #include <services.h> #include <unotools/mediadescriptor.hxx> -#include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> -#include <rtl/ustrbuf.hxx> - namespace framework{ // XInterface, XTypeProvider, XServiceInfo diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index b655aae92b12..94ba14418118 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -18,29 +18,17 @@ */ #include <dispatch/popupmenudispatcher.hxx> -#include <general.h> -#include <framework/menuconfiguration.hxx> -#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> -#include <com/sun/star/awt/WindowDescriptor.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/uri/UriReferenceFactory.hpp> #include <com/sun/star/ui/XUIElement.hpp> +#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> -#include <ucbhelper/content.hxx> #include <vcl/svapp.hxx> namespace framework{ diff --git a/framework/source/dispatch/servicehandler.cxx b/framework/source/dispatch/servicehandler.cxx index d7d75328795e..c0d97245d480 100644 --- a/framework/source/dispatch/servicehandler.cxx +++ b/framework/source/dispatch/servicehandler.cxx @@ -18,15 +18,12 @@ */ #include <dispatch/servicehandler.hxx> -#include <general.h> #include <services.h> #include <com/sun/star/frame/DispatchResultState.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <vcl/svapp.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> namespace framework{ diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 2d42f643827d..c6ec312070c0 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -19,22 +19,15 @@ #include <dispatch/startmoduledispatcher.hxx> -#include <pattern/frame.hxx> #include <framework/framelistanalyzer.hxx> #include <targets.h> -#include <services.h> -#include <general.h> #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> -#include <com/sun/star/beans/XFastPropertySet.hpp> -#include <vcl/window.hxx> -#include <vcl/svapp.hxx> #include <unotools/moduleoptions.hxx> namespace framework{ diff --git a/framework/source/dispatch/systemexec.cxx b/framework/source/dispatch/systemexec.cxx index a9da0d5a99c4..61e526acf72f 100644 --- a/framework/source/dispatch/systemexec.cxx +++ b/framework/source/dispatch/systemexec.cxx @@ -18,7 +18,6 @@ */ #include <dispatch/systemexec.hxx> -#include <general.h> #include <services.h> #include <com/sun/star/system/SystemShellExecute.hpp> @@ -27,8 +26,6 @@ #include <com/sun/star/system/SystemShellExecuteFlags.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <vcl/svapp.hxx> - namespace framework{ #define PROTOCOL_VALUE "systemexecute:" diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index ad953a6915bf..97e5de5ca2c7 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -19,7 +19,6 @@ #include <dispatch/windowcommanddispatch.hxx> #include <targets.h> -#include <services.h> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XDispatch.hpp> diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 1857d0480ff7..859fac65efc9 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -19,22 +19,14 @@ #include <framework/addonmenu.hxx> #include <framework/addonsoptions.hxx> -#include <general.h> #include <framework/menuconfiguration.hxx> -#include <services.h> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/util/URL.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <tools/config.hxx> #include <vcl/commandinfoprovider.hxx> #include <vcl/menu.hxx> -#include <vcl/svapp.hxx> -#include <svtools/menuoptions.hxx> -#include <svl/solar.hrc> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::frame; diff --git a/framework/source/fwe/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index ee0587cb8b28..55edf314703c 100644 --- a/framework/source/fwe/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -21,17 +21,14 @@ #include <targets.h> #include <properties.h> -#include <services.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/UnknownModuleException.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <comphelper/processfactory.hxx> -#include <vcl/svapp.hxx> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/framework/source/fwe/classes/imagewrapper.cxx b/framework/source/fwe/classes/imagewrapper.cxx index 723fec8aef04..b95bbbc34e01 100644 --- a/framework/source/fwe/classes/imagewrapper.cxx +++ b/framework/source/fwe/classes/imagewrapper.cxx @@ -22,7 +22,6 @@ #include <vcl/bitmapex.hxx> #include <vcl/BitmapTools.hxx> #include <tools/stream.hxx> -#include <cppuhelper/typeprovider.hxx> #include <vcl/dibtools.hxx> using namespace com::sun::star::lang; diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index 1fb1abead10c..c6fe0bf030f1 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -21,8 +21,6 @@ #include <framework/ContextChangeEventMultiplexerTunnel.hxx> #include <helper/mischelper.hxx> -#include <tools/diagnose_ex.h> - static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = nullptr; static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = nullptr; static pfunc_getRefreshToolbars pRefreshToolbars = nullptr; diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index fbcf9df3dc86..2f17a19eaa86 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -19,7 +19,6 @@ #include <comphelper/interaction.hxx> #include <framework/interaction.hxx> -#include <general.h> #include <com/sun/star/document/XInteractionFilterSelect.hpp> #include <com/sun/star/document/NoSuchFilterRequest.hpp> diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index d277947b8eaf..f50d0d7eb765 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -22,8 +22,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/ui/XUIConfigurationManager2.hpp> -#include <rtl/ustrbuf.hxx> - using namespace ::com::sun::star; namespace framework diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index a50cc4b401af..5b938b5ce465 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -22,16 +22,13 @@ #include <framework/titlehelper.hxx> #include <classes/fwkresid.hxx> #include <strings.hrc> -#include <services.h> #include <properties.h> #include <com/sun/star/frame/UntitledNumbersConst.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XUntitledNumbers.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/document/XDocumentEventBroadcaster.hpp> -#include <com/sun/star/beans/XMaterialHolder.hpp> #include <unotools/configmgr.hxx> #include <unotools/bootstrap.hxx> diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 7794dbb140c9..5cbd3fc06b68 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -22,7 +22,6 @@ #include <framework/addonmenu.hxx> #include <xml/menudocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> -#include <services.h> #include <uielement/rootitemcontainer.hxx> @@ -30,7 +29,6 @@ #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> using namespace ::com::sun::star::uno; diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 94a2dee58d78..1e69c23e5b2d 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -23,7 +23,6 @@ #include <rtl/ustrbuf.hxx> #include <xml/menudocumenthandler.hxx> -#include <framework/menuconfiguration.hxx> #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> diff --git a/framework/source/fwe/xml/saxnamespacefilter.cxx b/framework/source/fwe/xml/saxnamespacefilter.cxx index bb9f8377a404..bf464c663cac 100644 --- a/framework/source/fwe/xml/saxnamespacefilter.cxx +++ b/framework/source/fwe/xml/saxnamespacefilter.cxx @@ -30,8 +30,6 @@ #include <comphelper/attributelist.hxx> -#include <vcl/svapp.hxx> - using namespace ::com::sun::star::xml::sax; using namespace ::com::sun::star::uno; diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 732af0e60e35..27db9ea27a2e 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -20,17 +20,12 @@ #include <framework/statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> -#include <services.h> #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> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <unotools/streamwrap.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 378c2474ce5f..bc04e9c4a23b 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -20,17 +20,12 @@ #include <framework/toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> -#include <services.h> #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> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <unotools/streamwrap.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 9b3927839110..7089623094b7 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -33,7 +33,6 @@ #include <sal/config.h> #include <sal/macros.h> #include <vcl/svapp.hxx> -#include <vcl/toolbox.hxx> #include <vcl/settings.hxx> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/fwi/classes/protocolhandlercache.cxx b/framework/source/fwi/classes/protocolhandlercache.cxx index 40e938e04c32..9288536480d9 100644 --- a/framework/source/fwi/classes/protocolhandlercache.cxx +++ b/framework/source/fwi/classes/protocolhandlercache.cxx @@ -28,7 +28,6 @@ #include <tools/wldcrd.hxx> #include <unotools/configpaths.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwi/helper/mischelper.cxx b/framework/source/fwi/helper/mischelper.cxx index 55a2ed886b4c..a8a841295767 100644 --- a/framework/source/fwi/helper/mischelper.cxx +++ b/framework/source/fwi/helper/mischelper.cxx @@ -19,7 +19,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/document/XDocumentLanguages.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/linguistic2/LanguageGuessing.hpp> #include <sal/log.hxx> @@ -28,7 +27,6 @@ #include <i18nlangtag/languagetag.hxx> #include <svtools/langtab.hxx> #include <helper/mischelper.hxx> -#include <services.h> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/framework/source/fwi/jobs/configaccess.cxx b/framework/source/fwi/jobs/configaccess.cxx index 14e46c58f787..2cb736d4bb65 100644 --- a/framework/source/fwi/jobs/configaccess.cxx +++ b/framework/source/fwi/jobs/configaccess.cxx @@ -18,19 +18,12 @@ */ #include <jobs/configaccess.hxx> -#include <general.h> #include <services.h> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/XChangesBatch.hpp> -#include <unotools/configpaths.hxx> -#include <rtl/ustrbuf.hxx> -#include <sal/log.hxx> #include <tools/diagnose_ex.h> namespace framework{ diff --git a/framework/source/fwi/threadhelp/transactionmanager.cxx b/framework/source/fwi/threadhelp/transactionmanager.cxx index 476f43a7268a..7b6f930b57e6 100644 --- a/framework/source/fwi/threadhelp/transactionmanager.cxx +++ b/framework/source/fwi/threadhelp/transactionmanager.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <sal/log.hxx> -#include <cassert> - #include <threadhelp/transactionmanager.hxx> #include <com/sun/star/lang/DisposedException.hpp> diff --git a/framework/source/fwi/uielement/constitemcontainer.cxx b/framework/source/fwi/uielement/constitemcontainer.cxx index 669df6297e0b..bb901da9226b 100644 --- a/framework/source/fwi/uielement/constitemcontainer.cxx +++ b/framework/source/fwi/uielement/constitemcontainer.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include <uielement/constitemcontainer.hxx> -#include <uielement/rootitemcontainer.hxx> #include <uielement/itemcontainer.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <cppuhelper/implbase.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/servicehelper.hxx> diff --git a/framework/source/fwi/uielement/rootitemcontainer.cxx b/framework/source/fwi/uielement/rootitemcontainer.cxx index f7e7eb28dbb7..14a199891313 100644 --- a/framework/source/fwi/uielement/rootitemcontainer.cxx +++ b/framework/source/fwi/uielement/rootitemcontainer.cxx @@ -17,15 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <string.h> - #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/servicehelper.hxx> #include <comphelper/sequence.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/itemcontainer.hxx> #include <uielement/constitemcontainer.hxx> -#include <general.h> #include <properties.h> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/framework/source/helper/dockingareadefaultacceptor.cxx b/framework/source/helper/dockingareadefaultacceptor.cxx index 63d9fe0f1698..27d75723012a 100644 --- a/framework/source/helper/dockingareadefaultacceptor.cxx +++ b/framework/source/helper/dockingareadefaultacceptor.cxx @@ -21,7 +21,6 @@ #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/XLayoutConstrains.hpp> #include <vcl/svapp.hxx> diff --git a/framework/source/helper/persistentwindowstate.cxx b/framework/source/helper/persistentwindowstate.cxx index aad137074d98..29ad01c1d0fc 100644 --- a/framework/source/helper/persistentwindowstate.cxx +++ b/framework/source/helper/persistentwindowstate.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <pattern/window.hxx> #include <helper/persistentwindowstate.hxx> #include <com/sun/star/awt/XWindow.hpp> @@ -32,7 +31,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <rtl/string.hxx> namespace framework{ diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 5e4ba3adf4e3..8bab8ca452c0 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -22,17 +22,8 @@ #include <helper/statusindicatorfactory.hxx> #include <helper/statusindicator.hxx> #include <helper/vclstatusindicator.hxx> -#include <services.h> #include <properties.h> -#include <com/sun/star/awt/Rectangle.hpp> - -#include <com/sun/star/awt/XControl.hpp> -#include <com/sun/star/awt/XLayoutConstrains.hpp> -#include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/XWindow2.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager2.hpp> diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index 3c40842dd6fa..f17594cee477 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -18,21 +18,16 @@ */ #include <helper/tagwindowasmodified.hxx> -#include <pattern/window.hxx> -#include <services.h> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/util/XModifyBroadcaster.hpp> #include <com/sun/star/util/XModifiable.hpp> #include <com/sun/star/frame/FrameAction.hpp> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> -#include <vcl/syswin.hxx> #include <vcl/svapp.hxx> -#include <vcl/wrkwin.hxx> #include <tools/wintypes.hxx> namespace framework{ diff --git a/framework/source/helper/titlebarupdate.cxx b/framework/source/helper/titlebarupdate.cxx index 9536485f66d5..d4e5ed2df127 100644 --- a/framework/source/helper/titlebarupdate.cxx +++ b/framework/source/helper/titlebarupdate.cxx @@ -19,26 +19,18 @@ #include <helper/titlebarupdate.hxx> -#include <pattern/window.hxx> -#include <services.h> #include <properties.h> #include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/frame/ModuleManager.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XMaterialHolder.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/beans/NamedValue.hpp> #include <comphelper/sequenceashashmap.hxx> #include <unotools/configmgr.hxx> -#include <unotools/bootstrap.hxx> #include <vcl/window.hxx> -#include <vcl/syswin.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> diff --git a/framework/source/helper/uiconfigelementwrapperbase.cxx b/framework/source/helper/uiconfigelementwrapperbase.cxx index f68d4228f828..9ddbb355211e 100644 --- a/framework/source/helper/uiconfigelementwrapperbase.cxx +++ b/framework/source/helper/uiconfigelementwrapperbase.cxx @@ -18,14 +18,12 @@ */ #include <helper/uiconfigelementwrapperbase.hxx> -#include <general.h> #include <properties.h> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp> #include <vcl/svapp.hxx> diff --git a/framework/source/helper/uielementwrapperbase.cxx b/framework/source/helper/uielementwrapperbase.cxx index 5eea7c8a6125..656e09dafb68 100644 --- a/framework/source/helper/uielementwrapperbase.cxx +++ b/framework/source/helper/uielementwrapperbase.cxx @@ -18,12 +18,9 @@ */ #include <helper/uielementwrapperbase.hxx> -#include <general.h> -#include <properties.h> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <vcl/svapp.hxx> #include <comphelper/sequence.hxx> diff --git a/framework/source/interaction/quietinteraction.cxx b/framework/source/interaction/quietinteraction.cxx index 490041a258ba..b6f3495fff09 100644 --- a/framework/source/interaction/quietinteraction.cxx +++ b/framework/source/interaction/quietinteraction.cxx @@ -28,10 +28,9 @@ #include <com/sun/star/document/LockedDocumentRequest.hpp> +#include <vcl/errcode.hxx> #include <vcl/svapp.hxx> -#include <vcl/errinf.hxx> - namespace framework{ QuietInteraction::QuietInteraction() diff --git a/framework/source/jobs/helponstartup.cxx b/framework/source/jobs/helponstartup.cxx index 27ed74b7a8f4..b5c38a86c641 100644 --- a/framework/source/jobs/helponstartup.cxx +++ b/framework/source/jobs/helponstartup.cxx @@ -19,17 +19,14 @@ // include own header #include <jobs/helponstartup.hxx> -#include <loadenv/targethelper.hxx> #include <services.h> #include <targets.h> // include others #include <comphelper/configurationhelper.hxx> #include <comphelper/sequenceashashmap.hxx> -#include <unotools/configmgr.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> -#include <rtl/ustrbuf.hxx> // include interfaces #include <com/sun/star/frame/FrameSearchFlag.hpp> diff --git a/framework/source/jobs/job.cxx b/framework/source/jobs/job.cxx index 740d7eda4c4d..3b74cf01a2f4 100644 --- a/framework/source/jobs/job.cxx +++ b/framework/source/jobs/job.cxx @@ -19,8 +19,6 @@ #include <jobs/job.hxx> #include <jobs/jobresult.hxx> -#include <general.h> -#include <services.h> #include <com/sun/star/frame/Desktop.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> @@ -32,7 +30,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/sequence.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/jobdata.cxx b/framework/source/jobs/jobdata.cxx index d524aa653a1d..1825aeae04d0 100644 --- a/framework/source/jobs/jobdata.cxx +++ b/framework/source/jobs/jobdata.cxx @@ -20,8 +20,6 @@ #include <jobs/configaccess.hxx> #include <jobs/jobdata.hxx> #include <classes/converter.hxx> -#include <general.h> -#include <services.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiHierarchicalPropertySet.hpp> diff --git a/framework/source/jobs/jobdispatch.cxx b/framework/source/jobs/jobdispatch.cxx index 2af4ea2b2c80..6ec94cb3293c 100644 --- a/framework/source/jobs/jobdispatch.cxx +++ b/framework/source/jobs/jobdispatch.cxx @@ -21,7 +21,6 @@ #include <jobs/joburl.hxx> #include <jobs/job.hxx> #include <classes/converter.hxx> -#include <general.h> #include <com/sun/star/frame/DispatchResultEvent.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> @@ -37,8 +36,6 @@ #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> -#include <unotools/configpaths.hxx> #include <vcl/svapp.hxx> using namespace framework; diff --git a/framework/source/jobs/jobexecutor.cxx b/framework/source/jobs/jobexecutor.cxx index a0fc06acd96c..4e8a93fa93c7 100644 --- a/framework/source/jobs/jobexecutor.cxx +++ b/framework/source/jobs/jobexecutor.cxx @@ -18,21 +18,16 @@ */ #include <jobs/job.hxx> -#include <jobs/joburl.hxx> #include <jobs/configaccess.hxx> #include <classes/converter.hxx> -#include <general.h> -#include <stdtypes.h> #include <helper/mischelper.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/task/XJobExecutor.hpp> #include <com/sun/star/container/XContainerListener.hpp> -#include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/document/XEventListener.hpp> @@ -42,7 +37,6 @@ #include <unotools/configmgr.hxx> #include <unotools/configpaths.hxx> #include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/jobs/jobresult.cxx b/framework/source/jobs/jobresult.cxx index 1c03a89ba645..4205d5e92086 100644 --- a/framework/source/jobs/jobresult.cxx +++ b/framework/source/jobs/jobresult.cxx @@ -19,10 +19,7 @@ #include <jobs/jobresult.hxx> #include <jobs/jobconst.hxx> -#include <general.h> -#include <services.h> -#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/sequence.hxx> diff --git a/framework/source/jobs/joburl.cxx b/framework/source/jobs/joburl.cxx index e818b1468490..e010968fc92a 100644 --- a/framework/source/jobs/joburl.cxx +++ b/framework/source/jobs/joburl.cxx @@ -22,9 +22,7 @@ #include <cstring> #include <jobs/joburl.hxx> -#include <general.h> -#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> namespace framework{ diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx index eb7b5882ae6f..b248274b9c16 100644 --- a/framework/source/jobs/shelljob.cxx +++ b/framework/source/jobs/shelljob.cxx @@ -25,10 +25,7 @@ // include others -#include <osl/file.hxx> #include <osl/process.h> -#include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> #include <comphelper/sequenceashashmap.hxx> // include interfaces diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx index bb858b33b5e7..4dc621245b4c 100644 --- a/framework/source/layoutmanager/helpers.cxx +++ b/framework/source/layoutmanager/helpers.cxx @@ -18,7 +18,6 @@ */ #include "helpers.hxx" -#include <services.h> #include <com/sun/star/ui/DockingArea.hpp> #include <com/sun/star/awt/Toolkit.hpp> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 3283798bd7e3..f9bbf677fc97 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -26,8 +26,6 @@ #include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> -#include <framework/addonsoptions.hxx> -#include <toolkit/helper/convert.hxx> #include <uielement/progressbarwrapper.hxx> #include <uiconfiguration/globalsettings.hxx> #include <uiconfiguration/windowstateproperties.hxx> @@ -38,17 +36,10 @@ #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/frame/FrameAction.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> -#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#include <com/sun/star/lang/SystemDependent.hpp> -#include <com/sun/star/awt/VclWindowPeerAttribute.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/awt/XSystemDependentWindowPeer.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/theWindowStateConfiguration.hpp> #include <com/sun/star/ui/theUIElementFactoryManager.hpp> #include <com/sun/star/container/XNameReplace.hpp> @@ -60,25 +51,17 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/lok.hxx> -#include <svtools/imgdef.hxx> -#include <tools/diagnose_ex.h> #include <vcl/status.hxx> #include <vcl/settings.hxx> #include <vcl/window.hxx> -#include <vcl/dockingarea.hxx> #include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> -#include <vcl/wall.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <comphelper/uno3.hxx> #include <rtl/instance.hxx> -#include <unotools/cmdoptions.hxx> #include <unotools/compatibilityviewoptions.hxx> #include <rtl/ref.hxx> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <algorithm> diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index e5484c7ed4c7..c7feaeacb70b 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -21,13 +21,11 @@ #include <uiconfiguration/windowstateproperties.hxx> #include <uielement/addonstoolbarwrapper.hxx> #include "helpers.hxx" -#include <services.h> #include <services/layoutmanager.hxx> #include <strings.hrc> #include <classes/fwkresid.hxx> #include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/container/XNameReplace.hpp> @@ -39,7 +37,6 @@ #include <unotools/cmdoptions.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <toolkit/helper/convert.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <vcl/i18nhelp.hxx> #include <vcl/dockingarea.hxx> #include <vcl/settings.hxx> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 5c1414f3cbdf..a4ed4a3ef23b 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -36,11 +36,8 @@ #include <comphelper/processfactory.hxx> #include <officecfg/Office/Common.hxx> -#include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/awt/XWindow2.hpp> -#include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XContainerQuery.hpp> #include <com/sun/star/container/XEnumeration.hpp> #include <com/sun/star/document/MacroExecMode.hpp> #include <com/sun/star/document/XTypeDetection.hpp> @@ -58,9 +55,7 @@ #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> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> @@ -85,7 +80,6 @@ #include <svtools/sfxecode.hxx> #include <unotools/ucbhelper.hxx> #include <comphelper/configurationhelper.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> #include <vcl/errcode.hxx> diff --git a/framework/source/recording/dispatchrecorder.cxx b/framework/source/recording/dispatchrecorder.cxx index 31fac8710c45..647b2601d334 100644 --- a/framework/source/recording/dispatchrecorder.cxx +++ b/framework/source/recording/dispatchrecorder.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/script/Converter.hpp> #include <o3tl/any.hxx> #include <osl/diagnose.h> -#include <services.h> #include <vcl/svapp.hxx> #include <typelib/typedescription.h> diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index 74b62628ba58..249cc6f0273f 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -21,12 +21,8 @@ #include <loadenv/loadenv.hxx> -#include <loadenv/targethelper.hxx> -#include <pattern/frame.hxx> - #include <strings.hrc> #include <classes/fwkresid.hxx> -#include <protocols.h> #include <properties.h> #include <targets.h> @@ -49,10 +45,8 @@ #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDesktop.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/util/XChangesNotifier.hpp> -#include <com/sun/star/util/XChangesBatch.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> @@ -88,7 +82,6 @@ #include <unotools/tempfile.hxx> #include <ucbhelper/content.hxx> -#include <osl/time.h> #include <vcl/weld.hxx> #include <osl/file.hxx> #include <sal/log.hxx> @@ -99,7 +92,6 @@ #include <officecfg/Office/Recovery.hxx> #include <officecfg/Setup.hxx> -#include <general.h> #include <stdtypes.h> using namespace css::uno; diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 49104168dc86..2a8947d36669 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -20,7 +20,6 @@ #include <services/desktop.hxx> #include <loadenv/loadenv.hxx> -#include <loadenv/targethelper.hxx> #include <helper/ocomponentaccess.hxx> #include <helper/oframes.hxx> @@ -29,7 +28,6 @@ #include <dispatch/interceptionhelper.hxx> #include <classes/taskcreator.hxx> #include <threadhelp/transactionguard.hxx> -#include <general.h> #include <properties.h> #include <targets.h> @@ -39,25 +37,14 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/frame/TerminationVetoException.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/awt/WindowDescriptor.hpp> -#include <com/sun/star/awt/WindowAttribute.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/document/XInteractionFilterSelect.hpp> #include <com/sun/star/task/ErrorCodeRequest.hpp> -#include <com/sun/star/ucb/InteractiveIOException.hpp> -#include <com/sun/star/ucb/InteractiveAugmentedIOException.hpp> #include <com/sun/star/frame/DispatchResultState.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/document/MacroExecMode.hpp> -#include <com/sun/star/document/UpdateDocMode.hpp> #include <com/sun/star/frame/XTerminateListener2.hpp> #include <comphelper/numberedcollection.hxx> @@ -69,9 +56,7 @@ #include <desktop/crashreport.hxx> #include <vcl/scheduler.hxx> #include <sal/log.hxx> -#include <rtl/ustrbuf.hxx> - -#include <vcl/errinf.hxx> +#include <vcl/errcode.hxx> #include <unotools/configmgr.hxx> namespace framework{ diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index d116d372b6a6..aebeb9fa2503 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -23,7 +23,6 @@ #include <dispatch/dispatchprovider.hxx> #include <dispatch/interceptionhelper.hxx> -#include <dispatch/closedispatcher.hxx> #include <dispatch/windowcommanddispatch.hxx> #include <loadenv/loadenv.hxx> #include <helper/oframes.hxx> @@ -35,7 +34,6 @@ #include <helper/dockingareadefaultacceptor.hxx> #include <dispatch/dispatchinformationprovider.hxx> #include <classes/framecontainer.hxx> -#include <general.h> #include <pattern/window.hxx> #include <properties.h> @@ -70,24 +68,17 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> -#include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <cppuhelper/factory.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> #include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <unotools/moduleoptions.hxx> #include <tools/diagnose_ex.h> -#include <vcl/menu.hxx> #include <unotools/cmdoptions.hxx> #include <vcl/threadex.hxx> diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 25c8305d94d9..74a9810ee402 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -23,7 +23,6 @@ #include <unordered_map> #include <properties.h> -#include <stdtypes.h> #include <helper/mischelper.hxx> #include <com/sun/star/beans/Property.hpp> @@ -48,7 +47,6 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequence.hxx> #include <comphelper/configurationhelper.hxx> -#include <unotools/configitem.hxx> #include <unotools/configpaths.hxx> using namespace framework; diff --git a/framework/source/services/sessionlistener.cxx b/framework/source/services/sessionlistener.cxx index f88fd258c1e6..0bf1665ae2ed 100644 --- a/framework/source/services/sessionlistener.cxx +++ b/framework/source/services/sessionlistener.cxx @@ -21,12 +21,8 @@ #include <sal/log.hxx> #include <services/desktop.hxx> -#include <protocols.h> -#include <general.h> #include <tools/diagnose_ex.h> -#include <vcl/svapp.hxx> -#include <unotools/tempfile.hxx> #include <com/sun/star/beans/NamedValue.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/frame/theAutoRecovery.hpp> @@ -43,7 +39,6 @@ #include <com/sun/star/util/URL.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <unotools/pathoptions.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/framework/source/services/substitutepathvars.cxx b/framework/source/services/substitutepathvars.cxx index 3c5733d47a1b..d23466e1bd64 100644 --- a/framework/source/services/substitutepathvars.cxx +++ b/framework/source/services/substitutepathvars.cxx @@ -33,7 +33,6 @@ #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> #include <rtl/bootstrap.hxx> -#include <sal/log.hxx> #include <officecfg/Office/Paths.hxx> diff --git a/framework/source/services/uriabbreviation.cxx b/framework/source/services/uriabbreviation.cxx index f2355a2c3360..6762afcf0f61 100644 --- a/framework/source/services/uriabbreviation.cxx +++ b/framework/source/services/uriabbreviation.cxx @@ -21,8 +21,6 @@ #include <services.h> #include <sal/config.h> -#include <cppuhelper/factory.hxx> -#include <cppuhelper/implementationentry.hxx> #include <tools/urlobj.hxx> diff --git a/framework/source/services/urltransformer.cxx b/framework/source/services/urltransformer.cxx index 23a314026588..aa026f64504b 100644 --- a/framework/source/services/urltransformer.cxx +++ b/framework/source/services/urltransformer.cxx @@ -17,12 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <services.h> - #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <tools/urlobj.hxx> -#include <rtl/ref.hxx> #include <rtl/ustrbuf.hxx> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/framework/source/tabwin/tabwindow.cxx b/framework/source/tabwin/tabwindow.cxx index 969fe3578136..85ab4441e5fd 100644 --- a/framework/source/tabwin/tabwindow.cxx +++ b/framework/source/tabwin/tabwindow.cxx @@ -21,14 +21,12 @@ #include <properties.h> #include <services.h> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/PosSize.hpp> #include <com/sun/star/awt/WindowDescriptor.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <rtl/ustrbuf.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <toolkit/helper/vclunohelper.hxx> diff --git a/framework/source/tabwin/tabwinfactory.cxx b/framework/source/tabwin/tabwinfactory.cxx index c723f597c631..1754dd5c2835 100644 --- a/framework/source/tabwin/tabwinfactory.cxx +++ b/framework/source/tabwin/tabwinfactory.cxx @@ -21,14 +21,11 @@ #include <tabwin/tabwinfactory.hxx> #include <tabwin/tabwindow.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/awt/Toolkit.hpp> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/awt/WindowAttribute.hpp> #include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> // Defines diff --git a/framework/source/uiconfiguration/ImageList.cxx b/framework/source/uiconfiguration/ImageList.cxx index c287adc44f31..dfe936b50abd 100644 --- a/framework/source/uiconfiguration/ImageList.cxx +++ b/framework/source/uiconfiguration/ImageList.cxx @@ -17,18 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <osl/file.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> -#include <tools/stream.hxx> -#include <vcl/settings.hxx> -#include <vcl/outdev.hxx> -#include <vcl/graph.hxx> -#include <vcl/graphicfilter.hxx> -#include <vcl/svapp.hxx> #include <vcl/image.hxx> -#include <vcl/imagerepository.hxx> -#include <vcl/ImageTree.hxx> #include "ImageList.hxx" ImageList::ImageList() diff --git a/framework/source/uiconfiguration/globalsettings.cxx b/framework/source/uiconfiguration/globalsettings.cxx index 02d6032093f7..288e81a676c0 100644 --- a/framework/source/uiconfiguration/globalsettings.cxx +++ b/framework/source/uiconfiguration/globalsettings.cxx @@ -20,16 +20,11 @@ #include <uiconfiguration/globalsettings.hxx> #include <services.h> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XEventListener.hpp> -#include <rtl/ustrbuf.hxx> #include <rtl/instance.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/implbase.hxx> diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index 7d2fb013330a..b39c77b69a37 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -18,21 +18,11 @@ */ #include <uiconfiguration/imagemanager.hxx> -#include <xml/imagesconfiguration.hxx> -#include <uiconfiguration/graphicnameaccess.hxx> #include "imagemanagerimpl.hxx" -#include <properties.h> - -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/io/XStream.hpp> #include <vcl/svapp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> using ::com::sun::star::uno::Sequence; using ::com::sun::star::uno::XInterface; diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index a24e3a05c33c..55372351c33a 100644 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -21,12 +21,10 @@ #include <xml/imagesconfiguration.hxx> #include <uiconfiguration/imagetype.hxx> #include <uiconfiguration/graphicnameaccess.hxx> -#include <services.h> #include <properties.h> #include <com/sun/star/frame/theUICommandDescription.hpp> -#include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> @@ -40,16 +38,13 @@ #include <com/sun/star/ui/ImageType.hpp> #include <vcl/graph.hxx> #include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> #include <o3tl/enumrange.hxx> #include <osl/mutex.hxx> #include <comphelper/sequence.hxx> -#include <tools/urlobj.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/pngread.hxx> #include <vcl/pngwrite.hxx> #include <rtl/instance.hxx> -#include <svtools/miscopt.hxx> #include <memory> using ::com::sun::star::uno::Sequence; diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index 1f4d51798b55..05041fe0f198 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -18,27 +18,11 @@ */ #include <uiconfiguration/moduleimagemanager.hxx> -#include <xml/imagesconfiguration.hxx> -#include <uiconfiguration/graphicnameaccess.hxx> -#include <services.h> #include "imagemanagerimpl.hxx" -#include <properties.h> - -#include <com/sun/star/ui/UIElementType.hpp> -#include <com/sun/star/ui/ConfigurationEvent.hpp> -#include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - -#include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> + #include <sal/log.hxx> -#include <osl/file.hxx> // namespaces diff --git a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx index 8c0fb8563ade..5f29f804d8ec 100644 --- a/framework/source/uiconfiguration/moduleuicfgsupplier.cxx +++ b/framework/source/uiconfiguration/moduleuicfgsupplier.cxx @@ -24,9 +24,6 @@ #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/embed/XPackageStructureCreator.hpp> #include <com/sun/star/ui/ModuleUIConfigurationManager.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> @@ -37,7 +34,6 @@ #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <vcl/svapp.hxx> #include <unordered_map> diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 691c4b69a794..22fce3235fd1 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -19,7 +19,6 @@ #include <accelerators/presethandler.hxx> #include <uiconfiguration/moduleimagemanager.hxx> -#include <stdtypes.h> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> @@ -31,7 +30,6 @@ #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/ui/ConfigurationEvent.hpp> #include <com/sun/star/ui/ModuleAcceleratorConfiguration.hpp> -#include <com/sun/star/ui/XUIConfigurationPersistence.hpp> #include <com/sun/star/ui/XModuleUIConfigurationManager2.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IllegalAccessException.hpp> @@ -53,11 +51,8 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/implbase.hxx> -#include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <comphelper/sequenceashashmap.hxx> #include <comphelper/servicehelper.hxx> diff --git a/framework/source/uiconfiguration/uicategorydescription.cxx b/framework/source/uiconfiguration/uicategorydescription.cxx index f7b1d3665033..5acec278f5e3 100644 --- a/framework/source/uiconfiguration/uicategorydescription.cxx +++ b/framework/source/uiconfiguration/uicategorydescription.cxx @@ -19,25 +19,17 @@ #include <uielement/uicommanddescription.hxx> -#include <properties.h> - #include <helper/mischelper.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <unotools/configmgr.hxx> -#include <vcl/mnemonic.hxx> #include <comphelper/propertysequence.hxx> #include <unordered_map> diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 778028f98d42..0b809363316a 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -51,8 +51,6 @@ #include <comphelper/sequence.hxx> #include <comphelper/servicehelper.hxx> #include <vcl/svapp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <unordered_map> diff --git a/framework/source/uielement/FixedImageToolbarController.cxx b/framework/source/uielement/FixedImageToolbarController.cxx index b90f24abfe6e..e3a37e9c4c4d 100644 --- a/framework/source/uielement/FixedImageToolbarController.cxx +++ b/framework/source/uielement/FixedImageToolbarController.cxx @@ -19,16 +19,11 @@ #include <uielement/FixedImageToolbarController.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - #include <vcl/svapp.hxx> -#include <vcl/window.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <svtools/miscopt.hxx> #include <svtools/imgdef.hxx> -#include <framework/sfxhelperfunctions.hxx> #include <framework/addonsoptions.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/FixedTextToolbarController.cxx b/framework/source/uielement/FixedTextToolbarController.cxx index 7a2a41ae9c0f..97a980987300 100644 --- a/framework/source/uielement/FixedTextToolbarController.cxx +++ b/framework/source/uielement/FixedTextToolbarController.cxx @@ -19,10 +19,6 @@ #include <uielement/FixedTextToolbarController.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <vcl/window.hxx> #include <vcl/toolbox.hxx> #include <vcl/fixed.hxx> #include <vcl/svapp.hxx> @@ -95,4 +91,4 @@ void FixedTextToolbarController::executeControlCommand( } // namespace -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 3fb7a775dc73..2c5071619306 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -20,36 +20,20 @@ #include <uielement/addonstoolbarmanager.hxx> #include <uielement/toolbarmerger.hxx> -#include <uielement/generictoolbarcontroller.hxx> -#include <services.h> -#include <framework/sfxhelperfunctions.hxx> #include <classes/resource.hxx> #include <framework/addonsoptions.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 <com/sun/star/ui/ItemType.hpp> + #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XToolbarController.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/DockingArea.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> +#include <com/sun/star/util/XUpdatable.hpp> #include <comphelper/propertysequence.hxx> -#include <svtools/imgdef.hxx> -#include <svtools/toolboxcontroller.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svtools/miscopt.hxx> +#include <vcl/event.hxx> #include <vcl/svapp.hxx> -#include <vcl/menu.hxx> -#include <vcl/syswin.hxx> -#include <vcl/taskpanelist.hxx> #include <vcl/toolbox.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 657c39b1ce31..8c62997a27a2 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -18,22 +18,12 @@ */ #include <uielement/addonstoolbarwrapper.hxx> -#include <framework/actiontriggerhelper.hxx> -#include <uielement/constitemcontainer.hxx> -#include <uielement/rootitemcontainer.hxx> #include <uielement/addonstoolbarmanager.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <svtools/miscopt.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/uielement/buttontoolbarcontroller.cxx b/framework/source/uielement/buttontoolbarcontroller.cxx index 1a37d33df159..175fad04bbb2 100644 --- a/framework/source/uielement/buttontoolbarcontroller.cxx +++ b/framework/source/uielement/buttontoolbarcontroller.cxx @@ -20,25 +20,15 @@ #include <uielement/buttontoolbarcontroller.hxx> #include <com/sun/star/util/URLTransformer.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <rtl/uri.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/processfactory.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> -#include <vcl/window.hxx> -#include <vcl/graph.hxx> -#include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> -#include <svtools/miscopt.hxx> using namespace ::com::sun::star; using namespace css::awt; diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index be323fb2965e..699fd676cb35 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -19,13 +19,11 @@ #include <uielement/comboboxtoolbarcontroller.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/util/Color.hpp> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> #include <vcl/combobox.hxx> diff --git a/framework/source/uielement/controlmenucontroller.cxx b/framework/source/uielement/controlmenucontroller.cxx index 28bae54e4a1e..3ed5bc11aee2 100644 --- a/framework/source/uielement/controlmenucontroller.cxx +++ b/framework/source/uielement/controlmenucontroller.cxx @@ -19,11 +19,6 @@ #include <sal/config.h> -#include <stdtypes.h> - -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/frame/XStatusListener.hpp> @@ -34,20 +29,13 @@ #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <vcl/i18nhelp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> -#include <svl/solar.hrc> #include <vcl/image.hxx> -#include <svtools/menuoptions.hxx> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <osl/mutex.hxx> #include <memory> #include <unordered_map> -#include <svx/svxids.hrc> - #include <bitmaps.hlst> // See svx/source/form/fmshimp.cxx for other use of this .ui diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index fc8e43bd1440..ef73758a6040 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -19,12 +19,10 @@ #include <uielement/dropdownboxtoolbarcontroller.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/lstbox.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/edittoolbarcontroller.cxx b/framework/source/uielement/edittoolbarcontroller.cxx index c095ef746010..0ec00b73a3e4 100644 --- a/framework/source/uielement/edittoolbarcontroller.cxx +++ b/framework/source/uielement/edittoolbarcontroller.cxx @@ -19,12 +19,10 @@ #include <uielement/edittoolbarcontroller.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> #include <vcl/event.hxx> #include <vcl/edit.hxx> diff --git a/framework/source/uielement/fontmenucontroller.cxx b/framework/source/uielement/fontmenucontroller.cxx index 59ddb0b73ac1..184626b2b1cb 100644 --- a/framework/source/uielement/fontmenucontroller.cxx +++ b/framework/source/uielement/fontmenucontroller.cxx @@ -21,8 +21,6 @@ #include <services.h> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index e32f22076b35..8bdcf5f6b038 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -21,19 +21,15 @@ #include <services.h> -#include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #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> #include <vcl/i18nhelp.hxx> -#include <vcl/outdev.hxx> #include <vcl/print.hxx> #include <vcl/settings.hxx> #include <svtools/ctrltool.hxx> diff --git a/framework/source/uielement/footermenucontroller.cxx b/framework/source/uielement/footermenucontroller.cxx index 9cc6a9d30608..aef746a434ec 100644 --- a/framework/source/uielement/footermenucontroller.cxx +++ b/framework/source/uielement/footermenucontroller.cxx @@ -21,18 +21,7 @@ #include <services.h> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <vcl/menu.hxx> -#include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> -#include <rtl/ustrbuf.hxx> // Defines diff --git a/framework/source/uielement/genericstatusbarcontroller.cxx b/framework/source/uielement/genericstatusbarcontroller.cxx index ee3b28d4af75..59515ce1422b 100644 --- a/framework/source/uielement/genericstatusbarcontroller.cxx +++ b/framework/source/uielement/genericstatusbarcontroller.cxx @@ -21,9 +21,6 @@ #include <uielement/statusbarmerger.hxx> #include <vcl/svapp.hxx> -#include <vcl/status.hxx> -#include <vcl/image.hxx> -#include <toolkit/helper/convert.hxx> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/XStatusbarItem.hpp> diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index a657efd3cc88..746f4e18f5ca 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -19,13 +19,11 @@ #include <uielement/generictoolbarcontroller.hxx> -#include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/status/ItemStatus.hpp> -#include <com/sun/star/frame/status/ItemState.hpp> #include <com/sun/star/frame/status/Visibility.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> @@ -33,12 +31,10 @@ #include <svtools/toolboxcontroller.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> #include <tools/urlobj.hxx> #include <strings.hrc> #include <classes/fwkresid.hxx> -#include <framework/menuconfiguration.hxx> #include <uielement/menubarmanager.hxx> using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index 991d3a3fe4d2..d45014becdc0 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -24,9 +24,6 @@ #include <strings.hrc> #include <classes/fwkresid.hxx> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -34,7 +31,6 @@ #include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> #include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index 69af4aa37233..18b23dd41628 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -21,16 +21,12 @@ #include <framework/addonsoptions.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <comphelper/getexpandeduri.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> -#include <vcl/window.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx index abaf795b4d38..a0e60acd8bd7 100644 --- a/framework/source/uielement/langselectionmenucontroller.cxx +++ b/framework/source/uielement/langselectionmenucontroller.cxx @@ -21,22 +21,13 @@ #include <services.h> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> #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> -#include <rtl/ustrbuf.hxx> -#include <vcl/mnemonic.hxx> -#include <com/sun/star/document/XDocumentLanguages.hpp> - -#include <i18nlangtag/mslangid.hxx> #include <svl/languageoptions.hxx> #include <svtools/langtab.hxx> #include <classes/fwkresid.hxx> diff --git a/framework/source/uielement/langselectionstatusbarcontroller.cxx b/framework/source/uielement/langselectionstatusbarcontroller.cxx index db69de244a91..cc4ac14a2843 100644 --- a/framework/source/uielement/langselectionstatusbarcontroller.cxx +++ b/framework/source/uielement/langselectionstatusbarcontroller.cxx @@ -21,9 +21,6 @@ #include <services.h> #include <strings.hrc> #include <vcl/svapp.hxx> -#include <vcl/window.hxx> -#include <vcl/status.hxx> -#include <toolkit/helper/convert.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/awt/PopupMenu.hpp> @@ -32,26 +29,19 @@ #include <svtools/statusbarcontroller.hxx> #include <sal/types.h> #include <sal/log.hxx> -#include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/document/XDocumentLanguages.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/frame/ModuleManager.hpp> -#include <i18nlangtag/mslangid.hxx> #include <com/sun/star/i18n/ScriptType.hpp> #include <com/sun/star/ui/XStatusbarItem.hpp> #include <com/sun/star/frame/XFrame.hpp> -#include <tools/gen.hxx> #include <com/sun/star/awt/Command.hpp> #include <svl/languageoptions.hxx> #include <helper/mischelper.hxx> #include <rtl/ustrbuf.hxx> -#include <rtl/ref.hxx> - -#include <stdtypes.h> #include <map> #include <set> diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index 68932229c692..fa60b2cb302c 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -18,19 +18,12 @@ */ #include <uielement/macrosmenucontroller.hxx> -#include <uielement/menubarmanager.hxx> #include <services.h> -#include <com/sun/star/awt/MenuItemStyle.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#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> -#include <rtl/ustrbuf.hxx> -#include <helper/mischelper.hxx> #include <osl/mutex.hxx> using namespace com::sun::star::uno; diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 2dbb5f9950ce..55f3b0d3450b 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -23,28 +23,20 @@ #include <framework/addonmenu.hxx> #include <framework/addonsoptions.hxx> #include <classes/fwkresid.hxx> -#include <helper/mischelper.hxx> #include <strings.hrc> -#include <services.h> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/container/XEnumeration.hpp> -#include <com/sun/star/util/XStringWidth.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XCurrentContext.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/frame/XPopupMenuController.hpp> #include <com/sun/star/frame/thePopupMenuControllerFactory.hpp> #include <com/sun/star/lang/SystemDependent.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/ui/ImageType.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> @@ -57,10 +49,7 @@ #include <svtools/menuoptions.hxx> #include <svtools/javainteractionhandler.hxx> #include <uno/current_context.hxx> -#include <unotools/historyoptions.hxx> -#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> @@ -69,7 +58,6 @@ #include <vcl/menu.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> -#include <osl/file.hxx> #include <sal/log.hxx> #include <svtools/acceleratorexecute.hxx> #include <svtools/miscopt.hxx> diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 36e756c6db71..4c0d243c0753 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -18,14 +18,8 @@ */ #include <uielement/menubarwrapper.hxx> -#include <framework/actiontriggerhelper.hxx> -#include <services.h> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/frame/ModuleManager.hpp> diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index f2da491d0dce..5387568e1304 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -22,9 +22,7 @@ #include <services.h> -#include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/GlobalAcceleratorConfiguration.hpp> @@ -33,12 +31,8 @@ #include <com/sun/star/util/XURLTransformer.hpp> #include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> -#include <rtl/ustrbuf.hxx> -#include <osl/file.hxx> -#include <svtools/menuoptions.hxx> #include <svtools/acceleratorexecute.hxx> #include <svtools/imagemgr.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -46,7 +40,6 @@ #include <unotools/dynamicmenuoptions.hxx> #include <unotools/moduleoptions.hxx> #include <osl/mutex.hxx> -#include <memory> // Defines #define aSlotNewDocDirect ".uno:AddDirect" diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 1b74f8bfdec2..05d217b7a06b 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -19,13 +19,8 @@ #include <stdtypes.h> -#include <com/sun/star/awt/XDevice.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/awt/MenuItemStyle.hpp> - #include <com/sun/star/embed/VerbAttributes.hpp> #include <com/sun/star/embed/VerbDescriptor.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <toolkit/awt/vclxmenu.hxx> @@ -33,9 +28,6 @@ #include <cppuhelper/weak.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> #include <osl/mutex.hxx> using namespace com::sun::star::uno; diff --git a/framework/source/uielement/popuptoolbarcontroller.cxx b/framework/source/uielement/popuptoolbarcontroller.cxx index 63a048604d76..161fce30402d 100644 --- a/framework/source/uielement/popuptoolbarcontroller.cxx +++ b/framework/source/uielement/popuptoolbarcontroller.cxx @@ -23,7 +23,6 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertyvalue.hxx> #include <framework/menuconfiguration.hxx> -#include <rtl/ref.hxx> #include <svtools/imagemgr.hxx> #include <svtools/miscopt.hxx> #include <svtools/toolboxcontroller.hxx> @@ -36,7 +35,6 @@ #include <vcl/menu.hxx> #include <vcl/svapp.hxx> #include <vcl/toolbox.hxx> -#include <sal/log.hxx> #include <com/sun/star/awt/PopupMenuDirection.hpp> #include <com/sun/star/awt/XPopupMenu.hpp> diff --git a/framework/source/uielement/progressbarwrapper.cxx b/framework/source/uielement/progressbarwrapper.cxx index 294d8ae32989..3a0c04a262bd 100644 --- a/framework/source/uielement/progressbarwrapper.cxx +++ b/framework/source/uielement/progressbarwrapper.cxx @@ -19,7 +19,6 @@ #include <uielement/progressbarwrapper.hxx> -#include <helper/statusindicator.hxx> #include <uielement/statusindicatorinterfacewrapper.hxx> #include <com/sun/star/ui/UIElementType.hpp> diff --git a/framework/source/uielement/recentfilesmenucontroller.cxx b/framework/source/uielement/recentfilesmenucontroller.cxx index 72e3e5006e6f..395a72352ba0 100644 --- a/framework/source/uielement/recentfilesmenucontroller.cxx +++ b/framework/source/uielement/recentfilesmenucontroller.cxx @@ -21,16 +21,13 @@ #include <classes/fwkresid.hxx> #include <cppuhelper/supportsservice.hxx> -#include <osl/file.hxx> #include <osl/mutex.hxx> -#include <rtl/ref.hxx> #include <svtools/popupmenucontrollerbase.hxx> #include <tools/urlobj.hxx> #include <toolkit/awt/vclxmenu.hxx> #include <unotools/historyoptions.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vcl/commandinfoprovider.hxx> using namespace css; using namespace com::sun::star::uno; diff --git a/framework/source/uielement/spinfieldtoolbarcontroller.cxx b/framework/source/uielement/spinfieldtoolbarcontroller.cxx index 2196dc3c90e5..ae51cc6063ea 100644 --- a/framework/source/uielement/spinfieldtoolbarcontroller.cxx +++ b/framework/source/uielement/spinfieldtoolbarcontroller.cxx @@ -20,18 +20,15 @@ #include <sal/config.h> #include <stdio.h> -#include <wchar.h> #include <uielement/spinfieldtoolbarcontroller.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <svtools/toolboxcontroller.hxx> #include <vcl/event.hxx> #include <vcl/spinfld.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> #include <vcl/toolbox.hxx> #include <o3tl/char16_t2wchar_t.hxx> diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 89e237c32d56..46736f51e126 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -24,26 +24,19 @@ #include <framework/addonsoptions.hxx> #include <uielement/statusbarmerger.hxx> #include <uielement/statusbaritem.hxx> -#include <stdtypes.h> -#include <services.h> -#include <general.h> -#include <properties.h> -#include <helper/mischelper.hxx> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/frame/theStatusbarControllerFactory.hpp> #include <com/sun/star/ui/ItemStyle.hpp> #include <com/sun/star/ui/ItemType.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/Command.hpp> #include <com/sun/star/ui/XStatusbarItem.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/sequence.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <svtools/statusbarcontroller.hxx> -#include <svtools/toolboxcontroller.hxx> #include <tools/debug.hxx> #include <vcl/commandevent.hxx> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 75bd83c856e6..02c3b458821b 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -19,17 +19,8 @@ #include <uielement/statusbarwrapper.hxx> -#include <framework/actiontriggerhelper.hxx> -#include <uielement/constitemcontainer.hxx> -#include <uielement/rootitemcontainer.hxx> #include <uielement/statusbar.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <toolkit/helper/vclunohelper.hxx> diff --git a/framework/source/uielement/statusindicatorinterfacewrapper.cxx b/framework/source/uielement/statusindicatorinterfacewrapper.cxx index 3dc19068c66e..ba796036b0dd 100644 --- a/framework/source/uielement/statusindicatorinterfacewrapper.cxx +++ b/framework/source/uielement/statusindicatorinterfacewrapper.cxx @@ -20,8 +20,6 @@ #include <uielement/statusindicatorinterfacewrapper.hxx> #include <uielement/progressbarwrapper.hxx> -#include <vcl/svapp.hxx> - using namespace cppu; using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index f884bb23e8cc..8cd8a94b51f0 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -19,24 +19,10 @@ #include <uielement/togglebuttontoolbarcontroller.hxx> -#include <framework/addonsoptions.hxx> - -#include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/util/XMacroExpander.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <rtl/uri.hxx> #include <vcl/svapp.hxx> -#include <vcl/mnemonic.hxx> -#include <vcl/window.hxx> -#include <vcl/graph.hxx> -#include <vcl/graphicfilter.hxx> #include <vcl/toolbox.hxx> #include <vcl/menu.hxx> #include <vcl/combobox.hxx> -#include <svtools/miscopt.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 5fdb7b223bc4..aa3498c2723c 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -25,8 +25,6 @@ #include <uielement/generictoolbarcontroller.hxx> #include <uielement/styletoolbarcontroller.hxx> -#include <services.h> -#include <general.h> #include <properties.h> #include <framework/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index dc4f0509032a..1bd87a1c26d2 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -30,8 +30,6 @@ #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 8e68e19c446c..218f50c7e7a3 100644 --- a/framework/source/uielement/toolbarmodemenucontroller.cxx +++ b/framework/source/uielement/toolbarmodemenucontroller.cxx @@ -19,13 +19,9 @@ #include <uielement/toolbarmodemenucontroller.hxx> #include <services.h> -#include <framework/sfxhelperfunctions.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/ModuleManager.hpp> @@ -35,15 +31,11 @@ #include <toolkit/awt/vclxmenu.hxx> #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <vcl/EnumContext.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> #include <comphelper/types.hxx> -#include <vcl/window.hxx> -#include <svtools/menuoptions.hxx> #include <svtools/miscopt.hxx> -#include <officecfg/Office/UI/ToolbarMode.hxx> #include <unotools/confignode.hxx> // Defines diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 91c81511766e..f9f79ee19f76 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -29,16 +29,13 @@ #include <framework/sfxhelperfunctions.hxx> #include <uiconfiguration/windowstateproperties.hxx> -#include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> -#include <com/sun/star/ui/XUIElementSettings.hpp> #include <com/sun/star/ui/theModuleUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/UIElementType.hpp> @@ -46,7 +43,6 @@ #include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <vcl/i18nhelp.hxx> #include <vcl/image.hxx> #include <vcl/settings.hxx> #include <vcl/commandinfoprovider.hxx> @@ -55,7 +51,6 @@ #include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> -#include <svtools/menuoptions.hxx> #include <unotools/cmdoptions.hxx> #include <svtools/miscopt.hxx> #include <unotools/collatorwrapper.hxx> diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 1870b5e93d76..fec3138dc78e 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -18,22 +18,12 @@ */ #include <uielement/toolbarwrapper.hxx> -#include <framework/actiontriggerhelper.hxx> -#include <uielement/constitemcontainer.hxx> -#include <uielement/rootitemcontainer.hxx> #include <uielement/toolbarmanager.hxx> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/awt/XSystemDependentMenuPeer.hpp> -#include <com/sun/star/awt/XMenuBar.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/ui/UIElementType.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <toolkit/helper/vclunohelper.hxx> -#include <toolkit/awt/vclxwindow.hxx> #include <cppuhelper/queryinterface.hxx> #include <svtools/miscopt.hxx> diff --git a/framework/source/uielement/uicommanddescription.cxx b/framework/source/uielement/uicommanddescription.cxx index 02e41f47fcb3..afbaba2f08cf 100644 --- a/framework/source/uielement/uicommanddescription.cxx +++ b/framework/source/uielement/uicommanddescription.cxx @@ -24,14 +24,11 @@ #include <helper/mischelper.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <rtl/ustrbuf.hxx> #include <cppuhelper/implbase.hxx> #include <unotools/configmgr.hxx> diff --git a/framework/source/uifactory/addonstoolbarfactory.cxx b/framework/source/uifactory/addonstoolbarfactory.cxx index 8ee041dea6eb..5e0dbc01861a 100644 --- a/framework/source/uifactory/addonstoolbarfactory.cxx +++ b/framework/source/uifactory/addonstoolbarfactory.cxx @@ -19,23 +19,16 @@ #include <uielement/addonstoolbarwrapper.hxx> -#include <com/sun/star/util/XURLTransformer.hpp> #include <com/sun/star/frame/ModuleManager.hpp> #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/ui/XModuleUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/ui/XUIElementFactory.hpp> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> -#include <rtl/ref.hxx> -#include <rtl/ustrbuf.hxx> - -#include <services.h> using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uifactory/factoryconfiguration.cxx b/framework/source/uifactory/factoryconfiguration.cxx index 97440dd16306..421ae5034e75 100644 --- a/framework/source/uifactory/factoryconfiguration.cxx +++ b/framework/source/uifactory/factoryconfiguration.cxx @@ -22,16 +22,12 @@ #include <helper/mischelper.hxx> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XContainer.hpp> -#include <rtl/ustrbuf.hxx> #include <comphelper/propertysequence.hxx> -#include <cppuhelper/weak.hxx> // Defines diff --git a/framework/source/uifactory/menubarfactory.cxx b/framework/source/uifactory/menubarfactory.cxx index b8218a5379b1..2899b64285cc 100644 --- a/framework/source/uifactory/menubarfactory.cxx +++ b/framework/source/uifactory/menubarfactory.cxx @@ -29,9 +29,7 @@ #include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> -#include <vcl/menu.hxx> #include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uifactory/statusbarfactory.cxx b/framework/source/uifactory/statusbarfactory.cxx index 5756fb3465ca..6791db896f80 100644 --- a/framework/source/uifactory/statusbarfactory.cxx +++ b/framework/source/uifactory/statusbarfactory.cxx @@ -21,8 +21,6 @@ #include <uielement/statusbarwrapper.hxx> #include <cppuhelper/supportsservice.hxx> -#include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/uifactory/toolbarfactory.cxx b/framework/source/uifactory/toolbarfactory.cxx index 28a6da218250..f797ab2e6916 100644 --- a/framework/source/uifactory/toolbarfactory.cxx +++ b/framework/source/uifactory/toolbarfactory.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/supportsservice.hxx> #include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> #include <uielement/toolbarwrapper.hxx> #include <uifactory/menubarfactory.hxx> diff --git a/framework/source/uifactory/uicontrollerfactory.cxx b/framework/source/uifactory/uicontrollerfactory.cxx index 61d2e3f5f921..08aff413d7b1 100644 --- a/framework/source/uifactory/uicontrollerfactory.cxx +++ b/framework/source/uifactory/uicontrollerfactory.cxx @@ -20,11 +20,9 @@ #include <uifactory/factoryconfiguration.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XContainer.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp> -#include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> diff --git a/framework/source/uifactory/uielementfactorymanager.cxx b/framework/source/uifactory/uielementfactorymanager.cxx index ff93a1e7d256..5794fb044b0f 100644 --- a/framework/source/uifactory/uielementfactorymanager.cxx +++ b/framework/source/uifactory/uielementfactorymanager.cxx @@ -36,13 +36,12 @@ #include <com/sun/star/frame/XModuleManager2.hpp> #include <com/sun/star/ui/XUIElementFactoryManager.hpp> -#include <rtl/ustrbuf.hxx> +#include <rtl/ref.hxx> #include <sal/log.hxx> #include <comphelper/propertysequence.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <cppuhelper/supportsservice.hxx> -#include <vcl/svapp.hxx> using namespace com::sun::star::uno; using namespace com::sun::star::lang; diff --git a/framework/source/xml/acceleratorconfigurationreader.cxx b/framework/source/xml/acceleratorconfigurationreader.cxx index 36dd1c34ff7b..2ff467f6845e 100644 --- a/framework/source/xml/acceleratorconfigurationreader.cxx +++ b/framework/source/xml/acceleratorconfigurationreader.cxx @@ -23,16 +23,10 @@ #include <accelerators/keymapping.hxx> #include <xml/acceleratorconfigurationreader.hxx> -#include <acceleratorconst.h> - -#include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <com/sun/star/awt/KeyModifier.hpp> #include <com/sun/star/awt/KeyEvent.hpp> -#include <com/sun/star/awt/Key.hpp> -#include <com/sun/star/container/ElementExistException.hpp> -#include <vcl/svapp.hxx> #include <rtl/ustrbuf.hxx> namespace framework{ diff --git a/framework/source/xml/acceleratorconfigurationwriter.cxx b/framework/source/xml/acceleratorconfigurationwriter.cxx index 80270560a774..c94501ad12dc 100644 --- a/framework/source/xml/acceleratorconfigurationwriter.cxx +++ b/framework/source/xml/acceleratorconfigurationwriter.cxx @@ -28,9 +28,6 @@ #include <com/sun/star/xml/sax/XAttributeList.hpp> #include <com/sun/star/awt/KeyModifier.hpp> -#include <vcl/svapp.hxx> -#include <rtl/ustrbuf.hxx> - #include <comphelper/attributelist.hxx> namespace framework{ diff --git a/framework/source/xml/imagesconfiguration.cxx b/framework/source/xml/imagesconfiguration.cxx index 8d70adc1b97a..5c31414c78cb 100644 --- a/framework/source/xml/imagesconfiguration.cxx +++ b/framework/source/xml/imagesconfiguration.cxx @@ -18,7 +18,6 @@ */ #include <xml/imagesconfiguration.hxx> -#include <services.h> #include <xml/imagesdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> @@ -27,11 +26,7 @@ #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> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> - -#include <unotools/streamwrap.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star::xml::sax; diff --git a/framework/source/xml/imagesdocumenthandler.cxx b/framework/source/xml/imagesdocumenthandler.cxx index 00aa56bef709..90c717afad8b 100644 --- a/framework/source/xml/imagesdocumenthandler.cxx +++ b/framework/source/xml/imagesdocumenthandler.cxx @@ -17,16 +17,12 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <memory> -#include <stdio.h> - #include <xml/imagesdocumenthandler.hxx> #include <com/sun/star/xml/sax/XExtendedDocumentHandler.hpp> #include <com/sun/star/xml/sax/SAXException.hpp> #include <vcl/svapp.hxx> -#include <vcl/toolbox.hxx> #include <rtl/ustrbuf.hxx> #include <comphelper/attributelist.hxx> diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist index 6f092e83d27b..c4af0b0b1c0c 100644 --- a/solenv/clang-format/blacklist +++ b/solenv/clang-format/blacklist @@ -5037,7 +5037,6 @@ framework/inc/dispatch/servicehandler.hxx framework/inc/dispatch/startmoduledispatcher.hxx framework/inc/dispatch/systemexec.hxx framework/inc/fwidllapi.h -framework/inc/general.h framework/inc/helper/dockingareadefaultacceptor.hxx framework/inc/helper/mischelper.hxx framework/inc/helper/ocomponentaccess.hxx |