diff options
author | Gabor Kelemen <kelemeng@ubuntu.com> | 2018-09-06 00:36:41 +0200 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-09-07 10:43:51 +0200 |
commit | 9912d3e4003a10d7bc690afdef69473976244dd7 (patch) | |
tree | 80f3517bbe8428246d0bd88be3b4cb45aebb2167 | |
parent | 4b5194bd1d0dd893720ec0b311ee215a3168219f (diff) |
tdf#42949 Fix IWYU warnings in sd/source/ui/inc/[t-z]*
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I4ec951ddbc0a5ad4718bb44731eb2b4a0f718afc
Reviewed-on: https://gerrit.libreoffice.org/60061
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
38 files changed, 65 insertions, 87 deletions
diff --git a/sd/IwyuFilter_sd.yaml b/sd/IwyuFilter_sd.yaml index 75705e2b5156..d0561dc6eb15 100644 --- a/sd/IwyuFilter_sd.yaml +++ b/sd/IwyuFilter_sd.yaml @@ -128,3 +128,20 @@ blacklist: # typedef needs a complete type - com/sun/star/lang/XServiceInfo.hpp - com/sun/star/presentation/XPresentation2.hpp + sd/source/ui/inc/unomodel.hxx: + # base class has to be a complete type + - com/sun/star/drawing/XDrawPages.hpp + sd/source/ui/inc/unosrch.hxx: + # base class has to be a complete type + - com/sun/star/lang/XUnoTunnel.hpp + - com/sun/star/util/XReplaceDescriptor.hpp + sd/source/ui/inc/ViewShellManager.hxx: + #std::unique_ptr deleter type has to be complete + - o3tl/deleter.hxx + sd/source/ui/inc/ViewTabBar.hxx: + # base class has to be a complete type + - com/sun/star/drawing/framework/XConfigurationChangeListener.hpp + - com/sun/star/drawing/framework/XTabBar.hpp + - com/sun/star/drawing/framework/XToolBar.hpp + - com/sun/star/lang/XUnoTunnel.hpp + diff --git a/sd/source/ui/annotations/annotationmanagerimpl.hxx b/sd/source/ui/annotations/annotationmanagerimpl.hxx index 14efddce351e..daee8b8df347 100644 --- a/sd/source/ui/annotations/annotationmanagerimpl.hxx +++ b/sd/source/ui/annotations/annotationmanagerimpl.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/document/XEventListener.hpp> #include <com/sun/star/office/XAnnotationAccess.hpp> +#include <com/sun/star/drawing/XDrawView.hpp> #include <rtl/ustring.hxx> @@ -33,6 +34,7 @@ #include "annotationtag.hxx" class SfxRequest; +class SdPage; namespace sd { diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 99e37fd59c8a..0a3d017798a6 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -18,6 +18,7 @@ */ #include <com/sun/star/util/XChangesNotifier.hpp> +#include <com/sun/star/drawing/XDrawView.hpp> #include <vcl/help.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/dlg/TemplateScanner.cxx b/sd/source/ui/dlg/TemplateScanner.cxx index 0a4268c11aa8..e1100a345f5b 100644 --- a/sd/source/ui/dlg/TemplateScanner.cxx +++ b/sd/source/ui/dlg/TemplateScanner.cxx @@ -22,6 +22,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/documentconstants.hxx> +#include <o3tl/make_unique.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <sfx2/doctempl.hxx> diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx index 188068ed595c..5637ffd92250 100644 --- a/sd/source/ui/dlg/tpaction.cxx +++ b/sd/source/ui/dlg/tpaction.cxx @@ -48,6 +48,7 @@ #include <svx/xtable.hxx> #include <vcl/svapp.hxx> #include <vcl/mnemonic.hxx> +#include <vcl/lstbox.hxx> #include <svl/urihelper.hxx> #include <sfx2/filedlghelper.hxx> #include <svx/drawitem.hxx> diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx index 8445a64197ea..80a16b6e01b1 100644 --- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx +++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx @@ -25,6 +25,7 @@ #include <unotools/mediadescriptor.hxx> #include <com/sun/star/lang/IllegalArgumentException.hpp> +#include <com/sun/star/lang/XUnoTunnel.hpp> #include <DrawController.hxx> using namespace ::com::sun::star; diff --git a/sd/source/ui/func/fuconstr.cxx b/sd/source/ui/func/fuconstr.cxx index 9e15f47a070a..ecd4456d193f 100644 --- a/sd/source/ui/func/fuconstr.cxx +++ b/sd/source/ui/func/fuconstr.cxx @@ -40,6 +40,7 @@ #include <sdresid.hxx> #include <stlpool.hxx> #include <svx/globl3d.hxx> +#include <glob.hxx> using namespace com::sun::star; diff --git a/sd/source/ui/func/fuoaprms.cxx b/sd/source/ui/func/fuoaprms.cxx index 7915a1b8c783..07888644c720 100644 --- a/sd/source/ui/func/fuoaprms.cxx +++ b/sd/source/ui/func/fuoaprms.cxx @@ -31,6 +31,7 @@ #include <sfx2/sfxdlg.hxx> #include <svl/aeitem.hxx> #include <svx/xtable.hxx> +#include <svx/svdopath.hxx> #include <strings.hrc> #include <drawdoc.hxx> diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index ba2acc0a708a..fc4edb13b2c9 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -24,6 +24,7 @@ #include "ViewShell.hxx" #include "tools/AsynchronousCall.hxx" #include "TabControl.hxx" +#include <glob.hxx> #include <pres.hxx> #include <unotools/caserotate.hxx> #include <unotools/options.hxx> diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 1ed13bbb7025..bfc5e7f73e63 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SD_SOURCE_UI_INC_OUTLINEVIEWSHELL_HXX #include "ViewShell.hxx" +#include <glob.hxx> class SdPage; class TransferableDataHelper; diff --git a/sd/source/ui/inc/TemplateScanner.hxx b/sd/source/ui/inc/TemplateScanner.hxx index 81f2336d997e..14ab85740ac8 100644 --- a/sd/source/ui/inc/TemplateScanner.hxx +++ b/sd/source/ui/inc/TemplateScanner.hxx @@ -23,8 +23,7 @@ #include "tools/AsynchronousTask.hxx" #include <sddllapi.h> #include <ucbhelper/content.hxx> -#include <com/sun/star/uno/Reference.hxx> -#include <o3tl/make_unique.hxx> +#include <com/sun/star/uno/Reference.h> #include <memory> #include <vector> @@ -38,10 +37,6 @@ namespace com { namespace sun { namespace star { namespace sdbc { class XResultSet; } } } } -namespace comphelper { namespace string { -class NaturalStringSorter; -} } - namespace sd { /** Representation of a template or layout file. diff --git a/sd/source/ui/inc/TextObjectBar.hxx b/sd/source/ui/inc/TextObjectBar.hxx index 9a30dceac405..8b52c8031b94 100644 --- a/sd/source/ui/inc/TextObjectBar.hxx +++ b/sd/source/ui/inc/TextObjectBar.hxx @@ -20,12 +20,9 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX #define INCLUDED_SD_SOURCE_UI_INC_TEXTOBJECTBAR_HXX -#include <sfx2/module.hxx> #include <sfx2/shell.hxx> #include <glob.hxx> -class CommandEvent; - namespace sd { class View; diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx index d22bd8128c55..8a9603e76389 100644 --- a/sd/source/ui/inc/ToolBarManager.hxx +++ b/sd/source/ui/inc/ToolBarManager.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TOOLBARMANAGER_HXX #define INCLUDED_SD_SOURCE_UI_INC_TOOLBARMANAGER_HXX -#include "ViewShell.hxx" #include "ShellFactory.hxx" #include <rtl/ustring.hxx> @@ -28,6 +27,7 @@ #include <memory> class SdrView; +namespace sd { class ViewShell; } namespace sd { namespace tools { class EventMultiplexer; diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 188788667839..1340d2711624 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -25,13 +25,10 @@ #include <tools/gen.hxx> #include <svtools/transfer.hxx> #include <svx/fmview.hxx> -#include <svx/svdmark.hxx> #include <svx/svdpage.hxx> #include <vcl/idle.hxx> -#include "fupoor.hxx" #include "smarttag.hxx" -#include <editeng/numitem.hxx> class SdDrawDocument; class SdPage; @@ -40,16 +37,12 @@ class SdrGrafObj; class SdrMediaObj; class OutputDevice; class ImageMap; -class Point; class Graphic; class SdrOutliner; -class TransferableDataHelper; -class Outliner; namespace sd { class DrawDocShell; -struct SdNavigatorDropEvent; class ViewShell; class Window; class ViewClipboard; diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index a6d81ac3e910..9596a8d7155d 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -22,42 +22,34 @@ #include <rtl/ref.hxx> -#include <vcl/field.hxx> #include <sfx2/viewsh.hxx> #include <vcl/prntypes.hxx> -#include <svtools/transfer.hxx> -#include <glob.hxx> #include <pres.hxx> #include "View.hxx" +#include "fupoor.hxx" #include <sddllapi.h> -#include <com/sun/star/drawing/XDrawSubController.hpp> -#include <o3tl/deleter.hxx> #include <memory> +namespace o3tl { template <typename T> struct default_delete; } + class SdPage; class SvxRuler; class SdrOle2Obj; // for the ones, who have undefined parts of SVDRAW -class ScrollBarBox; class SdDrawDocument; -class ScrollBar; namespace weld { class Window; } -namespace com { namespace sun { namespace star { -namespace embed { - class XEmbeddedObject; -}}}} +namespace com { namespace sun { namespace star { namespace drawing { class XDrawSubController; } } } } namespace sd { class DrawDocShell; class FrameView; class LayerTabBar; -class View; class ViewShellBase; class Window; class WindowUpdater; diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 5e760c422fef..478d28231a50 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -20,11 +20,8 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_VIEWSHELLBASE_HXX #define INCLUDED_SD_SOURCE_UI_INC_VIEWSHELLBASE_HXX -#include "ViewShell.hxx" - #include <glob.hxx> #include <sfx2/viewsh.hxx> -#include <sfx2/viewfac.hxx> #include <memory> class SdDrawDocument; diff --git a/sd/source/ui/inc/ViewShellImplementation.hxx b/sd/source/ui/inc/ViewShellImplementation.hxx index 77dfc3ea0ded..723789d28245 100644 --- a/sd/source/ui/inc/ViewShellImplementation.hxx +++ b/sd/source/ui/inc/ViewShellImplementation.hxx @@ -23,9 +23,10 @@ #include "ViewShell.hxx" #include "ViewShellManager.hxx" #include "ToolBarManager.hxx" -#include <o3tl/deleter.hxx> #include <memory> +namespace o3tl { template <typename T> struct default_delete; } + class SvxIMapDlg; namespace sd { diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx index 058a673c194b..3401966657a5 100644 --- a/sd/source/ui/inc/ViewTabBar.hxx +++ b/sd/source/ui/inc/ViewTabBar.hxx @@ -20,21 +20,23 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_VIEWTABBAR_HXX #define INCLUDED_SD_SOURCE_UI_INC_VIEWTABBAR_HXX -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/drawing/framework/XPane.hpp> #include <com/sun/star/drawing/framework/TabBarButton.hpp> #include <com/sun/star/drawing/framework/XTabBar.hpp> #include <com/sun/star/drawing/framework/XToolBar.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> #include <com/sun/star/drawing/framework/XConfigurationChangeListener.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <vcl/tabctrl.hxx> #include <cppuhelper/compbase.hxx> #include "MutexOwner.hxx" -#include <memory> #include <vector> +namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XConfigurationController; } } } } } +namespace com { namespace sun { namespace star { namespace drawing { namespace framework { class XResourceId; } } } } } +namespace com { namespace sun { namespace star { namespace drawing { namespace framework { struct ConfigurationChangeEvent; } } } } } +namespace com { namespace sun { namespace star { namespace frame { class XController; } } } } +namespace vcl { class Window; } + namespace sd { class ViewShellBase; } diff --git a/sd/source/ui/inc/WindowUpdater.hxx b/sd/source/ui/inc/WindowUpdater.hxx index a6c148f5aefc..c244624cd60c 100644 --- a/sd/source/ui/inc/WindowUpdater.hxx +++ b/sd/source/ui/inc/WindowUpdater.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_WINDOWUPDATER_HXX #define INCLUDED_SD_SOURCE_UI_INC_WINDOWUPDATER_HXX -#include <svl/lstner.hxx> #include <svl/ctloptions.hxx> #include <vcl/vclptr.hxx> #include <sddllapi.h> @@ -33,8 +32,6 @@ class SdDrawDocument; namespace sd { -class ViewShell; - /** The purpose of the <type>WindowUpdater</type> is to update output devices to take care of modified global values. These values are monitored for changes. At the moment this is diff --git a/sd/source/ui/inc/tabtempl.hxx b/sd/source/ui/inc/tabtempl.hxx index 3bd765e64a69..48af4ee65759 100644 --- a/sd/source/ui/inc/tabtempl.hxx +++ b/sd/source/ui/inc/tabtempl.hxx @@ -20,8 +20,9 @@ #ifndef INCLUDED_SD_SOURCE_UI_INC_TABTEMPL_HXX #define INCLUDED_SD_SOURCE_UI_INC_TABTEMPL_HXX -#include <svx/tabarea.hxx> #include <sfx2/styledlg.hxx> +#include <svx/xtable.hxx> + class SdrModel; class SfxObjectShell; class SdrView; diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx index fce151ba92a8..1e9ee447cffd 100644 --- a/sd/source/ui/inc/tpaction.hxx +++ b/sd/source/ui/inc/tpaction.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/presentation/ClickAction.hpp> #include <vcl/fixed.hxx> #include <vcl/layout.hxx> -#include <svx/dlgctrl.hxx> #include <sfx2/tabdlg.hxx> #include <sfx2/basedlgs.hxx> #include "sdtreelb.hxx" diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx index 7970c6c1b331..a9bed66172be 100644 --- a/sd/source/ui/inc/tpoption.hxx +++ b/sd/source/ui/inc/tpoption.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SD_SOURCE_UI_INC_TPOPTION_HXX #include <vcl/lstbox.hxx> -#include <vcl/group.hxx> #include <vcl/fixed.hxx> #include <vcl/field.hxx> #include <vcl/button.hxx> @@ -67,7 +66,7 @@ public: /** * Option-Tab-Page: View */ -class SdModule; + class SdTpOptionsMisc : public SfxTabPage { friend class SdModule; diff --git a/sd/source/ui/inc/uiobject.hxx b/sd/source/ui/inc/uiobject.hxx index 221ad1847122..bfc43dd4a370 100644 --- a/sd/source/ui/inc/uiobject.hxx +++ b/sd/source/ui/inc/uiobject.hxx @@ -9,16 +9,7 @@ #include <memory> #include <vcl/uitest/uiobject.hxx> - -namespace sd { - -class Window; -class DrawViewShell; - -} - -class SdrObject; -class SdrPageView; +#include "Window.hxx" class ImpressWindowUIObject : public WindowUIObject { diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx index 9b8171cb2a6c..2e04e7c4e1aa 100644 --- a/sd/source/ui/inc/unmodpg.hxx +++ b/sd/source/ui/inc/unmodpg.hxx @@ -23,7 +23,6 @@ #include <xmloff/autolayout.hxx> #include <sdundo.hxx> -#include <pres.hxx> class SdDrawDocument; class SdPage; diff --git a/sd/source/ui/inc/unoaprms.hxx b/sd/source/ui/inc/unoaprms.hxx index 4b1c3363dd97..944deeca8476 100644 --- a/sd/source/ui/inc/unoaprms.hxx +++ b/sd/source/ui/inc/unoaprms.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/presentation/AnimationSpeed.hpp> #include <com/sun/star/presentation/ClickAction.hpp> #include <sdundo.hxx> -#include <svx/svdopath.hxx> #include <tools/color.hxx> class SdDrawDocument; diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 5e63e8b2c6a9..eda3a1511038 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -22,40 +22,36 @@ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/document/XLinkTargetSupplier.hpp> #include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XDrawPageSummarizer.hpp> #include <com/sun/star/drawing/XDrawPageDuplicator.hpp> #include <com/sun/star/drawing/XLayerSupplier.hpp> #include <com/sun/star/drawing/XMasterPagesSupplier.hpp> #include <com/sun/star/presentation/XPresentationSupplier.hpp> #include <com/sun/star/presentation/XCustomPresentationSupplier.hpp> -#include <com/sun/star/drawing/XLayerManager.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/presentation/XPresentation.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/drawing/XDrawPages.hpp> #include <com/sun/star/ucb/XAnyCompareFactory.hpp> -#include <com/sun/star/i18n/XForbiddenCharacters.hpp> #include <com/sun/star/presentation/XHandoutMasterSupplier.hpp> #include <com/sun/star/view/XRenderable.hpp> -#include <com/sun/star/util/MeasureUnit.hpp> +#include <com/sun/star/beans/XPropertySet.hpp> #include <rtl/ref.hxx> -#include <svl/lstner.hxx> #include <sfx2/sfxbasemodel.hxx> #include <svx/fmdmod.hxx> -#include <vcl/event.hxx> #include <vcl/ITiledRenderable.hxx> -#include <editeng/unoipset.hxx> - #include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <sddllapi.h> +namespace com { namespace sun { namespace star { namespace container { class XNameContainer; } } } } +namespace com { namespace sun { namespace star { namespace i18n { class XForbiddenCharacters; } } } } +namespace com { namespace sun { namespace star { namespace presentation { class XPresentation; } } } } + class SdDrawDocument; class SdPage; +class SvxItemPropertySet; namespace sd { class DrawDocShell; @@ -65,9 +61,6 @@ class DrawViewShell; extern OUString getPageApiName( SdPage const * pPage ); extern OUString getPageApiNameFromUiName( const OUString& rUIName ); -/*********************************************************************** -* * -***********************************************************************/ class SD_DLLPUBLIC SdXImpressDocument : public SfxBaseModel, // implements SfxListener, OWEAKOBJECT & other public SvxFmMSFactory, public css::drawing::XDrawPageDuplicator, diff --git a/sd/source/ui/inc/unopage.hxx b/sd/source/ui/inc/unopage.hxx index 12ae4c860864..1b675f803568 100644 --- a/sd/source/ui/inc/unopage.hxx +++ b/sd/source/ui/inc/unopage.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SD_SOURCE_UI_UNOIDL_UNOPAGE_HXX #include <com/sun/star/document/XLinkTargetSupplier.hpp> -#include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/drawing/XMasterPageTarget.hpp> #include <com/sun/star/presentation/XPresentationPage.hpp> @@ -28,11 +27,8 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/office/XAnnotationAccess.hpp> -#include <svl/itemprop.hxx> - #include <svx/unopage.hxx> #include <svx/fmdpage.hxx> -#include <svx/svdpool.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> @@ -40,14 +36,9 @@ #include "unosrch.hxx" #include <sdpage.hxx> -class SdPage; class SdrObject; class SdXImpressDocument; -struct SfxItemPropertySimpleEntry; -/*********************************************************************** -* * -***********************************************************************/ class SdGenericDrawPage : public SvxFmDrawPage, public SdUnoSearchReplaceShape, public css::drawing::XShapeCombiner, diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx index 48c00e0b01cd..4d4279bff245 100644 --- a/sd/source/ui/inc/unosrch.hxx +++ b/sd/source/ui/inc/unosrch.hxx @@ -21,20 +21,18 @@ #define INCLUDED_SD_SOURCE_UI_INC_UNOSRCH_HXX #include <memory> -#include <com/sun/star/drawing/XShape.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/util/XReplaceable.hpp> -#include <com/sun/star/util/XSearchable.hpp> -#include <com/sun/star/util/XSearchDescriptor.hpp> #include <com/sun/star/util/XReplaceDescriptor.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <editeng/editdata.hxx> -#include <editeng/unoipset.hxx> + +namespace com { namespace sun { namespace star { namespace drawing { class XDrawPage; } } } } +namespace com { namespace sun { namespace star { namespace drawing { class XShape; } } } } +namespace com { namespace sun { namespace star { namespace text { class XTextRange; } } } } +namespace com { namespace sun { namespace star { namespace util { class XSearchDescriptor; } } } } class SvxItemPropertySet; class SdUnoSearchReplaceDescriptor; diff --git a/sd/source/ui/inc/unprlout.hxx b/sd/source/ui/inc/unprlout.hxx index 11dffac54ccd..37777413117b 100644 --- a/sd/source/ui/inc/unprlout.hxx +++ b/sd/source/ui/inc/unprlout.hxx @@ -23,7 +23,6 @@ #include <xmloff/autolayout.hxx> #include <sdundo.hxx> -#include <pres.hxx> class SdDrawDocument; class SdPage; diff --git a/sd/source/ui/inc/view/viewoverlaymanager.hxx b/sd/source/ui/inc/view/viewoverlaymanager.hxx index d46fcdb42468..49fbef2a42ea 100644 --- a/sd/source/ui/inc/view/viewoverlaymanager.hxx +++ b/sd/source/ui/inc/view/viewoverlaymanager.hxx @@ -25,6 +25,8 @@ #include <EventMultiplexer.hxx> #include <ViewShellBase.hxx> +namespace sd { class SmartTag; } + namespace sd { diff --git a/sd/source/ui/sidebar/SlideBackground.hxx b/sd/source/ui/sidebar/SlideBackground.hxx index 4cca5b24807a..7ad06782e278 100644 --- a/sd/source/ui/sidebar/SlideBackground.hxx +++ b/sd/source/ui/sidebar/SlideBackground.hxx @@ -48,6 +48,7 @@ #include <sfx2/sidebar/IContextChangeReceiver.hxx> class SvxColorListBox; +class SvxPageItem; static const long MINBODY = 284; diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index b63d7f89dae5..97305d9183c8 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -22,6 +22,7 @@ #include <DrawSubController.hxx> #include <sdpage.hxx> +#include <ViewShell.hxx> #include <ViewShellBase.hxx> #include <ViewShellManager.hxx> #include <FormShellManager.hxx> diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx index 3b1e0f8b9992..5a9076a7fa48 100644 --- a/sd/source/ui/view/GraphicViewShellBase.cxx +++ b/sd/source/ui/view/GraphicViewShellBase.cxx @@ -24,6 +24,7 @@ #include <framework/DrawModule.hxx> #include <framework/FrameworkHelper.hxx> #include <sfx2/request.hxx> +#include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx index 4b55cc47250a..37fa4000fe99 100644 --- a/sd/source/ui/view/ImpressViewShellBase.cxx +++ b/sd/source/ui/view/ImpressViewShellBase.cxx @@ -25,6 +25,7 @@ #include <framework/ImpressModule.hxx> #include <MasterPageObserver.hxx> #include <sfx2/request.hxx> +#include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <comphelper/lok.hxx> diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx index 033d46a611d0..59e6be4ed220 100644 --- a/sd/source/ui/view/OutlineViewShellBase.cxx +++ b/sd/source/ui/view/OutlineViewShellBase.cxx @@ -20,6 +20,7 @@ #include <OutlineViewShellBase.hxx> #include <DrawDocShell.hxx> #include <framework/FrameworkHelper.hxx> +#include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx index 45a9853f2d3c..d37abee068a8 100644 --- a/sd/source/ui/view/PresentationViewShellBase.cxx +++ b/sd/source/ui/view/PresentationViewShellBase.cxx @@ -22,6 +22,7 @@ #include <framework/FrameworkHelper.hxx> #include <framework/PresentationModule.hxx> +#include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx index 4832fba81f09..a4aff567350e 100644 --- a/sd/source/ui/view/SlideSorterViewShellBase.cxx +++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx @@ -20,6 +20,7 @@ #include <SlideSorterViewShellBase.hxx> #include <DrawDocShell.hxx> #include <framework/FrameworkHelper.hxx> +#include <sfx2/viewfac.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx index 1a2d569baa7c..d3caaa0fecb1 100644 --- a/sd/source/ui/view/ViewTabBar.cxx +++ b/sd/source/ui/view/ViewTabBar.cxx @@ -35,7 +35,6 @@ #include <sfx2/viewfrm.hxx> #include <com/sun/star/drawing/framework/ResourceId.hpp> #include <com/sun/star/drawing/framework/XControllerManager.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <comphelper/processfactory.hxx> #include <comphelper/servicehelper.hxx> |