diff options
| author | Gabor Kelemen <kelemen.gabor2@nisz.hu> | 2019-08-23 23:20:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2019-08-26 09:16:05 +0200 |
| commit | 1ddb742aed047a745bbcd1787d0f9cfa8f0beda5 (patch) | |
| tree | ba9cc27929d3fc41a4239d1a303c6ad5c6dcaa36 /sd/source/ui | |
| parent | 2fd083579d42d7649c162f18db235498198ff3f4 (diff) | |
tdf#42949 Fix IWYU warnings in sd/source/ui/[p-t]*/*cxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: Idc9ca0ec1d888d3625f24b8dea4421408d2e7e7d
Reviewed-on: https://gerrit.libreoffice.org/78047
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'sd/source/ui')
83 files changed, 19 insertions, 385 deletions
diff --git a/sd/source/ui/presenter/PresenterCanvas.cxx b/sd/source/ui/presenter/PresenterCanvas.cxx index 2c852fe86c51..83eb7c79f793 100644 --- a/sd/source/ui/presenter/PresenterCanvas.cxx +++ b/sd/source/ui/presenter/PresenterCanvas.cxx @@ -27,13 +27,11 @@ #include <basegfx/range/b2drectangle.hxx> #include <basegfx/utils/canvastools.hxx> #include <com/sun/star/awt/XWindow.hpp> -#include <canvas/canvastools.hxx> #include <cppuhelper/basemutex.hxx> #include <cppuhelper/compbase.hxx> #include <rtl/ref.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/window.hxx> -#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index f340b507e8d3..6d621b8af4a9 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -22,16 +22,10 @@ #include <cstddef> #include "PresenterHelper.hxx" -#include "CanvasUpdateRequester.hxx" #include "PresenterCanvas.hxx" -#include <facreg.hxx> #include <cppcanvas/vclfactory.hxx> -#include <com/sun/star/awt/WindowAttribute.hpp> -#include <com/sun/star/awt/WindowClass.hpp> -#include <com/sun/star/awt/WindowDescriptor.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <toolkit/helper/vclunohelper.hxx> -#include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> diff --git a/sd/source/ui/presenter/PresenterPreviewCache.cxx b/sd/source/ui/presenter/PresenterPreviewCache.cxx index 54fde4e3408b..42617e9bd133 100644 --- a/sd/source/ui/presenter/PresenterPreviewCache.cxx +++ b/sd/source/ui/presenter/PresenterPreviewCache.cxx @@ -18,11 +18,9 @@ */ #include "PresenterPreviewCache.hxx" -#include <facreg.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsCacheContext.hxx> -#include <tools/IdleDetection.hxx> #include <vcl/bitmapex.hxx> #include <sdpage.hxx> #include <cppcanvas/vclfactory.hxx> diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 8e2edc8d9326..3cda6da436ea 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -18,13 +18,10 @@ */ #include "PresenterTextView.hxx" -#include <facreg.hxx> #include <i18nlangtag/mslangid.hxx> #include <cppcanvas/vclfactory.hxx> #include <svl/itempool.hxx> -#include <svl/itemset.hxx> -#include <unotools/linguprops.hxx> #include <unotools/lingucfg.hxx> #include <editeng/colritem.hxx> #include <editeng/editeng.hxx> @@ -32,14 +29,12 @@ #include <editeng/eeitem.hxx> #include <editeng/fhgtitem.hxx> #include <editeng/fontitem.hxx> -#include <svx/xflclit.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <com/sun/star/rendering/XBitmapCanvas.hpp> +#include <com/sun/star/rendering/XCanvas.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/Color.hpp> #include <com/sun/star/i18n/ScriptType.hpp> diff --git a/sd/source/ui/presenter/SlideRenderer.cxx b/sd/source/ui/presenter/SlideRenderer.cxx index 1dc835404e38..b4fd445a0344 100644 --- a/sd/source/ui/presenter/SlideRenderer.cxx +++ b/sd/source/ui/presenter/SlideRenderer.cxx @@ -18,10 +18,8 @@ */ #include "SlideRenderer.hxx" -#include <facreg.hxx> #include <sdpage.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <vcl/svapp.hxx> #include <cppcanvas/vclfactory.hxx> #include <cppuhelper/supportsservice.hxx> diff --git a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx index 72f27e98a200..7708e6eb7d71 100644 --- a/sd/source/ui/remotecontrol/AvahiNetworkService.cxx +++ b/sd/source/ui/remotecontrol/AvahiNetworkService.cxx @@ -9,20 +9,16 @@ #include <config_dbus.h> -#include <time.h> #include <iostream> #include <limits> #include <new> -#include <stdlib.h> #include <assert.h> #include <avahi-client/client.h> #include <avahi-client/publish.h> #include <avahi-common/alternative.h> -#include <avahi-common/malloc.h> #include <avahi-common/error.h> -#include <avahi-common/timeval.h> #include <avahi-common/thread-watch.h> #include <comphelper/random.hxx> diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx index 31e5a55b5daa..4f684df3bd4c 100644 --- a/sd/source/ui/remotecontrol/BluetoothServer.cxx +++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx @@ -10,7 +10,6 @@ #include "BluetoothServer.hxx" #include <iostream> -#include <iomanip> #include <memory> #include <new> @@ -22,7 +21,7 @@ #include <dbus/dbus.h> #include <errno.h> #include <fcntl.h> - #include <sys/unistd.h> + #include <unistd.h> #include <sys/socket.h> #include <bluetooth/bluetooth.h> #include <bluetooth/rfcomm.h> @@ -40,6 +39,7 @@ #endif #ifdef MACOSX + #include <iomanip> #include <osl/conditn.hxx> #include <premac.h> #import <CoreFoundation/CoreFoundation.h> diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx index a0067eaa14a6..275e23556737 100644 --- a/sd/source/ui/remotecontrol/DiscoveryService.cxx +++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx @@ -8,10 +8,7 @@ */ #include <errno.h> -#include <stdlib.h> #include <string.h> -#include <algorithm> -#include <vector> #include <iostream> #include <rtl/strbuf.hxx> @@ -34,7 +31,6 @@ typedef int socklen_t; #else #include <unistd.h> - #include <sys/types.h> #include <sys/socket.h> #include <netinet/in.h> #include <arpa/inet.h> diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx b/sd/source/ui/remotecontrol/ImagePreparer.cxx index fe42b2a81599..a3cdc74d4ffa 100644 --- a/sd/source/ui/remotecontrol/ImagePreparer.cxx +++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx @@ -24,19 +24,10 @@ #include <comphelper/processfactory.hxx> #include <osl/file.hxx> #include <rtl/ustrbuf.hxx> -#include <sax/tools/converter.hxx> #include <rtl/strbuf.hxx> #include <sal/log.hxx> -#include <unotools/streamwrap.hxx> - -#include <svl/itemset.hxx> -#include <sfx2/docfile.hxx> #include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/document/XFilter.hpp> -#include <com/sun/star/document/XImporter.hpp> -#include <com/sun/star/document/XExporter.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> diff --git a/sd/source/ui/remotecontrol/Receiver.cxx b/sd/source/ui/remotecontrol/Receiver.cxx index 04128fa74b4f..3c0309e9e461 100644 --- a/sd/source/ui/remotecontrol/Receiver.cxx +++ b/sd/source/ui/remotecontrol/Receiver.cxx @@ -7,7 +7,6 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ #include "Receiver.hxx" -#include <string.h> #include <com/sun/star/presentation/XSlideShowController.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XPresentation2.hpp> @@ -15,11 +14,6 @@ #include <com/sun/star/uno/RuntimeException.hpp> #include <comphelper/processfactory.hxx> -#include <comphelper/anytostring.hxx> -#include <cppuhelper/exc_hlp.hxx> -#include <osl/file.hxx> -#include <rtl/ustrbuf.hxx> -#include <rtl/strbuf.hxx> #include <sal/log.hxx> #include <com/sun/star/beans/PropertyValue.hpp> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx index 4171da6f4d84..bf5d0fdc5392 100644 --- a/sd/source/ui/remotecontrol/Server.cxx +++ b/sd/source/ui/remotecontrol/Server.cxx @@ -6,11 +6,10 @@ * 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/. */ -#include <stdlib.h> + #include <algorithm> #include <vector> -#include <officecfg/Office/Common.hxx> #include <officecfg/Office/Impress.hxx> #include <com/sun/star/container/XNameAccess.hpp> @@ -29,7 +28,6 @@ #include "DiscoveryService.hxx" #include "Listener.hxx" -#include "Receiver.hxx" #include <RemoteServer.hxx> #include "BluetoothServer.hxx" #include "Communicator.hxx" diff --git a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx index 4520f9ecb005..1020cde8a4e8 100644 --- a/sd/source/ui/sidebar/AllMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/AllMasterPagesSelector.cxx @@ -18,14 +18,11 @@ */ #include "AllMasterPagesSelector.hxx" -#include "PreviewValueSet.hxx" #include <ViewShellBase.hxx> #include "MasterPageContainer.hxx" #include "MasterPageDescriptor.hxx" -#include <app.hrc> #include <helpids.h> -#include <tools/link.hxx> #include <set> namespace { diff --git a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx index 93290c3b3f99..835a4532a294 100644 --- a/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/CurrentMasterPagesSelector.cxx @@ -27,15 +27,10 @@ #include "MasterPageContainerProviders.hxx" #include "MasterPageDescriptor.hxx" #include <EventMultiplexer.hxx> -#include <app.hrc> #include <DrawDocShell.hxx> #include <helpids.h> -#include <vcl/image.hxx> -#include <svx/svdmodel.hxx> -#include <sfx2/request.hxx> - #include <set> using namespace ::com::sun::star; diff --git a/sd/source/ui/sidebar/DocumentHelper.cxx b/sd/source/ui/sidebar/DocumentHelper.cxx index 5c26a4dc15c2..5432d4bdb6c7 100644 --- a/sd/source/ui/sidebar/DocumentHelper.cxx +++ b/sd/source/ui/sidebar/DocumentHelper.cxx @@ -31,7 +31,6 @@ #include <ViewShellBase.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <stlpool.hxx> #include <svx/xfillit0.hxx> #include <svx/svdundo.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 072f95a4ddc7..6bd9b5b97b09 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -23,7 +23,6 @@ #include <drawdoc.hxx> #include <framework/FrameworkHelper.hxx> #include <strings.hrc> -#include <glob.hxx> #include <helpids.h> #include <pres.hxx> #include <sdmod.hxx> @@ -43,9 +42,7 @@ #include <sal/log.hxx> #include <comphelper/processfactory.hxx> -#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/objface.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <svl/languageoptions.hxx> diff --git a/sd/source/ui/sidebar/LayoutMenu.hxx b/sd/source/ui/sidebar/LayoutMenu.hxx index d7072e3679e3..bdd8217663db 100644 --- a/sd/source/ui/sidebar/LayoutMenu.hxx +++ b/sd/source/ui/sidebar/LayoutMenu.hxx @@ -24,7 +24,7 @@ #include <svtools/valueset.hxx> #include <vcl/transfer.hxx> -#include <sfx2/shell.hxx> +#include <sfx2/request.hxx> #include <xmloff/autolayout.hxx> namespace com { namespace sun { namespace star { namespace frame { class XStatusListener; } } } } diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index 4d241b86b2ab..d8552ec5e91d 100644 --- a/sd/source/ui/sidebar/MasterPageContainer.cxx +++ b/sd/source/ui/sidebar/MasterPageContainer.cxx @@ -23,37 +23,25 @@ #include "MasterPageDescriptor.hxx" #include "MasterPageContainerFiller.hxx" #include "MasterPageContainerQueue.hxx" -#include <TemplateScanner.hxx> #include <PreviewRenderer.hxx> #include <tools/AsynchronousTask.hxx> #include <tools/SdGlobalResourceContainer.hxx> #include <strings.hrc> #include <algorithm> -#include <list> #include <memory> -#include <set> #include <unomodel.hxx> #include <com/sun/star/frame/Desktop.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/util/XCloseable.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <comphelper/processfactory.hxx> -#include <sfx2/app.hxx> -#include <svx/svdpage.hxx> -#include <DrawDocShell.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> -#include <svl/itemset.hxx> -#include <svl/eitem.hxx> #include <sdresid.hxx> #include <tools/TimerBasedTaskExecution.hxx> -#include <pres.hxx> #include <osl/mutex.hxx> #include <osl/getglobalmutex.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index c766054251fc..f555a5bb3745 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -28,8 +28,6 @@ #include <sfx2/sfxsids.hrc> #include <sfx2/thumbnailview.hxx> #include <vcl/image.hxx> -#include <com/sun/star/embed/ElementModes.hpp> -#include <com/sun/star/embed/StorageFactory.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx index 2655fad6f3e4..811726dec8b7 100644 --- a/sd/source/ui/sidebar/MasterPageContainerQueue.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerQueue.cxx @@ -21,7 +21,6 @@ #include "MasterPageContainerProviders.hxx" #include <tools/IdleDetection.hxx> -#include <PreviewRenderer.hxx> #include <set> diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index e4fcbf39d761..f9992f141533 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -27,35 +27,18 @@ #include "DocumentHelper.hxx" #include <pres.hxx> #include <drawdoc.hxx> -#include <DrawDocShell.hxx> #include <sdpage.hxx> -#include <glob.hxx> #include <app.hrc> -#include <DrawViewShell.hxx> #include <DrawController.hxx> #include <SlideSorterViewShell.hxx> #include "PreviewValueSet.hxx" #include <ViewShellBase.hxx> -#include <sfx2/objface.hxx> -#include <drawview.hxx> #include <vcl/commandevent.hxx> #include <vcl/image.hxx> #include <vcl/floatwin.hxx> -#include <svl/languageoptions.hxx> -#include <sfx2/app.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <svl/itemset.hxx> -#include <svl/eitem.hxx> -#include <svx/dlgutil.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svxids.hrc> -#include <FrameView.hxx> -#include <stlpool.hxx> -#include <unmovss.hxx> -#include <sfx2/request.hxx> -#include <svl/itempool.hxx> #include <sfx2/sidebar/Theme.hxx> #include <memory> diff --git a/sd/source/ui/sidebar/PanelBase.cxx b/sd/source/ui/sidebar/PanelBase.cxx index 0a6e0fbb7770..23e397f710c7 100644 --- a/sd/source/ui/sidebar/PanelBase.cxx +++ b/sd/source/ui/sidebar/PanelBase.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "TableDesignPanel.hxx" +#include "PanelBase.hxx" namespace sd { namespace sidebar { diff --git a/sd/source/ui/sidebar/PanelFactory.cxx b/sd/source/ui/sidebar/PanelFactory.cxx index 4750ee9494d2..226e820d15e5 100644 --- a/sd/source/ui/sidebar/PanelFactory.cxx +++ b/sd/source/ui/sidebar/PanelFactory.cxx @@ -18,7 +18,6 @@ */ #include "PanelFactory.hxx" -#include <facreg.hxx> #include <framework/Pane.hxx> #include <ViewShellBase.hxx> #include <DrawController.hxx> @@ -32,7 +31,6 @@ #include "TableDesignPanel.hxx" #include "SlideBackground.hxx" -#include <sfx2/viewfrm.hxx> #include <sfx2/sidebar/SidebarPanelBase.hxx> #include <comphelper/namedvaluecollection.hxx> #include <vcl/window.hxx> diff --git a/sd/source/ui/sidebar/PreviewValueSet.cxx b/sd/source/ui/sidebar/PreviewValueSet.cxx index 9cde13dac181..f3b7f72f9a93 100644 --- a/sd/source/ui/sidebar/PreviewValueSet.cxx +++ b/sd/source/ui/sidebar/PreviewValueSet.cxx @@ -19,7 +19,6 @@ #include "PreviewValueSet.hxx" #include <vcl/event.hxx> -#include <vcl/image.hxx> namespace sd { namespace sidebar { diff --git a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx index c45cfd8a741e..4e846dad20aa 100644 --- a/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/RecentMasterPagesSelector.cxx @@ -21,11 +21,9 @@ #include <ViewShellBase.hxx> #include "RecentlyUsedMasterPages.hxx" -#include "MasterPageContainerProviders.hxx" #include <MasterPageObserver.hxx> #include <sdpage.hxx> #include <drawdoc.hxx> -#include <app.hrc> #include <helpids.h> namespace sd { namespace sidebar { diff --git a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx index b6783aa0abce..9065a27e76cd 100644 --- a/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx +++ b/sd/source/ui/sidebar/RecentlyUsedMasterPages.cxx @@ -20,26 +20,16 @@ #include "RecentlyUsedMasterPages.hxx" #include "MasterPageContainerProviders.hxx" #include <MasterPageObserver.hxx> -#include "MasterPagesSelector.hxx" #include "MasterPageDescriptor.hxx" #include <tools/ConfigurationAccess.hxx> -#include <drawdoc.hxx> -#include <sdpage.hxx> #include <algorithm> #include <memory> #include <vector> -#include <unomodel.hxx> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPages.hpp> #include <com/sun/star/container/XNameAccess.hpp> -#include <com/sun/star/container/XHierarchicalNameAccess.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/PropertyState.hpp> -#include <unotools/confignode.hxx> #include <osl/doublecheckedlocking.h> #include <osl/getglobalmutex.hxx> diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 0190ec029a5f..066a6c6f8a90 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -19,34 +19,24 @@ #include <com/sun/star/ui/XDeck.hpp> #include <com/sun/star/ui/XPanel.hpp> +#include <com/sun/star/frame/XController2.hpp> #include "SlideBackground.hxx" -#include <TransitionPreset.hxx> #include <sdresid.hxx> #include <ViewShellBase.hxx> #include <FrameView.hxx> #include <DrawDocShell.hxx> -#include <SlideSorterViewShell.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> -#include <filedlg.hxx> #include <sdmod.hxx> #include <optsitem.hxx> #include "PageMarginUtils.hxx" #include <strings.hrc> #include <pageformatpanel.hrc> -#include "DocumentHelper.hxx" -#include "MasterPagesSelector.hxx" #include <DrawViewShell.hxx> -#include <DrawController.hxx> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <svtools/controldims.hxx> #include <svx/colorbox.hxx> -#include <svx/gallery.hxx> #include <svx/drawitem.hxx> #include <svx/pageitem.hxx> -#include <unotools/pathoptions.hxx> #include <tools/urlobj.hxx> -#include <sfx2/sidebar/Theme.hxx> #include <app.hrc> #include <editeng/paperinf.hxx> #include <svx/xflgrit.hxx> @@ -55,25 +45,16 @@ #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xgrad.hxx> -#include <svx/xbitmap.hxx> -#include <svx/xflbckit.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflhtit.hxx> #include <svx/svdpage.hxx> #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> -#include <sfx2/objface.hxx> -#include <svx/dlgutil.hxx> -#include <sfx2/tabdlg.hxx> #include <sfx2/sidebar/Panel.hxx> -#include <algorithm> #include <EventMultiplexer.hxx> #include <vcl/EnumContext.hxx> -#include <editeng/ulspitem.hxx> -#include <editeng/lrspitem.hxx> #include <editeng/sizeitem.hxx> -#include <svl/itemset.hxx> #include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/sd/source/ui/slideshow/PaneHider.cxx b/sd/source/ui/slideshow/PaneHider.cxx index 3905317c6129..98b260c8f774 100644 --- a/sd/source/ui/slideshow/PaneHider.cxx +++ b/sd/source/ui/slideshow/PaneHider.cxx @@ -21,10 +21,8 @@ #include <ViewShell.hxx> #include <ViewShellBase.hxx> -#include <slideshow.hxx> #include "slideshowimpl.hxx" #include <framework/FrameworkHelper.hxx> -#include <framework/ConfigurationController.hxx> #include <com/sun/star/drawing/framework/XControllerManager.hpp> #include <com/sun/star/drawing/framework/XConfigurationController.hpp> diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx index 957ad4496af0..cf05679c25af 100644 --- a/sd/source/ui/slideshow/SlideShowRestarter.cxx +++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx @@ -25,7 +25,6 @@ #include <framework/FrameworkHelper.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/app.hxx> #include <svx/svxids.hrc> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 2958e241eee7..a61c7858937d 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -30,7 +30,6 @@ #include <slideshow.hxx> #include <ViewShell.hxx> -#include <ViewShellBase.hxx> #include <sdresid.hxx> #include <helpids.h> #include <strings.hrc> diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index 68011fc1c9ec..59aa218d1c6c 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> -#include <cppuhelper/bootstrap.hxx> #include <cppuhelper/supportsservice.hxx> #include <sal/log.hxx> @@ -30,14 +29,11 @@ #include <vcl/wrkwin.hxx> #include <svx/svdpool.hxx> #include <svl/itemprop.hxx> -#include <tools/debug.hxx> #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/sfxsids.hrc> -#include <svx/unoprov.hxx> - #include <framework/FrameworkHelper.hxx> #include <FrameView.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 9749dc1e1590..1a58f304c20d 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -24,11 +24,9 @@ #include <config_features.h> #include <com/sun/star/frame/theAutoRecovery.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> -#include <com/sun/star/container/XNameReplace.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> @@ -39,7 +37,6 @@ #include <com/sun/star/frame/XLayoutManager.hpp> #include <com/sun/star/presentation/SlideShow.hpp> #include <com/sun/star/media/XPlayer.hpp> -#include <svl/aeitem.hxx> #include <svl/stritem.hxx> #include <svl/urihelper.hxx> #include <unotools/saveopt.hxx> @@ -49,14 +46,12 @@ #include <tools/diagnose_ex.h> #include <sfx2/infobar.hxx> -#include <sfx2/request.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> #include <svx/unoapi.hxx> #include <svx/svdoole2.hxx> -#include <sfx2/templdlg.hxx> #include <svx/f3dchild.hxx> #include <svx/imapdlg.hxx> #include <svx/fontwork.hxx> @@ -69,7 +64,6 @@ #include <notifydocumentevent.hxx> #include "slideshowimpl.hxx" #include "slideshowviewimpl.hxx" -#include <pgjump.hxx> #include "PaneHider.hxx" #include <bitmaps.hlst> @@ -81,12 +75,8 @@ #include <vcl/scheduler.hxx> #include <vcl/svapp.hxx> #include <vcl/help.hxx> -#include <comphelper/anytostring.hxx> #include <comphelper/processfactory.hxx> -#include <cppuhelper/exc_hlp.hxx> #include <rtl/ref.hxx> -#include <sal/log.hxx> -#include <canvas/elapsedtime.hxx> #include <avmedia/mediawindow.hxx> #include <svtools/colrdlg.hxx> #include <DrawDocShell.hxx> diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index 836082379d99..80ce031e76b3 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -24,8 +24,7 @@ #include "SlsBitmapCompressor.hxx" #include "SlsCacheConfiguration.hxx" -#include <sdpage.hxx> -#include <drawdoc.hxx> +#include <osl/diagnose.h> #include <sal/log.hxx> // Define the default value for the maximal cache size that is used for diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx index 7dc010050a22..1507d7c6835c 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapFactory.cxx @@ -20,15 +20,8 @@ #include "SlsBitmapFactory.hxx" #include <PreviewRenderer.hxx> -#include <view/SlideSorterView.hxx> #include <sdpage.hxx> -#include <Window.hxx> -#include <drawdoc.hxx> -#include <DrawDocShell.hxx> -#include <svx/svdtypes.hxx> -#include <svx/svdpage.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/bitmapaccess.hxx> namespace sd { namespace slidesorter { namespace view { class SlideSorterView; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx index 48eebfb1b429..e9dd7bcbf4d9 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheCompactor.cxx @@ -28,7 +28,6 @@ #include <sal/log.hxx> #include <osl/diagnose.h> #include <com/sun/star/uno/Any.hxx> -#include <set> using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx index 583601ba25bb..c6095d9d2033 100644 --- a/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx +++ b/sd/source/ui/slidesorter/cache/SlsCacheConfiguration.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx index 344f72f56cc2..80f05bee7836 100644 --- a/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsGenericPageCache.cxx @@ -24,9 +24,6 @@ #include "SlsRequestFactory.hxx" #include "SlsBitmapCache.hxx" #include <cache/SlsPageCacheManager.hxx> -#include <model/SlideSorterModel.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <controller/SlideSorterController.hxx> #include <tools/debug.hxx> namespace sd { namespace slidesorter { namespace cache { diff --git a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx index d91d810799ad..779d2ff790f9 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCache.cxx @@ -19,9 +19,7 @@ #include <tools/gen.hxx> #include "SlsGenericPageCache.hxx" -#include "SlsRequestFactory.hxx" #include <cache/SlsPageCache.hxx> -#include <model/SlideSorterModel.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 1865fcdbeab2..8288b7851e61 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -20,8 +20,6 @@ #include <cache/SlsPageCacheManager.hxx> #include "SlsBitmapCache.hxx" -#include <view/SlideSorterView.hxx> -#include <model/SlideSorterModel.hxx> #include <deque> #include <map> diff --git a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx index f009abc017c7..937782bef27f 100644 --- a/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx +++ b/sd/source/ui/slidesorter/cache/SlsQueueProcessor.cxx @@ -18,7 +18,6 @@ */ #include "SlsQueueProcessor.hxx" -#include "SlsCacheConfiguration.hxx" #include "SlsRequestQueue.hxx" #include "SlsBitmapCache.hxx" diff --git a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx index c0993f92b96d..365a7273989b 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestFactory.cxx @@ -18,15 +18,7 @@ */ #include "SlsRequestFactory.hxx" - -#include "SlsGenericPageCache.hxx" -#include <model/SlideSorterModel.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <model/SlsPageEnumerationProvider.hxx> -#include <view/SlideSorterView.hxx> -#include <svx/svdpagv.hxx> -#include <svx/sdrpagewindow.hxx> -#include <svx/sdr/contact/viewcontact.hxx> +#include "SlsRequestQueue.hxx" namespace sd { namespace slidesorter { namespace cache { diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 4d07bd5977b3..f16a4b8f6ce2 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -18,9 +18,8 @@ */ #include "SlsRequestQueue.hxx" -#include <sdpage.hxx> -#include <sal/log.hxx> +#include <svx/svdpage.hxx> #include <set> diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index e544b75eba10..b466c86f2e71 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -32,7 +32,6 @@ #include <controller/SlsScrollBarManager.hxx> #include <controller/SlsSelectionManager.hxx> #include <controller/SlsSlotManager.hxx> -#include <controller/SlsTransferableData.hxx> #include <controller/SlsVisibleAreaManager.hxx> #include <model/SlideSorterModel.hxx> #include <model/SlsPageEnumerationProvider.hxx> @@ -40,44 +39,34 @@ #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> #include <view/SlsPageObjectLayouter.hxx> -#include <view/SlsPageObjectPainter.hxx> #include <view/SlsTheme.hxx> #include <view/SlsToolTip.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> #include <drawdoc.hxx> -#include <DrawViewShell.hxx> #include <ViewShellBase.hxx> #include <Window.hxx> #include <FrameView.hxx> -#include <DrawDocShell.hxx> #include <sdpage.hxx> #include <app.hrc> #include <sdmod.hxx> -#include <sdxfer.hxx> #include <ViewShellHint.hxx> #include <AccessibleSlideSorterView.hxx> #include <AccessibleSlideSorterObject.hxx> #include <vcl/window.hxx> -#include <svx/svdopage.hxx> #include <svx/svxids.hrc> -#include <svx/ruler.hxx> -#include <sfx2/zoomitem.hxx> -#include <svtools/tabbar.hxx> #include <sfx2/request.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> +#include <tools/debug.hxx> #include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPages.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <memory> diff --git a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx index 7b0e341ea332..dacf7ab911ee 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimationFunction.cxx @@ -18,11 +18,6 @@ */ #include <controller/SlsAnimationFunction.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <view/SlideSorterView.hxx> - -#include <osl/diagnose.hxx> -#include <rtl/math.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx index 3b0b183801f6..3c716795817b 100644 --- a/sd/source/ui/slidesorter/controller/SlsAnimator.cxx +++ b/sd/source/ui/slidesorter/controller/SlsAnimator.cxx @@ -19,7 +19,6 @@ #include <controller/SlsAnimator.hxx> #include <view/SlideSorterView.hxx> -#include <View.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx index 89b725d97be0..1658b228977c 100644 --- a/sd/source/ui/slidesorter/controller/SlsClipboard.cxx +++ b/sd/source/ui/slidesorter/controller/SlsClipboard.cxx @@ -25,13 +25,11 @@ #include <model/SlsPageDescriptor.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <view/SlideSorterView.hxx> -#include <view/SlsTheme.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsInsertionIndicatorHandler.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsSelectionFunction.hxx> #include <controller/SlsCurrentSlideManager.hxx> -#include <controller/SlsScrollBarManager.hxx> #include <controller/SlsFocusManager.hxx> #include <controller/SlsSelectionManager.hxx> #include <controller/SlsTransferableData.hxx> @@ -40,16 +38,9 @@ #include <cache/SlsPageCache.hxx> #include <ViewShellBase.hxx> -#include <View.hxx> #include <DrawViewShell.hxx> #include <Window.hxx> #include <fupoor.hxx> -#include <fuzoom.hxx> -#include <fucushow.hxx> -#include <fusldlg.hxx> -#include <fuexpand.hxx> -#include <fusumry.hxx> -#include <app.hrc> #include <strings.hrc> #include <sdresid.hxx> #include <sdxfer.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 770fb1ba6cf5..342ac4599f3d 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -21,23 +21,15 @@ #include <SlideSorter.hxx> #include <model/SlideSorterModel.hxx> -#include <model/SlsPageEnumerationProvider.hxx> -#include <view/SlideSorterView.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsInsertionIndicatorHandler.hxx> #include <controller/SlsScrollBarManager.hxx> #include <controller/SlsProperties.hxx> -#include <controller/SlsSelectionFunction.hxx> -#include <controller/SlsSelectionManager.hxx> #include <controller/SlsClipboard.hxx> #include <controller/SlsTransferableData.hxx> -#include <DrawDocShell.hxx> -#include <drawdoc.hxx> #include <Window.hxx> -#include <app.hrc> #include <sdtreelb.hxx> #include <sdmod.hxx> -#include <sfx2/bindings.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx index 132b3d6e2904..d61784d28921 100644 --- a/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsFocusManager.cxx @@ -20,7 +20,6 @@ #include <controller/SlsFocusManager.hxx> #include <SlideSorter.hxx> -#include <PaneDockingWindow.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlsVisibleAreaManager.hxx> @@ -28,7 +27,6 @@ #include <model/SlsPageDescriptor.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> -#include <vcl/toolbox.hxx> #include <Window.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx index ec79f5e85e90..9d8b07812b80 100644 --- a/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx +++ b/sd/source/ui/slidesorter/controller/SlsInsertionIndicatorHandler.cxx @@ -18,7 +18,6 @@ */ #include <controller/SlsInsertionIndicatorHandler.hxx> -#include <controller/SlsProperties.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> #include <view/SlsInsertAnimator.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsListener.cxx b/sd/source/ui/slidesorter/controller/SlsListener.cxx index 49a03529795b..a633c4e143f7 100644 --- a/sd/source/ui/slidesorter/controller/SlsListener.cxx +++ b/sd/source/ui/slidesorter/controller/SlsListener.cxx @@ -20,7 +20,6 @@ #include "SlsListener.hxx" #include <SlideSorter.hxx> -#include <SlideSorterViewShell.hxx> #include <ViewShell.hxx> #include <ViewShellHint.hxx> #include <controller/SlideSorterController.hxx> @@ -29,7 +28,6 @@ #include <controller/SlsSelectionManager.hxx> #include <controller/SlsSelectionObserver.hxx> #include <model/SlideSorterModel.hxx> -#include <model/SlsPageEnumerationProvider.hxx> #include <view/SlideSorterView.hxx> #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> @@ -39,14 +37,11 @@ #include <svx/svdpage.hxx> #include <ViewShellBase.hxx> -#include <ViewShellManager.hxx> -#include <FrameView.hxx> #include <EventMultiplexer.hxx> #include <com/sun/star/document/XEventBroadcaster.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/frame/FrameActionEvent.hpp> #include <com/sun/star/frame/FrameAction.hpp> -#include <sfx2/viewfrm.hxx> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx index 47c40e800328..f169c205f810 100644 --- a/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx +++ b/sd/source/ui/slidesorter/controller/SlsPageSelector.cxx @@ -20,10 +20,8 @@ #include <controller/SlsPageSelector.hxx> #include <SlideSorter.hxx> -#include <SlideSorterViewShell.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsSelectionManager.hxx> -#include <controller/SlsAnimator.hxx> #include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlsVisibleAreaManager.hxx> #include <model/SlsPageDescriptor.hxx> @@ -32,11 +30,6 @@ #include <view/SlideSorterView.hxx> #include <sdpage.hxx> -#include <ViewShell.hxx> -#include <DrawViewShell.hxx> -#include <ViewShellBase.hxx> -#include <com/sun/star/drawing/XDrawView.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/debug.hxx> #include <memory> diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index f7d8f928a4aa..2fbdfee47ea4 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -27,7 +27,6 @@ #include <model/SlsPageDescriptor.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> -#include <view/SlsTheme.hxx> #include <Window.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx index 672cee854962..ed58b8818792 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx @@ -20,14 +20,11 @@ #include <memory> #include <sal/config.h> -#include <cstdlib> - #include <controller/SlsSelectionFunction.hxx> #include <SlideSorter.hxx> #include <SlideSorterViewShell.hxx> #include "SlsDragAndDropContext.hxx" -#include <controller/SlsTransferableData.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsFocusManager.hxx> @@ -37,30 +34,22 @@ #include <controller/SlsInsertionIndicatorHandler.hxx> #include <controller/SlsSelectionManager.hxx> #include <controller/SlsProperties.hxx> -#include <controller/SlsSlotManager.hxx> #include <controller/SlsVisibleAreaManager.hxx> #include <model/SlideSorterModel.hxx> #include <model/SlsPageDescriptor.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> -#include <view/SlsPageObjectLayouter.hxx> #include <framework/FrameworkHelper.hxx> -#include <ViewShellBase.hxx> -#include <DrawController.hxx> #include <Window.hxx> #include <sdpage.hxx> #include <drawdoc.hxx> -#include <DrawDocShell.hxx> #include <sdxfer.hxx> #include <ViewShell.hxx> #include <FrameView.hxx> #include <app.hrc> #include <o3tl/deleter.hxx> -#include <sfx2/viewfrm.hxx> #include <sfx2/dispatch.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svxids.hrc> #include <vcl/ptrstyle.hxx> #include <boost/optional.hpp> #include <sdmod.hxx> diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx index c73abad8d07c..04c5d8270250 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionManager.cxx @@ -21,26 +21,19 @@ #include <SlideSorter.hxx> #include <controller/SlideSorterController.hxx> -#include <controller/SlsAnimator.hxx> -#include <controller/SlsAnimationFunction.hxx> #include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlsFocusManager.hxx> #include <controller/SlsPageSelector.hxx> -#include <controller/SlsProperties.hxx> -#include <controller/SlsScrollBarManager.hxx> -#include <controller/SlsSlotManager.hxx> #include <controller/SlsSelectionObserver.hxx> #include <model/SlideSorterModel.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <model/SlsPageDescriptor.hxx> #include <view/SlideSorterView.hxx> -#include <view/SlsLayouter.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> #include <drawview.hxx> #include <DrawViewShell.hxx> #include <ViewShellBase.hxx> -#include <Window.hxx> #include <svx/svxids.hrc> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx index d6daf3dd0826..0d4b23ff8dfe 100644 --- a/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSelectionObserver.cxx @@ -23,10 +23,6 @@ #include <controller/SlsSelectionObserver.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsFocusManager.hxx> -#include <model/SlideSorterModel.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <svx/svdmodel.hxx> -#include <drawdoc.hxx> #include <sdpage.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx index 069836e790cb..a12bcca4961a 100644 --- a/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsSlotManager.cxx @@ -17,8 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <com/sun/star/beans/PropertyValue.hpp> - #include <editeng/outlobj.hxx> #include <controller/SlsSlotManager.hxx> @@ -27,12 +25,10 @@ #include <controller/SlideSorterController.hxx> #include <controller/SlsClipboard.hxx> #include <controller/SlsCurrentSlideManager.hxx> -#include <controller/SlsFocusManager.hxx> #include <controller/SlsInsertionIndicatorHandler.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsSelectionFunction.hxx> #include <controller/SlsSelectionManager.hxx> -#include <controller/SlsSelectionObserver.hxx> #include <model/SlideSorterModel.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <model/SlsPageDescriptor.hxx> @@ -41,12 +37,10 @@ #include <framework/FrameworkHelper.hxx> #include <Window.hxx> #include <fupoor.hxx> -#include <fuzoom.hxx> #include <fucushow.hxx> #include <fusldlg.hxx> #include <fuexpand.hxx> #include <fusumry.hxx> -#include <fuscale.hxx> #include <slideshow.hxx> #include <app.hrc> #include <strings.hrc> @@ -56,9 +50,6 @@ #include <DrawDocShell.hxx> #include <ViewShellBase.hxx> #include <ViewShellImplementation.hxx> -#include <sdattr.hxx> -#include <FrameView.hxx> -#include <zoomlist.hxx> #include <sdpage.hxx> #include <sdxfer.hxx> #include <helpids.h> @@ -76,16 +67,13 @@ #include <sfx2/dispatch.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svx/svxids.hrc> -#include <sfx2/zoomitem.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> #include <svl/intitem.hxx> +#include <svl/stritem.hxx> #include <svl/whiter.hxx> #include <svl/itempool.hxx> -#include <svl/aeitem.hxx> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> -#include <vcl/svapp.hxx> #include <memory> diff --git a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx index e02d8363dcaa..5017cf9b5bec 100644 --- a/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx +++ b/sd/source/ui/slidesorter/controller/SlsTransferableData.cxx @@ -20,7 +20,6 @@ #include <controller/SlsTransferableData.hxx> #include <SlideSorterViewShell.hxx> -#include <View.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 78d61da20396..da8af970cf89 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -19,11 +19,8 @@ #include <sal/config.h> -#include <cstdlib> - #include <controller/SlsVisibleAreaManager.hxx> #include <controller/SlideSorterController.hxx> -#include <controller/SlsProperties.hxx> #include <controller/SlsAnimationFunction.hxx> #include <controller/SlsScrollBarManager.hxx> #include <controller/SlsCurrentSlideManager.hxx> diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 5b9f41fea0d8..b659285241cf 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -24,22 +24,18 @@ #include <model/SlsPageDescriptor.hxx> #include <model/SlsPageEnumerationProvider.hxx> #include <controller/SlideSorterController.hxx> -#include <controller/SlsProperties.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlsSlotManager.hxx> -#include <view/SlideSorterView.hxx> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/UnknownPropertyException.hpp> #include <com/sun/star/frame/XController.hpp> #include <vcl/uitest/logger.hxx> #include <vcl/uitest/eventdescription.hxx> #include <ViewShellBase.hxx> -#include <DrawViewShell.hxx> #include <DrawDocShell.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx index 56a9cd847505..b64233c5913a 100644 --- a/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageDescriptor.cxx @@ -20,12 +20,6 @@ #include <model/SlsPageDescriptor.hxx> #include <sdpage.hxx> -#include <drawdoc.hxx> - -#include <svx/svdopage.hxx> -#include <svx/svdpagv.hxx> -#include <svx/sdr/contact/viewcontact.hxx> -#include <svx/sdr/contact/viewobjectcontact.hxx> using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx index a822010d6ac0..6e66c104b9bb 100644 --- a/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx +++ b/sd/source/ui/slidesorter/model/SlsPageEnumeration.cxx @@ -24,7 +24,6 @@ #include <model/SlsPageEnumeration.hxx> #include <model/SlideSorterModel.hxx> -#include <model/SlsPageDescriptor.hxx> using namespace ::sd::slidesorter; using namespace ::sd::slidesorter::model; diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index 3fe6f2a4323d..e8b7de083ed7 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -18,8 +18,6 @@ */ #include <model/SlsVisualState.hxx> -#include <model/SlsPageDescriptor.hxx> -#include <controller/SlsAnimator.hxx> namespace sd { namespace slidesorter { namespace model { diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index 8ab8161f09cf..f2ba97cd35d0 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -19,7 +19,6 @@ #include <SlideSorter.hxx> -#include <SlideSorterViewShell.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsScrollBarManager.hxx> #include <controller/SlsProperties.hxx> @@ -29,9 +28,8 @@ #include <view/SlsTheme.hxx> #include <model/SlideSorterModel.hxx> -#include <DrawController.hxx> +#include <ViewShell.hxx> #include <ViewShellBase.hxx> -#include <ViewShellManager.hxx> #include <Window.hxx> #include <tools/debug.hxx> @@ -39,8 +37,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <sfx2/dispatch.hxx> - using namespace ::com::sun::star::uno; using namespace ::com::sun::star; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx index f9f3b27c9337..8cf176fbb008 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterService.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterService.cxx @@ -19,7 +19,6 @@ #include "SlideSorterService.hxx" #include <SlideSorter.hxx> -#include <facreg.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsProperties.hxx> #include <controller/SlsCurrentSlideManager.hxx> @@ -29,9 +28,7 @@ #include <view/SlsLayouter.hxx> #include <DrawController.hxx> #include <toolkit/helper/vclunohelper.hxx> -#include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> -#include <vcl/svapp.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx index 5f6fc84d9253..9e375bc8f6c3 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx @@ -23,25 +23,20 @@ #include <SlideSorter.hxx> #include <controller/SlideSorterController.hxx> #include <controller/SlsClipboard.hxx> -#include <controller/SlsFocusManager.hxx> #include <controller/SlsScrollBarManager.hxx> #include <controller/SlsPageSelector.hxx> #include <controller/SlsSlotManager.hxx> #include <controller/SlsCurrentSlideManager.hxx> #include <controller/SlsSelectionManager.hxx> -#include <controller/SlsSelectionFunction.hxx> -#include <controller/SlsProperties.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> #include <model/SlideSorterModel.hxx> -#include <model/SlsPageEnumeration.hxx> #include <model/SlsPageDescriptor.hxx> #include <framework/FrameworkHelper.hxx> #include <ViewShellBase.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> #include <app.hrc> -#include <sdattr.hrc> #include <AccessibleSlideSorterView.hxx> #include <DrawDocShell.hxx> #include <DrawViewShell.hxx> @@ -50,21 +45,15 @@ #include <ViewShellManager.hxx> #include <Window.hxx> #include <drawview.hxx> -#include <sfx2/app.hxx> #include <sfx2/msg.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/request.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <svx/svxids.hrc> #include <vcl/EnumContext.hxx> #include <svx/sidebar/ContextChangeEventMultiplexer.hxx> -#include <svx/sidebar/SelectionAnalyzer.hxx> -#include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/drawing/framework/ResourceId.hpp> -#include <cppuhelper/bootstrap.hxx> using namespace ::sd::slidesorter; #define ShellClass_SlideSorterViewShell diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index 36cd90066363..3b9298f9d803 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -19,9 +19,7 @@ #include <view/SlideSorterView.hxx> -#include <ViewShellBase.hxx> #include <SlideSorter.hxx> -#include <SlideSorterViewShell.hxx> #include <ViewShell.hxx> #include "SlsViewCacheContext.hxx" #include "SlsLayeredDevice.hxx" @@ -31,7 +29,6 @@ #include <view/SlsILayerPainter.hxx> #include <view/SlsToolTip.hxx> #include <controller/SlideSorterController.hxx> -#include <controller/SlsProperties.hxx> #include <controller/SlsClipboard.hxx> #include <model/SlideSorterModel.hxx> #include <model/SlsPageEnumerationProvider.hxx> @@ -39,32 +36,16 @@ #include <cache/SlsPageCache.hxx> #include <cache/SlsPageCacheManager.hxx> #include <cache/SlsCacheContext.hxx> -#include <DrawDocShell.hxx> #include <PaneDockingWindow.hxx> -#include <drawdoc.hxx> #include <sdpage.hxx> #include <Window.hxx> -#include <sal/log.hxx> -#include <svl/itempool.hxx> -#include <svx/svdpagv.hxx> -#include <svx/svdopage.hxx> -#include <svx/xlndsit.hxx> -#include <svx/xlnclit.hxx> #include <vcl/svapp.hxx> #include <vcl/scrbar.hxx> #include <vcl/settings.hxx> -#include <tools/poly.hxx> -#include <vcl/lineinfo.hxx> #include <algorithm> -#include <svx/sdrpagewindow.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/polygon/b2dpolygontools.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <drawinglayer/geometry/viewinformation2d.hxx> -#include <canvas/elapsedtime.hxx> //#define DEBUG_TIMING #ifdef DEBUG_TIMING diff --git a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx index e32429c05025..501d7dc65f0e 100644 --- a/sd/source/ui/slidesorter/view/SlsFramePainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsFramePainter.cxx @@ -19,7 +19,6 @@ #include "SlsFramePainter.hxx" #include <vcl/outdev.hxx> -#include <vcl/bitmapaccess.hxx> #include <osl/diagnose.h> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 63ebfe3ddf9a..a3cc6a0c2ede 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -23,7 +23,6 @@ #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> #include <model/SlideSorterModel.hxx> -#include <model/SlsPageEnumerationProvider.hxx> #include <SlideSorter.hxx> #include <Window.hxx> diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx index 8af23d854945..6daac07ac0dd 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx @@ -20,23 +20,18 @@ #include <view/SlsInsertionIndicatorOverlay.hxx> #include <SlideSorter.hxx> -#include <model/SlsPageEnumeration.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> #include <view/SlsPageObjectLayouter.hxx> #include <view/SlsTheme.hxx> -#include <cache/SlsPageCache.hxx> #include "SlsFramePainter.hxx" #include "SlsLayeredDevice.hxx" #include <DrawDocShell.hxx> #include <drawdoc.hxx> -#include <sdpage.hxx> -#include <sdmod.hxx> #include <Window.hxx> #include <vcl/virdev.hxx> #include <basegfx/range/b2drectangle.hxx> -#include <basegfx/utils/canvastools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx index 66f3f404722e..199d6ec1d26c 100644 --- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx @@ -20,7 +20,6 @@ #include "SlsLayeredDevice.hxx" #include <Window.hxx> -#include <vcl/window.hxx> #include <vcl/virdev.hxx> #include <sal/log.hxx> #include <osl/diagnose.h> diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index ac16ea895050..fb80dc9ec127 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -23,8 +23,6 @@ #include <model/SlideSorterModel.hxx> #include <model/SlsPageDescriptor.hxx> #include <Window.hxx> -#include <rtl/math.hxx> -#include <basegfx/numeric/ftools.hxx> #include <osl/diagnose.h> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 395181bbce4c..21d54e550829 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -27,11 +27,8 @@ #include <SlideSorter.hxx> #include "SlsFramePainter.hxx" #include <cache/SlsPageCache.hxx> -#include <controller/SlsProperties.hxx> #include <Window.hxx> #include <sdpage.hxx> -#include <vcl/svapp.hxx> -#include <vcl/vclenum.hxx> #include <vcl/virdev.hxx> #include <CustomAnimationEffect.hxx> #include <memory> diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx index f495ef6a4810..93be422f9ce4 100644 --- a/sd/source/ui/slidesorter/view/SlsTheme.cxx +++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx @@ -22,11 +22,9 @@ #include <controller/SlsProperties.hxx> #include <tools/color.hxx> #include <vcl/outdev.hxx> -#include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -#include <svtools/colorcfg.hxx> #include <osl/diagnose.h> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/slidesorter/view/SlsToolTip.cxx b/sd/source/ui/slidesorter/view/SlsToolTip.cxx index 025c2624587a..98636860d1ab 100644 --- a/sd/source/ui/slidesorter/view/SlsToolTip.cxx +++ b/sd/source/ui/slidesorter/view/SlsToolTip.cxx @@ -21,7 +21,6 @@ #include <view/SlsToolTip.hxx> #include <view/SlideSorterView.hxx> #include <view/SlsLayouter.hxx> -#include <view/SlsTheme.hxx> #include <SlideSorter.hxx> #include <Window.hxx> #include <sdpage.hxx> diff --git a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx index 5529d4945eb6..0202b4d8b798 100644 --- a/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewCacheContext.cxx @@ -29,9 +29,6 @@ #include <drawdoc.hxx> #include <tools/IdleDetection.hxx> #include <svx/svdpage.hxx> -#include <svx/sdr/contact/viewcontact.hxx> -#include <vcl/window.hxx> -#include <svx/sdr/contact/objectcontact.hxx> namespace sd { namespace slidesorter { namespace view { diff --git a/sd/source/ui/table/TableDesignPane.cxx b/sd/source/ui/table/TableDesignPane.cxx index f44709a0a020..c0b1be827bb8 100644 --- a/sd/source/ui/table/TableDesignPane.cxx +++ b/sd/source/ui/table/TableDesignPane.cxx @@ -17,17 +17,16 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <sddll.hxx> - -#include <com/sun/star/beans/XMultiPropertyStates.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> +#include <com/sun/star/drawing/XDrawView.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <com/sun/star/style/XStyle.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> +#include <comphelper/sequence.hxx> #include <sfx2/viewfrm.hxx> #include <vcl/virdev.hxx> -#include <vcl/layout.hxx> #include <vcl/settings.hxx> #include <vcl/builderfactory.hxx> @@ -50,10 +49,8 @@ #include "TableDesignPane.hxx" #include <createtabledesignpanel.hxx> -#include <DrawDocShell.hxx> +#include <ViewShell.hxx> #include <ViewShellBase.hxx> -#include <DrawViewShell.hxx> -#include <DrawController.hxx> #include <EventMultiplexer.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/table/tablefunction.cxx b/sd/source/ui/table/tablefunction.cxx index e145a98eea08..6fb9be6973a3 100644 --- a/sd/source/ui/table/tablefunction.cxx +++ b/sd/source/ui/table/tablefunction.cxx @@ -20,49 +20,28 @@ #include <sal/config.h> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/drawing/XSelectionFunction.hpp> -#include <com/sun/star/awt/KeyModifier.hpp> -#include <com/sun/star/lang/XInitialization.hpp> #include <comphelper/lok.hxx> -#include <cppuhelper/basemutex.hxx> - -#include <vcl/svapp.hxx> #include <svx/svdotable.hxx> -#include <svx/sdr/overlay/overlayobjectcell.hxx> -#include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/svxids.hrc> -#include <editeng/outlobj.hxx> -#include <svx/svdoutl.hxx> #include <svx/svdpagv.hxx> -#include <svx/svdetc.hxx> -#include <editeng/editstat.hxx> -#include <editeng/unolingu.hxx> -#include <svx/sdrpagewindow.hxx> -#include <svx/sdr/table/tabledesign.hxx> #include <svx/svxdlg.hxx> -#include <svl/itempool.hxx> #include <svl/intitem.hxx> #include <svl/stritem.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/bindings.hxx> #include <sfx2/request.hxx> #include <sfx2/sidebar/Sidebar.hxx> #include <svl/style.hxx> -#include <framework/FrameworkHelper.hxx> -#include "TableDesignPane.hxx" -#include <app.hrc> #include <tablefunction.hxx> #include <DrawViewShell.hxx> #include <drawdoc.hxx> #include <sdpage.hxx> -#include <DrawDocShell.hxx> #include <Window.hxx> #include <drawview.hxx> -#include <undo/undoobjects.hxx> #include <sdmod.hxx> #include <memory> diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx index 2b14ed74fcf3..36397fa816e7 100644 --- a/sd/source/ui/table/tableobjectbar.cxx +++ b/sd/source/ui/table/tableobjectbar.cxx @@ -17,42 +17,29 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sfx2/bindings.hxx> #include <sfx2/msg.hxx> -#include <sfx2/app.hxx> -#include <sfx2/sfxsids.hrc> #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewfrm.hxx> -#include <sfx2/dispatch.hxx> #include <sfx2/msgpool.hxx> #include <vcl/EnumContext.hxx> -#include <svl/whiter.hxx> -#include <svl/itempool.hxx> #include <svl/intitem.hxx> -#include <svx/svdomedia.hxx> -#include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <svx/svxdlg.hxx> -#include <svx/dialogs.hrc> #include <svx/svxids.hrc> -#include <app.hrc> #include <createtableobjectbar.hxx> #include <registerinterfaces.hxx> #include <strings.hrc> #include <DrawDocShell.hxx> #include <ViewShell.hxx> -#include <Window.hxx> -#include <drawview.hxx> #include <sdmod.hxx> #include <sdresid.hxx> -#include <drawdoc.hxx> #include <DrawViewShell.hxx> #include "tableobjectbar.hxx" -#include <memory> - using namespace sd; using namespace sd::ui::table; diff --git a/sd/source/ui/tools/AsynchronousCall.cxx b/sd/source/ui/tools/AsynchronousCall.cxx index 5369c051cfd5..09be42094368 100644 --- a/sd/source/ui/tools/AsynchronousCall.cxx +++ b/sd/source/ui/tools/AsynchronousCall.cxx @@ -20,8 +20,6 @@ #include <memory> #include <tools/AsynchronousCall.hxx> -#include <DrawViewShell.hxx> - namespace sd { namespace tools { AsynchronousCall::AsynchronousCall() diff --git a/sd/source/ui/tools/ConfigurationAccess.cxx b/sd/source/ui/tools/ConfigurationAccess.cxx index 60599ac0ef91..4883042ee94c 100644 --- a/sd/source/ui/tools/ConfigurationAccess.cxx +++ b/sd/source/ui/tools/ConfigurationAccess.cxx @@ -19,7 +19,6 @@ #include <tools/ConfigurationAccess.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/container/XHierarchicalNameAccess.hpp> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/sd/source/ui/tools/EventMultiplexer.cxx b/sd/source/ui/tools/EventMultiplexer.cxx index ee2e7e4fd0ca..c098b7abcf7d 100644 --- a/sd/source/ui/tools/EventMultiplexer.cxx +++ b/sd/source/ui/tools/EventMultiplexer.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/drawing/framework/XView.hpp> -#include <cppuhelper/weak.hxx> #include <cppuhelper/compbase.hxx> #include <sfx2/viewfrm.hxx> diff --git a/sd/source/ui/tools/IdleDetection.cxx b/sd/source/ui/tools/IdleDetection.cxx index 902b4eb960fc..e5ef96843682 100644 --- a/sd/source/ui/tools/IdleDetection.cxx +++ b/sd/source/ui/tools/IdleDetection.cxx @@ -19,7 +19,6 @@ #include <tools/IdleDetection.hxx> -#include <ViewShell.hxx> #include <slideshow.hxx> #include <ViewShellBase.hxx> diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx index c5b56cada8db..da46c1d98672 100644 --- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx +++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx @@ -26,7 +26,6 @@ #include <com/sun/star/frame/Desktop.hpp> -#include <o3tl/deleter.hxx> #include <rtl/instance.hxx> #include <sal/log.hxx> #include <tools/debug.hxx> diff --git a/sd/source/ui/tools/SlotStateListener.cxx b/sd/source/ui/tools/SlotStateListener.cxx index 4598f4cbcdcb..4d1ff2852394 100644 --- a/sd/source/ui/tools/SlotStateListener.cxx +++ b/sd/source/ui/tools/SlotStateListener.cxx @@ -22,7 +22,6 @@ #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/util/URLTransformer.hpp> #include <com/sun/star/util/XURLTransformer.hpp> -#include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <comphelper/processfactory.hxx> |