diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-02-12 21:00:26 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-02-19 16:28:39 +0100 |
commit | 58fa1889eeaa1d8e4abdf49a18660721309362ce (patch) | |
tree | 4b2cd942cf351347a5d42ee86d3e8d5ba3428b27 /include/framework | |
parent | c40b39375dbc1248c8c067ee709ad3bdcb4a01ee (diff) |
tdf#42949 Fix IWYU warnings in include/framework/
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Ia9616f644a68ec6da22e646ba0d919a3489a9481
Reviewed-on: https://gerrit.libreoffice.org/67745
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'include/framework')
-rw-r--r-- | include/framework/ContextChangeEventMultiplexerTunnel.hxx | 6 | ||||
-rw-r--r-- | include/framework/actiontriggerhelper.hxx | 6 | ||||
-rw-r--r-- | include/framework/addonmenu.hxx | 16 | ||||
-rw-r--r-- | include/framework/addonsoptions.hxx | 7 | ||||
-rw-r--r-- | include/framework/configimporter.hxx | 12 | ||||
-rw-r--r-- | include/framework/dispatchhelper.hxx | 7 | ||||
-rw-r--r-- | include/framework/documentundoguard.hxx | 4 | ||||
-rw-r--r-- | include/framework/framelistanalyzer.hxx | 5 | ||||
-rw-r--r-- | include/framework/interaction.hxx | 15 | ||||
-rw-r--r-- | include/framework/menuconfiguration.hxx | 18 | ||||
-rw-r--r-- | include/framework/sfxhelperfunctions.hxx | 13 | ||||
-rw-r--r-- | include/framework/statusbarconfiguration.hxx | 14 | ||||
-rw-r--r-- | include/framework/titlehelper.hxx | 14 | ||||
-rw-r--r-- | include/framework/toolboxconfiguration.hxx | 14 | ||||
-rw-r--r-- | include/framework/undomanagerhelper.hxx | 12 |
15 files changed, 86 insertions, 77 deletions
diff --git a/include/framework/ContextChangeEventMultiplexerTunnel.hxx b/include/framework/ContextChangeEventMultiplexerTunnel.hxx index efa2db5988ac..9fd41166d5b4 100644 --- a/include/framework/ContextChangeEventMultiplexerTunnel.hxx +++ b/include/framework/ContextChangeEventMultiplexerTunnel.hxx @@ -8,9 +8,13 @@ */ #include <framework/fwedllapi.h> -#include <com/sun/star/ui/XContextChangeEventListener.hpp> #include <functional> +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::ui { class XContextChangeEventListener; } +namespace com::sun::star::uno { class XInterface; } + namespace framework { // this is pretty horrible, don't use it! diff --git a/include/framework/actiontriggerhelper.hxx b/include/framework/actiontriggerhelper.hxx index 986f3373a605..0fc57af8f4b1 100644 --- a/include/framework/actiontriggerhelper.hxx +++ b/include/framework/actiontriggerhelper.hxx @@ -20,9 +20,11 @@ #ifndef INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX #define INCLUDED_FRAMEWORK_ACTIONTRIGGERHELPER_HXX -#include <com/sun/star/container/XIndexContainer.hpp> -#include <vcl/menu.hxx> #include <framework/fwedllapi.h> +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::container { class XIndexContainer; } +class Menu; namespace framework diff --git a/include/framework/addonmenu.hxx b/include/framework/addonmenu.hxx index 91f8dc109276..4e8c1f24f9d8 100644 --- a/include/framework/addonmenu.hxx +++ b/include/framework/addonmenu.hxx @@ -19,15 +19,19 @@ #ifndef INCLUDED_FRAMEWORK_ADDONMENU_HXX #define INCLUDED_FRAMEWORK_ADDONMENU_HXX -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <rtl/ustring.hxx> +#include <vcl/vclptr.hxx> -#include <vcl/menu.hxx> #include <framework/fwedllapi.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; } +namespace com::sun::star::uno { template <typename > class Reference; } + +class MenuBar; +class PopupMenu; + #define ADDONMENU_ITEMID_START 2000 #define ADDONMENU_ITEMID_END 3000 diff --git a/include/framework/addonsoptions.hxx b/include/framework/addonsoptions.hxx index 2da3a8c4f4a3..66c5fca79c09 100644 --- a/include/framework/addonsoptions.hxx +++ b/include/framework/addonsoptions.hxx @@ -20,15 +20,14 @@ #define INCLUDED_FRAMEWORK_ADDONSOPTIONS_HXX #include <sal/types.h> -#include <osl/mutex.hxx> #include <vcl/image.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/svapp.hxx> #include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <framework/fwedllapi.h> #include <memory> +namespace com::sun::star::beans { struct PropertyValue; } +namespace osl { class Mutex; } + /*-************************************************************************************************************ @descr The method GetAddonsMenu() returns a list of property values. Use follow defines to separate values by names. diff --git a/include/framework/configimporter.hxx b/include/framework/configimporter.hxx index 3082464c28c2..ac5156b5328f 100644 --- a/include/framework/configimporter.hxx +++ b/include/framework/configimporter.hxx @@ -20,15 +20,15 @@ #ifndef INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX #define INCLUDED_FRAMEWORK_CONFIGIMPORTER_HXX -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/ui/XUIConfigurationManager2.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - -#include <rtl/ustring.hxx> #include <framework/fwedllapi.h> #include <vector> +namespace com::sun::star::container { class XIndexContainer; } +namespace com::sun::star::embed { class XStorage; } +namespace com::sun::star::ui { class XUIConfigurationManager2; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <typename > class Reference; } + namespace framework { class FWE_DLLPUBLIC UIConfigurationImporterOOo1x diff --git a/include/framework/dispatchhelper.hxx b/include/framework/dispatchhelper.hxx index 8838a5c902e0..b300c8be5167 100644 --- a/include/framework/dispatchhelper.hxx +++ b/include/framework/dispatchhelper.hxx @@ -21,11 +21,8 @@ #define INCLUDED_FRAMEWORK_INC_SERVICES_DISPATCHHELPER_HXX #include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/frame/XDispatchHelper.hpp> #include <com/sun/star/frame/XDispatchResultListener.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -33,6 +30,10 @@ #include <osl/conditn.hxx> #include <framework/fwedllapi.h> +namespace com::sun::star::lang { class XMultiServiceFactory; } +namespace com::sun::star::lang { class XSingleServiceFactory; } +namespace com::sun::star::uno { class XComponentContext; } + namespace framework{ /** diff --git a/include/framework/documentundoguard.hxx b/include/framework/documentundoguard.hxx index dc1fb5ff60b8..c707257a447f 100644 --- a/include/framework/documentundoguard.hxx +++ b/include/framework/documentundoguard.hxx @@ -22,10 +22,12 @@ #include <framework/fwedllapi.h> -#include <com/sun/star/uno/XInterface.hpp> +#include <com/sun/star/uno/Reference.hxx> #include <memory> +namespace com::sun::star::uno { class XInterface; } + namespace framework { //= DocumentUndoGuard diff --git a/include/framework/framelistanalyzer.hxx b/include/framework/framelistanalyzer.hxx index 8112beccf49d..f8403fcc52ba 100644 --- a/include/framework/framelistanalyzer.hxx +++ b/include/framework/framelistanalyzer.hxx @@ -20,12 +20,15 @@ #ifndef INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX #define INCLUDED_FRAMEWORK_FRAMELISTANALYZER_HXX -#include <com/sun/star/frame/XFrame.hpp> #include <framework/fwedllapi.h> #include <o3tl/typed_flags_set.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <vector> +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame { class XFramesSupplier; } + /** These enums can be combined as flags to enable/disable special search algorithm during analyze phase. see impl_analyze() for further information. diff --git a/include/framework/interaction.hxx b/include/framework/interaction.hxx index e1e3c726213b..2e817bb74275 100644 --- a/include/framework/interaction.hxx +++ b/include/framework/interaction.hxx @@ -20,22 +20,15 @@ #ifndef INCLUDED_FRAMEWORK_INTERACTION_HXX #define INCLUDED_FRAMEWORK_INTERACTION_HXX -#include <com/sun/star/task/XInteractionRequest.hpp> -#include <com/sun/star/task/XInteractionContinuation.hpp> -#include <com/sun/star/task/XInteractionAbort.hpp> -#include <com/sun/star/task/XInteractionApprove.hpp> -#include <com/sun/star/task/XInteractionDisapprove.hpp> -#include <com/sun/star/task/XInteractionRetry.hpp> -#include <com/sun/star/document/XInteractionFilterSelect.hpp> -#include <com/sun/star/document/NoSuchFilterRequest.hpp> -#include <com/sun/star/uno/RuntimeException.hpp> - #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include <framework/fwedllapi.h> +namespace com::sun::star::task { class XInteractionContinuation; } +namespace com::sun::star::task { class XInteractionRequest; } +namespace com::sun::star::uno { template <class E> class Sequence; } + namespace framework{ /*-************************************************************************************************************ diff --git a/include/framework/menuconfiguration.hxx b/include/framework/menuconfiguration.hxx index 8cf07268a0c1..191b0e723713 100644 --- a/include/framework/menuconfiguration.hxx +++ b/include/framework/menuconfiguration.hxx @@ -20,21 +20,15 @@ #ifndef INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX #define INCLUDED_FRAMEWORK_MENUCONFIGURATION_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/WrappedTargetException.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/frame/XDispatchProvider.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> - #include <framework/fwedllapi.h> -#include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> -#include <vcl/menu.hxx> -#include <vcl/toolbox.hxx> + +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::frame { class XDispatchProvider; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::io { class XOutputStream; } +namespace com::sun::star::uno { class XComponentContext; } const sal_uInt16 START_ITEMID_WINDOWLIST = 4600; const sal_uInt16 END_ITEMID_WINDOWLIST = 4699; diff --git a/include/framework/sfxhelperfunctions.hxx b/include/framework/sfxhelperfunctions.hxx index d2362166a88e..d0ef3ff1180d 100644 --- a/include/framework/sfxhelperfunctions.hxx +++ b/include/framework/sfxhelperfunctions.hxx @@ -21,12 +21,15 @@ #define INCLUDED_FRAMEWORK_SFXHELPERFUNCTIONS_HXX #include <framework/fwedllapi.h> -#include <com/sun/star/frame/XFrame.hpp> #include <rtl/ustring.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/status.hxx> -#include <svtools/toolboxcontroller.hxx> -#include <svtools/statusbarcontroller.hxx> + +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::uno { template <typename > class Reference; } +namespace svt { class StatusbarController; } +namespace svt { class ToolboxController; } + +class StatusBar; +class ToolBox; typedef svt::ToolboxController* ( *pfunc_setToolBoxControllerCreator)( const css::uno::Reference< css::frame::XFrame >& rFrame, diff --git a/include/framework/statusbarconfiguration.hxx b/include/framework/statusbarconfiguration.hxx index 39b45c25fffe..ff201cfee448 100644 --- a/include/framework/statusbarconfiguration.hxx +++ b/include/framework/statusbarconfiguration.hxx @@ -20,13 +20,13 @@ #define INCLUDED_FRAMEWORK_STATUSBARCONFIGURATION_HXX #include <framework/fwedllapi.h> -#include <vcl/status.hxx> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> + +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::container { class XIndexContainer; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::io { class XOutputStream; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <typename > class Reference; } namespace framework { diff --git a/include/framework/titlehelper.hxx b/include/framework/titlehelper.hxx index d2dd61b8c4f8..daadbe8442ba 100644 --- a/include/framework/titlehelper.hxx +++ b/include/framework/titlehelper.hxx @@ -21,15 +21,8 @@ #define INCLUDED_FRAMEWORK_TITLEHELPER_HXX #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XTitle.hpp> #include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/frame/XModel.hpp> -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/frame/XFrameActionListener.hpp> #include <com/sun/star/document/XDocumentEventListener.hpp> @@ -42,6 +35,13 @@ #include <framework/fwedllapi.h> +namespace com::sun::star::frame { class XController; } +namespace com::sun::star::frame { class XFrame; } +namespace com::sun::star::frame { class XModel; } +namespace com::sun::star::frame { class XUntitledNumbers; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { class XInterface; } + namespace framework{ diff --git a/include/framework/toolboxconfiguration.hxx b/include/framework/toolboxconfiguration.hxx index 16bc30400bda..2362bcc60aba 100644 --- a/include/framework/toolboxconfiguration.hxx +++ b/include/framework/toolboxconfiguration.hxx @@ -20,13 +20,13 @@ #define INCLUDED_FRAMEWORK_TOOLBOXCONFIGURATION_HXX #include <framework/fwedllapi.h> -#include <vcl/bitmap.hxx> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> + +namespace com::sun::star::container { class XIndexAccess; } +namespace com::sun::star::container { class XIndexContainer; } +namespace com::sun::star::io { class XInputStream; } +namespace com::sun::star::io { class XOutputStream; } +namespace com::sun::star::uno { class XComponentContext; } +namespace com::sun::star::uno { template <typename > class Reference; } namespace framework { diff --git a/include/framework/undomanagerhelper.hxx b/include/framework/undomanagerhelper.hxx index 261936a862e9..82f13cc289b5 100644 --- a/include/framework/undomanagerhelper.hxx +++ b/include/framework/undomanagerhelper.hxx @@ -21,13 +21,17 @@ #define INCLUDED_FRAMEWORK_UNDOMANAGERHELPER_HXX #include <framework/fwedllapi.h> -#include <framework/imutex.hxx> - -#include <com/sun/star/document/XUndoManager.hpp> -#include <com/sun/star/util/XModifyListener.hpp> +#include <com/sun/star/uno/Sequence.hxx> +#include <com/sun/star/uno/Reference.hxx> #include <memory> +namespace com::sun::star::document { class XUndoAction; } +namespace com::sun::star::document { class XUndoManager; } +namespace com::sun::star::document { class XUndoManagerListener; } +namespace com::sun::star::util { class XModifyListener; } +namespace framework { class IMutex; } + class SfxUndoManager; |