diff options
26 files changed, 24 insertions, 53 deletions
diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 21fa967ff0a3..c4492b51a02b 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX #define INCLUDED_SW_INC_ANCHOREDDRAWOBJECT_HXX -#include <memory> #include "anchoredobject.hxx" #include <boost/optional.hpp> diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index de5c9b8ac71a..d92f682dd2e7 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -31,8 +31,6 @@ #include <cppuhelper/implbase.hxx> -#include <sfx2/objsh.hxx> - #include "flyenum.hxx" #include "frmfmt.hxx" #include "unotext.hxx" @@ -42,7 +40,6 @@ class SdrObject; class SwDoc; class SwFormat; -class SwFlyFrameFormat; class BaseFrameProperties_Impl; class SwXFrame : public cppu::WeakImplHelper @@ -274,7 +271,6 @@ public: void operator delete( void * ) throw(); }; -class SwOLENode; typedef cppu::ImplInheritanceHelper < SwXFrame, css::document::XEmbeddedObjectSupplier2, diff --git a/sw/inc/unomap.hxx b/sw/inc/unomap.hxx index 40b54b13b0d1..f63f4ab8f168 100644 --- a/sw/inc/unomap.hxx +++ b/sw/inc/unomap.hxx @@ -19,7 +19,10 @@ #ifndef INCLUDED_SW_INC_UNOMAP_HXX #define INCLUDED_SW_INC_UNOMAP_HXX -#include <svl/itemprop.hxx> +#include <sal/types.h> + +class SfxItemPropertySet; +struct SfxItemPropertyMapEntry; #define PROPERTY_NONE 0 diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx index bf83e499f7b7..79ba07063bdb 100644 --- a/sw/inc/unosett.hxx +++ b/sw/inc/unosett.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SW_INC_UNOSETT_HXX #include "swtypes.hxx" -#include "calbck.hxx" #include <com/sun/star/text/XTextColumns.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -32,7 +31,6 @@ #include <cppuhelper/implbase2.hxx> #include <cppuhelper/implbase4.hxx> #include <cppuhelper/implbase5.hxx> -#include <svl/itemprop.hxx> #include "unobaseclass.hxx" class SwDoc; @@ -40,6 +38,7 @@ class SwFormatCol; class SwDocShell; class SwNumRule; class SwNumFormat; +class SfxItemPropertySet; class SwXFootnoteProperties : public cppu::WeakAggImplHelper2 < diff --git a/sw/inc/unostyle.hxx b/sw/inc/unostyle.hxx index 5d76bd719808..c59ac8602a49 100644 --- a/sw/inc/unostyle.hxx +++ b/sw/inc/unostyle.hxx @@ -41,6 +41,7 @@ #include "istyleaccess.hxx" #include <memory> +#include <map> class SwDocShell; class SfxItemPropertySet; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 23214c6decbc..88d76a515608 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -23,9 +23,7 @@ #include <com/sun/star/container/XNamed.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> #include <com/sun/star/util/XSortable.hpp> -#include <com/sun/star/chart/XChartData.hpp> #include <com/sun/star/chart/XChartDataArray.hpp> -#include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <com/sun/star/text/XTextTableCursor.hpp> #include <com/sun/star/text/XTextTable.hpp> #include <com/sun/star/table/XCellRange.hpp> @@ -46,9 +44,6 @@ class SwTable; class SwTableBox; class SwTableLine; class SwTableCursor; -class SwTableBoxFormat; -class SwChartDataProvider; -class SwFrameFormat; typedef cppu::WeakImplHelper diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 5a7f09279d87..11aa3cbf794f 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_INC_UNOTEXTBODYHF_HXX #define INCLUDED_SW_INC_UNOTEXTBODYHF_HXX -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sw/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx index ff9e759cef9e..10b3c8d29423 100644 --- a/sw/inc/unotextcursor.hxx +++ b/sw/inc/unotextcursor.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SW_INC_UNOTEXTCURSOR_HXX #define INCLUDED_SW_INC_UNOTEXTCURSOR_HXX -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 472ea5015cd5..eebd5d27474f 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -22,7 +22,6 @@ #include "swdllapi.h" #include <sfx2/sfxbasemodel.hxx> -#include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> #include <com/sun/star/style/XAutoStylesSupplier.hpp> #include <com/sun/star/document/XLinkTargetSupplier.hpp> @@ -30,7 +29,6 @@ #include <com/sun/star/text/XNumberingRulesSupplier.hpp> #include <com/sun/star/text/XFootnotesSupplier.hpp> #include <com/sun/star/text/XEndnotesSupplier.hpp> -#include <com/sun/star/text/XEndnotesSettingsSupplier.hpp> #include <com/sun/star/text/XTextSectionsSupplier.hpp> #include <com/sun/star/text/XLineNumberingProperties.hpp> #include <com/sun/star/text/XChapterNumberingSupplier.hpp> @@ -55,7 +53,6 @@ #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> -#include <com/sun/star/i18n/XForbiddenCharacters.hpp> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/xforms/XFormsSupplier.hpp> #include <com/sun/star/container/XNameContainer.hpp> @@ -63,13 +60,9 @@ #include <com/sun/star/document/XDocumentLanguages.hpp> #include <com/sun/star/util/XCloneable.hpp> #include <rtl/ref.hxx> -#include <svl/itemprop.hxx> #include <svx/fmdmod.hxx> -#include <svx/ruler.hxx> #include <editeng/UnoForbiddenCharsTable.hxx> -#include <cppuhelper/weak.hxx> #include <cppuhelper/implbase.hxx> -#include <vcl/event.hxx> #include <vcl/ITiledRenderable.hxx> #include <com/sun/star/tiledrendering/XTiledRenderable.hpp> @@ -90,6 +83,7 @@ class SwPrintUIOptions; class SwPrintData; class SwRenderData; class SwViewShell; +class SfxItemPropertySet; typedef cppu::WeakImplHelper < diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx index 2b0d63f83d97..a5307014b9c9 100644 --- a/sw/inc/view.hxx +++ b/sw/inc/view.hxx @@ -20,25 +20,16 @@ #define INCLUDED_SW_INC_VIEW_HXX #include <vcl/timer.hxx> -#include <vcl/field.hxx> -#include <vcl/floatwin.hxx> -#include <svtools/htmlcfg.hxx> -#include <sfx2/viewfac.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/objsh.hxx> #include <editeng/svxenum.hxx> #include <sfx2/zoomitem.hxx> #include <svx/ruler.hxx> -#include <svx/svxids.hrc> #include <svx/fmshell.hxx> -#include <editeng/editstat.hxx> #include "swdllapi.h" #include "swtypes.hxx" #include "shellid.hxx" -#include "IMark.hxx" -class Button; -class ImageButton; class SwTextFormatColl; class SwPageDesc; class SwFrameFormat; @@ -46,7 +37,6 @@ class SwCharFormat; class SwNumRule; class SwGlossaryHdl; class SwDrawBase; -class SvxRuler; class SvxLRSpaceItem; class SwDocShell; class SwScrollbar; @@ -56,11 +46,7 @@ class SvxSearchItem; class SearchAttrItemList; class SvxSearchDialog; class SdrView; -class Dialog; -class SdrObject; class SdrPageView; -class SwHlpImageButton; -class SwView; class SwEditWin; class SwWrtShell; class SwView_Impl; @@ -74,18 +60,19 @@ class SwMailMergeConfigItem; class SwTextNode; // #i23726# class SwFormatClipboard; struct SwConversionArgs; -class Graphic; class GraphicFilter; class SwPostItMgr; enum class SotExchangeDest; class SwCursorShell; enum class SvxSearchCmd; enum class SelectionType : sal_Int32; +class SfxViewFactory; namespace com{ namespace sun { namespace star { namespace view{ class XSelectionSupplier; } }}} namespace sfx2 { class FileDialogHelper; } +namespace sw { namespace mark { class IFieldmark; } } const long nLeftOfst = -370; const long nScrollX = 30; diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index e4252bf4bfa2..92da82a55b54 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -26,14 +26,11 @@ #include <tools/color.hxx> #include <sfx2/zoomitem.hxx> -#include <svx/svxids.hrc> #include "swdllapi.h" -#include "authratr.hxx" class SwRect; namespace vcl { class Window; } class OutputDevice; -class SwViewShell; class SwDocShell; namespace svtools{ class ColorConfig;} diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 368f1849273e..c7931d76f8be 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -19,8 +19,6 @@ #ifndef INCLUDED_SW_INC_VIEWSH_HXX #define INCLUDED_SW_INC_VIEWSH_HXX -#include <com/sun/star/embed/XClassifiedObject.hpp> -#include <com/sun/star/embed/XEmbeddedObject.hpp> #include "swdllapi.h" #include "swtypes.hxx" #include "ring.hxx" @@ -28,12 +26,9 @@ #include <memory> #include <stack> #include <vcl/mapmod.hxx> -#include <vcl/print.hxx> #include <vcl/vclptr.hxx> #include <vcl/lazydelete.hxx> -#include <LibreOfficeKit/LibreOfficeKitTypes.h> - namespace com { namespace sun { namespace star { namespace accessibility { class XAccessible; } } } } @@ -44,7 +39,6 @@ class IDocumentMarkAccess; class IDocumentDrawModelAccess; class IDocumentRedlineAccess; class IDocumentLayoutAccess; -class IDocumentFieldsAccess; class IDocumentContentOperations; class IDocumentStylePoolAccess; class IDocumentStatistics; @@ -52,7 +46,6 @@ class IDocumentUndoRedo; class IDocumentListItems; class IDocumentOutlineNodes; class SfxPrinter; -class SfxProgress; class SwRootFrame; class SwNodes; class SdrView; @@ -61,23 +54,18 @@ class SfxViewShell; class SwViewOption; class SwViewShellImp; class SwPrintData; -class SwPagePreviewPrtData; -namespace vcl { class Window; } -class OutputDevice; -class SwLayIdle; struct ShellResource; class SwRegionRects; -class SwFrame; class SvtAccessibilityOptions; class SwPagePreviewLayout; class SwTextFrame; -class BitmapEx; struct SwAccessibilityOptions; namespace vcl { class Region; } class SwPostItMgr; class SdrPaintWindow; class SwAccessibleMap; +enum class Orientation; namespace vcl { diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx index 1b98c75b0f81..f2dff93ebf2c 100644 --- a/sw/source/core/access/accpara.cxx +++ b/sw/source/core/access/accpara.cxx @@ -87,6 +87,7 @@ #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <svx/colorwindow.hxx> +#include <editeng/editids.hrc> #include <reffld.hxx> #include <expfld.hxx> diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx index 2252685f4309..f2ec8c3e17d9 100644 --- a/sw/source/core/doc/docdesc.cxx +++ b/sw/source/core/doc/docdesc.cxx @@ -61,6 +61,7 @@ #include <unotools/configmgr.hxx> #include <unotools/syslocale.hxx> #include <svx/swframetypes.hxx> +#include <svx/svxids.hrc> using namespace com::sun::star; diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 842d9250f869..a47aa962f9bd 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -96,6 +96,7 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <calbck.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> +#include <svx/svxids.hrc> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/Aspects.hpp> diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index d9729a32552a..e113645bc4aa 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -37,6 +37,7 @@ #include <xmloff/odffields.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/sequence.hxx> +#include <svl/itemprop.hxx> using namespace ::sw::mark; using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx index a27e5b44e0fe..130f0fa22181 100644 --- a/sw/source/core/unocore/unochart.cxx +++ b/sw/source/core/unocore/unochart.cxx @@ -46,6 +46,7 @@ #include <docary.hxx> #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> +#include <svl/itemprop.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 3b5424f15d43..601314ffc99a 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -42,6 +42,7 @@ #include <ndtxt.hxx> #include <unocrsr.hxx> #include <hints.hxx> +#include <svl/itemprop.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 216bbab09ecc..ff6546cdd496 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -64,6 +64,7 @@ #include <comphelper/servicehelper.hxx> #include <comphelper/string.hxx> #include <cppuhelper/implbase.hxx> +#include <svl/itemprop.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx index 65dae55f8812..5c503cfd6901 100644 --- a/sw/source/core/unocore/unosett.cxx +++ b/sw/source/core/unocore/unosett.cxx @@ -71,6 +71,7 @@ #include <comphelper/sequence.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/propertyvalue.hxx> +#include <svl/itemprop.hxx> #include <paratr.hxx> using namespace ::com::sun::star; diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx index a3e967320bcf..429201ac4d7c 100644 --- a/sw/source/core/unocore/unosrch.cxx +++ b/sw/source/core/unocore/unosrch.cxx @@ -34,6 +34,7 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> +#include <svl/itemprop.hxx> #include <memory> using namespace ::com::sun::star; diff --git a/sw/source/ui/envelp/envprt.hxx b/sw/source/ui/envelp/envprt.hxx index 84cad1803179..91ce62b4a9da 100644 --- a/sw/source/ui/envelp/envprt.hxx +++ b/sw/source/ui/envelp/envprt.hxx @@ -26,6 +26,7 @@ #include <vcl/fixed.hxx> #include <vcl/group.hxx> #include <vcl/button.hxx> +#include <vcl/print.hxx> #include <envimg.hxx> #include <envlop.hxx> diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx index 063f2128c69f..54b2c1064c51 100644 --- a/sw/source/uibase/config/viewopt.cxx +++ b/sw/source/uibase/config/viewopt.cxx @@ -33,6 +33,7 @@ #include <wdocsh.hxx> #include <swrect.hxx> #include <crstate.hxx> +#include <authratr.hxx> #include <svtools/colorcfg.hxx> #include <svtools/accessibilityoptions.hxx> #include <unotools/configmgr.hxx> diff --git a/sw/source/uibase/frmdlg/colex.cxx b/sw/source/uibase/frmdlg/colex.cxx index f3ae1b67b49d..af1d833346d5 100644 --- a/sw/source/uibase/frmdlg/colex.cxx +++ b/sw/source/uibase/frmdlg/colex.cxx @@ -38,6 +38,7 @@ #include <colex.hxx> #include <colmgr.hxx> #include <svx/unobrushitemhelper.hxx> +#include <svx/svxids.hrc> // Taking the updated values from the set void SwPageExample::UpdateExample( const SfxItemSet& rSet ) diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx index ba847a61a0ec..4cf1fbf78329 100644 --- a/sw/source/uibase/uiview/view0.cxx +++ b/sw/source/uibase/uiview/view0.cxx @@ -68,6 +68,7 @@ using namespace ::com::sun::star; #include <unotools/moduleoptions.hxx> +#include <sfx2/viewfac.hxx> #include <IDocumentSettingAccess.hxx> diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx index 937dd898257d..1052dffcd426 100644 --- a/sw/source/uibase/web/wview.cxx +++ b/sw/source/uibase/web/wview.cxx @@ -62,6 +62,7 @@ #include <sfx2/request.hxx> // needed for -fsanitize=function visibility of typeinfo for functions of // type void(SfxShell*,SfxRequest&) defined in swslots.hxx +#include <sfx2/viewfac.hxx> #define ShellClass_SwWebView #define ShellClass_Text #include <swslots.hxx> |