diff options
author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-04-23 11:21:28 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-04-24 12:28:09 +0200 |
commit | 1d61d9ae72562a03ca0d3f1649d9471862b29d74 (patch) | |
tree | 5c11b2d6f865f7d7f6f0a3788b5f87b84e4b4abc /sd/source/ui/framework | |
parent | d365f36331874f94bbd9832fbd19ace90fafefec (diff) |
tdf#42949 Fix IWYU warnings in sd/source/ui/f*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I07d78df2d5aacbdaff7344a09812db91de17d535
Reviewed-on: https://gerrit.libreoffice.org/71113
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd/source/ui/framework')
23 files changed, 12 insertions, 58 deletions
diff --git a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx index 6f02779ead31..7ac69647522c 100644 --- a/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx +++ b/sd/source/ui/framework/configuration/ChangeRequestQueueProcessor.cxx @@ -21,14 +21,13 @@ #include "ChangeRequestQueueProcessor.hxx" #include "ConfigurationTracer.hxx" -#include <framework/ConfigurationController.hxx> #include "ConfigurationUpdater.hxx" #include <vcl/svapp.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/drawing/framework/XConfiguration.hpp> -#include <com/sun/star/drawing/framework/ConfigurationChangeEvent.hpp> +#include <com/sun/star/drawing/framework/XConfigurationChangeRequest.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/configuration/Configuration.cxx b/sd/source/ui/framework/configuration/Configuration.cxx index c2438477c01a..f2034ac389fc 100644 --- a/sd/source/ui/framework/configuration/Configuration.cxx +++ b/sd/source/ui/framework/configuration/Configuration.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/drawing/framework/XConfigurationControllerBroadcaster.hpp> #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> -#include <facreg.hxx> #include <sal/log.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx index 601eb228ee51..9e8fb6fadeee 100644 --- a/sd/source/ui/framework/configuration/ConfigurationController.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx @@ -29,11 +29,8 @@ #include "UpdateRequest.hxx" #include "ChangeRequestQueueProcessor.hxx" #include "ConfigurationClassifier.hxx" -#include <ViewShellBase.hxx> -#include <DrawController.hxx> -#include <facreg.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/util/XURLTransformer.hpp> +#include <com/sun/star/frame/XController.hpp> #include <sal/log.hxx> #include <osl/mutex.hxx> diff --git a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx index 4db6aa54d8c9..aef2366824c6 100644 --- a/sd/source/ui/framework/configuration/ConfigurationTracer.cxx +++ b/sd/source/ui/framework/configuration/ConfigurationTracer.cxx @@ -19,7 +19,6 @@ #include "ConfigurationTracer.hxx" -#include <cstdio> #include <sal/log.hxx> using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx index ba296968e879..d92e60455103 100644 --- a/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx +++ b/sd/source/ui/framework/configuration/ResourceFactoryManager.cxx @@ -21,7 +21,6 @@ #include <tools/wldcrd.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <comphelper/processfactory.hxx> diff --git a/sd/source/ui/framework/configuration/ResourceId.cxx b/sd/source/ui/framework/configuration/ResourceId.cxx index 84d97c18963f..78090fe121ac 100644 --- a/sd/source/ui/framework/configuration/ResourceId.cxx +++ b/sd/source/ui/framework/configuration/ResourceId.cxx @@ -18,16 +18,14 @@ */ #include <framework/ResourceId.hxx> -#include <framework/FrameworkHelper.hxx> #include <tools/SdGlobalResourceContainer.hxx> -#include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> +#include <cppuhelper/weakref.hxx> #include <rtl/ref.hxx> -#include <facreg.hxx> +namespace com::sun::star::uno { class XComponentContext; } using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/configuration/UpdateRequest.cxx b/sd/source/ui/framework/configuration/UpdateRequest.cxx index f8f602ce8f41..1a8a0b120094 100644 --- a/sd/source/ui/framework/configuration/UpdateRequest.cxx +++ b/sd/source/ui/framework/configuration/UpdateRequest.cxx @@ -19,8 +19,6 @@ #include "UpdateRequest.hxx" -#include <framework/FrameworkHelper.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.cxx b/sd/source/ui/framework/factories/BasicPaneFactory.cxx index 166c5d38618f..7d009fa8548b 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.cxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.cxx @@ -20,10 +20,7 @@ #include <memory> #include <sal/config.h> -#include <utility> - #include "BasicPaneFactory.hxx" -#include <facreg.hxx> #include "ChildWindowPane.hxx" #include "FrameWindowPane.hxx" @@ -34,7 +31,6 @@ #include <ViewShellBase.hxx> #include <PaneChildWindows.hxx> #include <DrawController.hxx> -#include <DrawDocShell.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx index 69d57fe0836f..c22ba9cf9976 100644 --- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx +++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx @@ -29,7 +29,6 @@ #include <memory> namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } } -namespace com { namespace sun { namespace star { namespace frame { class XController; } } } } namespace com { namespace sun { namespace star { namespace uno { class XComponentContext; } } } } namespace sd { diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index b7f3d307ff39..bb1ede4c63ea 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -20,13 +20,13 @@ #include "BasicToolBarFactory.hxx" #include <ViewTabBar.hxx> -#include <facreg.hxx> #include <framework/FrameworkHelper.hxx> #include <unotools/mediadescriptor.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <DrawController.hxx> +#include <com/sun/star/drawing/framework/XConfigurationController.hpp> +#include <com/sun/star/frame/XController.hpp> +#include <com/sun/star/drawing/framework/XControllerManager.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/factories/BasicViewFactory.cxx b/sd/source/ui/framework/factories/BasicViewFactory.cxx index 3bc14fdfbea8..71eb27ac19e7 100644 --- a/sd/source/ui/framework/factories/BasicViewFactory.cxx +++ b/sd/source/ui/framework/factories/BasicViewFactory.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <framework/Pane.hxx> #include <DrawController.hxx> -#include <DrawSubController.hxx> #include <ViewShellBase.hxx> #include <ViewShellManager.hxx> #include <DrawDocShell.hxx> @@ -35,7 +34,6 @@ #include <PresentationViewShell.hxx> #include <SlideSorterViewShell.hxx> #include <FrameView.hxx> -#include <facreg.hxx> #include <Window.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/framework/factories/ChildWindowPane.cxx b/sd/source/ui/framework/factories/ChildWindowPane.cxx index 996ab2c52d3d..83bc87af3dd9 100644 --- a/sd/source/ui/framework/factories/ChildWindowPane.cxx +++ b/sd/source/ui/framework/factories/ChildWindowPane.cxx @@ -28,9 +28,7 @@ #include <PaneDockingWindow.hxx> #include <ViewShellBase.hxx> #include <ViewShellManager.hxx> -#include <framework/FrameworkHelper.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/svapp.hxx> #include <sfx2/viewfrm.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index b9d227c00dfe..652930c6ce86 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -18,13 +18,9 @@ */ #include "FullScreenPane.hxx" -#include <ViewShellBase.hxx> -#include <cppcanvas/vclfactory.hxx> -#include <sfx2/dispatch.hxx> +#include <vcl/vclevent.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/svapp.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/sd/source/ui/framework/factories/FullScreenPane.hxx b/sd/source/ui/framework/factories/FullScreenPane.hxx index de957cf635c4..41b49fabe16b 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.hxx +++ b/sd/source/ui/framework/factories/FullScreenPane.hxx @@ -22,8 +22,8 @@ #include "FrameWindowPane.hxx" #include <tools/link.hxx> +#include <vcl/wrkwin.hxx> -class WorkWindow; class VclWindowEvent; namespace vcl { class Window; } diff --git a/sd/source/ui/framework/factories/Pane.cxx b/sd/source/ui/framework/factories/Pane.cxx index a9fdd52f1265..0245cdbb357f 100644 --- a/sd/source/ui/framework/factories/Pane.cxx +++ b/sd/source/ui/framework/factories/Pane.cxx @@ -19,7 +19,6 @@ #include <framework/Pane.hxx> -#include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> diff --git a/sd/source/ui/framework/factories/PresentationFactory.cxx b/sd/source/ui/framework/factories/PresentationFactory.cxx index 237e6f04e43e..fe8d1331a7f9 100644 --- a/sd/source/ui/framework/factories/PresentationFactory.cxx +++ b/sd/source/ui/framework/factories/PresentationFactory.cxx @@ -20,15 +20,14 @@ #include <framework/PresentationFactory.hxx> #include <DrawController.hxx> -#include <ViewShellBase.hxx> -#include <facreg.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> #include <tools/diagnose_ex.h> #include <slideshow.hxx> +namespace com::sun::star::uno { class XComponentContext; } + using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; diff --git a/sd/source/ui/framework/factories/ViewShellWrapper.cxx b/sd/source/ui/framework/factories/ViewShellWrapper.cxx index 488cad3b1932..ce78f380259f 100644 --- a/sd/source/ui/framework/factories/ViewShellWrapper.cxx +++ b/sd/source/ui/framework/factories/ViewShellWrapper.cxx @@ -18,18 +18,14 @@ */ #include <framework/ViewShellWrapper.hxx> -#include <framework/Pane.hxx> #include <sdpage.hxx> #include <ViewShell.hxx> -#include <Window.hxx> #include <SlideSorter.hxx> #include <SlideSorterViewShell.hxx> #include <controller/SlsPageSelector.hxx> -#include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlideSorterController.hxx> #include <model/SlsPageEnumerationProvider.hxx> -#include <model/SlideSorterModel.hxx> #include <model/SlsPageDescriptor.hxx> #include <com/sun/star/drawing/framework/XPane.hpp> @@ -37,10 +33,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/servicehelper.hxx> -#include <cppuhelper/typeprovider.hxx> -#include <vcl/svapp.hxx> #include <osl/mutex.hxx> -#include <tools/diagnose_ex.h> #include <sal/log.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/framework/module/CenterViewFocusModule.cxx b/sd/source/ui/framework/module/CenterViewFocusModule.cxx index 6cca423ecc38..8c7e6abbd2d6 100644 --- a/sd/source/ui/framework/module/CenterViewFocusModule.cxx +++ b/sd/source/ui/framework/module/CenterViewFocusModule.cxx @@ -19,7 +19,6 @@ #include "CenterViewFocusModule.hxx" -#include <framework/ConfigurationController.hxx> #include <framework/FrameworkHelper.hxx> #include <framework/ViewShellWrapper.hxx> @@ -29,9 +28,6 @@ #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <toolkit/awt/vclxdevice.hxx> -#include <sfx2/viewfrm.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; diff --git a/sd/source/ui/framework/module/ModuleController.cxx b/sd/source/ui/framework/module/ModuleController.cxx index 20ddc1cf1871..edfe932474f0 100644 --- a/sd/source/ui/framework/module/ModuleController.cxx +++ b/sd/source/ui/framework/module/ModuleController.cxx @@ -29,8 +29,6 @@ #include <tools/diagnose_ex.h> #include <sal/log.hxx> -#include <facreg.hxx> - using namespace ::com::sun::star; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::drawing::framework; diff --git a/sd/source/ui/framework/module/PresentationModule.cxx b/sd/source/ui/framework/module/PresentationModule.cxx index 92e369138c16..38d37766f5ba 100644 --- a/sd/source/ui/framework/module/PresentationModule.cxx +++ b/sd/source/ui/framework/module/PresentationModule.cxx @@ -20,7 +20,6 @@ #include <framework/PresentationModule.hxx> #include "CenterViewFocusModule.hxx" -#include "SlideSorterModule.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/module/ToolBarModule.cxx b/sd/source/ui/framework/module/ToolBarModule.cxx index 42d4549da228..d4f3932a2f9c 100644 --- a/sd/source/ui/framework/module/ToolBarModule.cxx +++ b/sd/source/ui/framework/module/ToolBarModule.cxx @@ -21,7 +21,6 @@ #include <ViewShellBase.hxx> #include <DrawController.hxx> #include <framework/FrameworkHelper.hxx> -#include <framework/ConfigurationController.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/framework/module/ViewTabBarModule.cxx b/sd/source/ui/framework/module/ViewTabBarModule.cxx index 2e026de3cdc1..4a6f0f12f02f 100644 --- a/sd/source/ui/framework/module/ViewTabBarModule.cxx +++ b/sd/source/ui/framework/module/ViewTabBarModule.cxx @@ -20,7 +20,6 @@ #include "ViewTabBarModule.hxx" #include <framework/FrameworkHelper.hxx> -#include <framework/ConfigurationController.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx b/sd/source/ui/framework/tools/FrameworkHelper.cxx index 67818b6a6313..9e7fb199b27a 100644 --- a/sd/source/ui/framework/tools/FrameworkHelper.cxx +++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx @@ -25,18 +25,14 @@ #include <framework/ResourceId.hxx> #include <framework/ViewShellWrapper.hxx> #include <ViewShellBase.hxx> -#include <FrameView.hxx> #include <DrawViewShell.hxx> #include <ViewShellHint.hxx> -#include <DrawController.hxx> #include <app.hrc> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> #include <cppuhelper/compbase.hxx> #include <svl/lstner.hxx> #include <sfx2/request.hxx> -#include <sfx2/dispatch.hxx> #include <MutexOwner.hxx> #include <vcl/svapp.hxx> |