diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2020-11-08 21:17:54 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@cib.de> | 2020-11-12 10:53:07 +0100 |
commit | a5389cb5ddcd72e494040e7a976c4f290e2da4cc (patch) | |
tree | 6269a4543f96026f47b8d0756fd4d86a73be46f7 /framework/inc | |
parent | 64dcfe295762864656bc5876da10bec37b7fb6ec (diff) |
tdf#42949 Fix new IWYU warnings in directories [e-f]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I963aa5fb892a0be36212fd0587b69f217f017947
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105469
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@cib.de>
Diffstat (limited to 'framework/inc')
34 files changed, 2 insertions, 47 deletions
diff --git a/framework/inc/addonmenu.hxx b/framework/inc/addonmenu.hxx index 0b778b705afe..1f6443b48a79 100644 --- a/framework/inc/addonmenu.hxx +++ b/framework/inc/addonmenu.hxx @@ -18,12 +18,9 @@ */ #pragma once -#include <config_options.h> #include <rtl/ustring.hxx> #include <vcl/vclptr.hxx> -#include <framework/fwkdllapi.h> - namespace com::sun::star::beans { struct PropertyValue; } namespace com::sun::star::frame { class XFrame; } namespace com::sun::star::uno { template <class E> class Sequence; } diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 9c318c89a231..520bf37d3943 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <framework/fwkdllapi.h> #define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 9131e3e275b0..964d25d99f86 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -28,7 +28,6 @@ #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <framework/fwkdllapi.h> #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger" diff --git a/framework/inc/classes/converter.hxx b/framework/inc/classes/converter.hxx index 7841a237d905..66c6c716258b 100644 --- a/framework/inc/classes/converter.hxx +++ b/framework/inc/classes/converter.hxx @@ -20,14 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_CONVERTER_HXX -#include <config_options.h> #include <vector> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/NamedValue.hpp> #include <tools/datetime.hxx> -#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index f68d5773a4ad..26044593710f 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase.hxx> #include <vcl/image.hxx> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/classes/protocolhandlercache.hxx b/framework/inc/classes/protocolhandlercache.hxx index 849a7f548144..bbee8e729d89 100644 --- a/framework/inc/classes/protocolhandlercache.hxx +++ b/framework/inc/classes/protocolhandlercache.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX #define INCLUDED_FRAMEWORK_INC_CLASSES_PROTOCOLHANDLERCACHE_HXX -#include <config_options.h> #include <unordered_map> #include <com/sun/star/util/URL.hpp> diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 01bec3510d5c..b263f617b617 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -27,7 +27,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <framework/fwkdllapi.h> #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" diff --git a/framework/inc/dispatch/oxt_handler.hxx b/framework/inc/dispatch/oxt_handler.hxx index 4f5e084e3870..3ffb9c883035 100644 --- a/framework/inc/dispatch/oxt_handler.hxx +++ b/framework/inc/dispatch/oxt_handler.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX #define INCLUDED_FRAMEWORK_INC_DISPATCH_OXT_HANDLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XNotifyingDispatch.hpp> #include <com/sun/star/frame/XStatusListener.hpp> #include <com/sun/star/document/XExtendedFilterDetection.hpp> diff --git a/framework/inc/dispatch/popupmenudispatcher.hxx b/framework/inc/dispatch/popupmenudispatcher.hxx index 8d67ee008f18..95e9faeb5b77 100644 --- a/framework/inc/dispatch/popupmenudispatcher.hxx +++ b/framework/inc/dispatch/popupmenudispatcher.hxx @@ -35,7 +35,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/weakref.hxx> -#include <cppuhelper/interfacecontainer.h> namespace framework{ diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index fdbf809c1dbf..6ad2dc86cb88 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -27,7 +27,6 @@ #include <cppuhelper/weak.hxx> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/helper/shareablemutex.hxx b/framework/inc/helper/shareablemutex.hxx index 81b7a6d5f7ae..9e6c3ac41c97 100644 --- a/framework/inc/helper/shareablemutex.hxx +++ b/framework/inc/helper/shareablemutex.hxx @@ -22,7 +22,6 @@ #include <osl/interlck.h> #include <osl/mutex.hxx> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/jobs/configaccess.hxx b/framework/inc/jobs/configaccess.hxx index fc0dce8d6068..3301a63d2c4c 100644 --- a/framework/inc/jobs/configaccess.hxx +++ b/framework/inc/jobs/configaccess.hxx @@ -20,11 +20,9 @@ #ifndef INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX #define INCLUDED_FRAMEWORK_INC_JOBS_CONFIGACCESS_HXX -#include <config_options.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <rtl/ustring.hxx> -#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/menuconfiguration.hxx b/framework/inc/menuconfiguration.hxx index ea3acc41a2f0..a076de21b504 100644 --- a/framework/inc/menuconfiguration.hxx +++ b/framework/inc/menuconfiguration.hxx @@ -19,8 +19,6 @@ #pragma once -#include <config_options.h> - #include <cppuhelper/weakref.hxx> namespace com::sun::star::container { class XIndexAccess; } diff --git a/framework/inc/recording/dispatchrecorder.hxx b/framework/inc/recording/dispatchrecorder.hxx index 806fe3cb2f22..2a7afc550177 100644 --- a/framework/inc/recording/dispatchrecorder.hxx +++ b/framework/inc/recording/dispatchrecorder.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/frame/XDispatchRecorder.hpp> #include <com/sun/star/frame/DispatchStatement.hpp> #include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/script/XTypeConverter.hpp> diff --git a/framework/inc/recording/dispatchrecordersupplier.hxx b/framework/inc/recording/dispatchrecordersupplier.hxx index dbeecff88bbc..934b82df0452 100644 --- a/framework/inc/recording/dispatchrecordersupplier.hxx +++ b/framework/inc/recording/dispatchrecordersupplier.hxx @@ -21,11 +21,9 @@ #define INCLUDED_FRAMEWORK_INC_RECORDING_DISPATCHRECORDERSUPPLIER_HXX #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URL.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/services/mediatypedetectionhelper.hxx b/framework/inc/services/mediatypedetectionhelper.hxx index 4cdab138379d..80a7fc4b91b3 100644 --- a/framework/inc/services/mediatypedetectionhelper.hxx +++ b/framework/inc/services/mediatypedetectionhelper.hxx @@ -22,7 +22,6 @@ #include <com/sun/star/util/XStringMapping.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> diff --git a/framework/inc/statusbarconfiguration.hxx b/framework/inc/statusbarconfiguration.hxx index 262e08613839..a65a9ab4a831 100644 --- a/framework/inc/statusbarconfiguration.hxx +++ b/framework/inc/statusbarconfiguration.hxx @@ -18,8 +18,7 @@ */ #pragma once -#include <config_options.h> -#include <framework/fwkdllapi.h> +#include <sal/types.h> namespace com::sun::star::container { class XIndexAccess; } namespace com::sun::star::container { class XIndexContainer; } diff --git a/framework/inc/toolboxconfiguration.hxx b/framework/inc/toolboxconfiguration.hxx index 0981a8780f82..66bedb153e4d 100644 --- a/framework/inc/toolboxconfiguration.hxx +++ b/framework/inc/toolboxconfiguration.hxx @@ -18,8 +18,7 @@ */ #pragma once -#include <config_options.h> -#include <framework/fwkdllapi.h> +#include <sal/types.h> namespace com::sun::star::container { class XIndexAccess; } namespace com::sun::star::container { class XIndexContainer; } diff --git a/framework/inc/uielement/comboboxtoolbarcontroller.hxx b/framework/inc/uielement/comboboxtoolbarcontroller.hxx index df14769caa07..8dcf79b03510 100644 --- a/framework/inc/uielement/comboboxtoolbarcontroller.hxx +++ b/framework/inc/uielement/comboboxtoolbarcontroller.hxx @@ -24,8 +24,6 @@ #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/event.hxx> - namespace framework { diff --git a/framework/inc/uielement/constitemcontainer.hxx b/framework/inc/uielement/constitemcontainer.hxx index c70bcae8ca21..512baa2cb467 100644 --- a/framework/inc/uielement/constitemcontainer.hxx +++ b/framework/inc/uielement/constitemcontainer.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_CONSTITEMCONTAINER_HXX -#include <config_options.h> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> @@ -32,7 +31,6 @@ #include <cppuhelper/propshlp.hxx> #include <vector> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/uielement/edittoolbarcontroller.hxx b/framework/inc/uielement/edittoolbarcontroller.hxx index 193af5920634..21e7f6935f6d 100644 --- a/framework/inc/uielement/edittoolbarcontroller.hxx +++ b/framework/inc/uielement/edittoolbarcontroller.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/frame/ControlCommand.hpp> #include <uielement/complextoolbarcontroller.hxx> -#include <vcl/event.hxx> class ToolBox; diff --git a/framework/inc/uielement/fontmenucontroller.hxx b/framework/inc/uielement/fontmenucontroller.hxx index 6c869e21e916..27da18f204a5 100644 --- a/framework/inc/uielement/fontmenucontroller.hxx +++ b/framework/inc/uielement/fontmenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/fontsizemenucontroller.hxx b/framework/inc/uielement/fontsizemenucontroller.hxx index 5c57623559d1..f7feba920825 100644 --- a/framework/inc/uielement/fontsizemenucontroller.hxx +++ b/framework/inc/uielement/fontsizemenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_FONTSIZEMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/status/FontHeight.hpp> diff --git a/framework/inc/uielement/headermenucontroller.hxx b/framework/inc/uielement/headermenucontroller.hxx index ea05b52337b3..bf395bf75af7 100644 --- a/framework/inc/uielement/headermenucontroller.hxx +++ b/framework/inc/uielement/headermenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_HEADERMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XModel.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/itemcontainer.hxx b/framework/inc/uielement/itemcontainer.hxx index b38aa6bfe123..5f2142caa19b 100644 --- a/framework/inc/uielement/itemcontainer.hxx +++ b/framework/inc/uielement/itemcontainer.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase.hxx> #include <vector> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/uielement/langselectionmenucontroller.hxx b/framework/inc/uielement/langselectionmenucontroller.hxx index 32f2a45bac9c..0651a1ababb3 100644 --- a/framework/inc/uielement/langselectionmenucontroller.hxx +++ b/framework/inc/uielement/langselectionmenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_LANGSELECTIONMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/macrosmenucontroller.hxx b/framework/inc/uielement/macrosmenucontroller.hxx index f17c38e441bd..819dc316f3f5 100644 --- a/framework/inc/uielement/macrosmenucontroller.hxx +++ b/framework/inc/uielement/macrosmenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_MACROSMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/popupmenucontrollerbase.hxx> #include <vcl/menu.hxx> diff --git a/framework/inc/uielement/newmenucontroller.hxx b/framework/inc/uielement/newmenucontroller.hxx index f4bbe873f519..8356ab4925e7 100644 --- a/framework/inc/uielement/newmenucontroller.hxx +++ b/framework/inc/uielement/newmenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_NEWMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ui/XAcceleratorConfiguration.hpp> #include <svtools/popupmenucontrollerbase.hxx> diff --git a/framework/inc/uielement/toolbarmodemenucontroller.hxx b/framework/inc/uielement/toolbarmodemenucontroller.hxx index 44f667dcb8d2..fb3072c6bbf7 100644 --- a/framework/inc/uielement/toolbarmodemenucontroller.hxx +++ b/framework/inc/uielement/toolbarmodemenucontroller.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMODEMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARMODEMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/frame/XDispatch.hpp> - #include <svtools/popupmenucontrollerbase.hxx> namespace framework diff --git a/framework/inc/uielement/toolbarsmenucontroller.hxx b/framework/inc/uielement/toolbarsmenucontroller.hxx index 23846457aee8..5016235f9c16 100644 --- a/framework/inc/uielement/toolbarsmenucontroller.hxx +++ b/framework/inc/uielement/toolbarsmenucontroller.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX #define INCLUDED_FRAMEWORK_INC_UIELEMENT_TOOLBARSMENUCONTROLLER_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 157b20eb7a3c..8b97a554d9cc 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -20,14 +20,12 @@ #ifndef INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX #define INCLUDED_FRAMEWORK_INC_XML_SAXNAMESPACEFILTER_HXX -#include <config_options.h> #include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <xml/xmlnamespaces.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> #include <stack> -#include <framework/fwkdllapi.h> namespace framework { diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 4c61e56e8266..fd38d5b64140 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/implbase.hxx> #include <unordered_map> -#include <framework/fwkdllapi.h> namespace framework{ diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 39196fd4ddc6..06ca242cd4dc 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase.hxx> -#include <framework/fwkdllapi.h> #include <unordered_map> diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index ed6bb61406e7..d02039321764 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -21,7 +21,6 @@ #define INCLUDED_FRAMEWORK_INC_XML_XMLNAMESPACES_HXX #include <map> -#include <framework/fwkdllapi.h> #include <rtl/ustring.hxx> |