diff options
42 files changed, 30 insertions, 78 deletions
diff --git a/svx/IwyuFilter_svx.yaml b/svx/IwyuFilter_svx.yaml index 123a38fd8acc..d3ec76061b25 100644 --- a/svx/IwyuFilter_svx.yaml +++ b/svx/IwyuFilter_svx.yaml @@ -1,2 +1,7 @@ --- assumeFilename: svx/source/svdraw/svdobj.cxx +blacklist: + svx/source/svdraw/svdpdf.hxx: + # Needed on WIN32 + - prewin.h + - postwin.h diff --git a/svx/source/accessibility/lookupcolorname.hxx b/svx/source/accessibility/lookupcolorname.hxx index 394a8543698c..4c4a672b2033 100644 --- a/svx/source/accessibility/lookupcolorname.hxx +++ b/svx/source/accessibility/lookupcolorname.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> +#include <rtl/ustring.hxx> namespace accessibility { diff --git a/svx/source/customshapes/EnhancedCustomShape3d.hxx b/svx/source/customshapes/EnhancedCustomShape3d.hxx index aaeebc8f9ed5..43bfc1efd1a5 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.hxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX #define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPE3D_HXX -#include <vector> #include <com/sun/star/drawing/ProjectionMode.hpp> #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx index 0d7718b8b748..831d47ab43f8 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.hxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.hxx @@ -20,14 +20,11 @@ #ifndef INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX #define INCLUDED_SVX_SOURCE_CUSTOMSHAPES_ENHANCEDCUSTOMSHAPEHANDLE_HXX -#include <com/sun/star/uno/RuntimeException.hpp> #include <cppuhelper/implbase.hxx> #include <com/sun/star/lang/XInitialization.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XCustomShapeHandle.hpp> #include <com/sun/star/awt/Point.hpp> -#include <cppuhelper/weakref.hxx> class EnhancedCustomShapeHandle : public cppu::WeakImplHelper < diff --git a/svx/source/dialog/contimp.hxx b/svx/source/dialog/contimp.hxx index ecf0bdc08dac..c8b59cb72e14 100644 --- a/svx/source/dialog/contimp.hxx +++ b/svx/source/dialog/contimp.hxx @@ -19,7 +19,7 @@ #ifndef INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX #define INCLUDED_SVX_SOURCE_DIALOG_CONTIMP_HXX -#include <svx/contdlg.hxx> +#include <sfx2/ctrlitem.hxx> #include "contwnd.hxx" #include <vcl/idle.hxx> diff --git a/svx/source/dialog/imapimp.hxx b/svx/source/dialog/imapimp.hxx index 072b43afe607..f2a10e45e98d 100644 --- a/svx/source/dialog/imapimp.hxx +++ b/svx/source/dialog/imapimp.hxx @@ -21,6 +21,10 @@ #ifndef INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX #define INCLUDED_SVX_SOURCE_DIALOG_IMAPIMP_HXX +#include <svx/imapdlg.hxx> +#include <vcl/graph.hxx> +#include <vcl/idle.hxx> +#include <vcl/imap.hxx> class IMapOwnData { diff --git a/svx/source/engine3d/helperminimaldepth3d.hxx b/svx/source/engine3d/helperminimaldepth3d.hxx index 559f49714c4c..15da40d099be 100644 --- a/svx/source/engine3d/helperminimaldepth3d.hxx +++ b/svx/source/engine3d/helperminimaldepth3d.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX #define INCLUDED_SVX_SOURCE_ENGINE3D_HELPERMINIMALDEPTH3D_HXX -#include <sal/types.h> - // predefines diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index b18fa593b382..2a1572bab801 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -19,19 +19,12 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREAPROPERTYPANEL_HXX -#include <vcl/ctrl.hxx> #include <sfx2/sidebar/ControllerItem.hxx> -#include <svx/xgrad.hxx> -#include <svx/itemwin.hxx> #include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xbtmpit.hxx> -#include <svx/drawitem.hxx> -#include <svx/sidebar/PanelLayout.hxx> -#include <svl/intitem.hxx> -#include <com/sun/star/ui/XUIElement.hpp> #include <svx/sidebar/AreaPropertyPanelBase.hxx> diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index 519d0e275349..1d1a8ce90c52 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_GRAPHIC_GRAPHICPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_GRAPHIC_GRAPHICPROPERTYPANEL_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <vcl/weld.hxx> diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index c7296cab94e0..99c1aee74a26 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -19,13 +19,8 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_LINE_LINEPROPERTYPANEL_HXX -#include <svx/xdash.hxx> -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> -#include <memory> -#include <svx/sidebar/PanelLayout.hxx> -#include <svx/xtable.hxx> #include <svx/sidebar/LinePropertyPanelBase.hxx> diff --git a/svx/source/sidebar/media/MediaPlaybackPanel.hxx b/svx/source/sidebar/media/MediaPlaybackPanel.hxx index 9f050e1247ad..3f9d06de1d03 100644 --- a/svx/source/sidebar/media/MediaPlaybackPanel.hxx +++ b/svx/source/sidebar/media/MediaPlaybackPanel.hxx @@ -20,11 +20,9 @@ #define INCLUDED_SD_SOURCE_SIDEBAR_MEDIAPLAYBACKPANEL_HXX #include <memory> -#include <vcl/ctrl.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <svx/sidebar/PanelLayout.hxx> -#include <vcl/layout.hxx> #include <vcl/slider.hxx> #include <vcl/toolbox.hxx> #include <avmedia/mediaitem.hxx> diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 3f5c12f8ca21..673840c65144 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGCONTROL_HXX #include <svtools/toolbarmenu.hxx> -#include <sfx2/tbxctrl.hxx> class SvxLineSpacingItem; diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index 6a6aacd5f8ff..4e360bfaa243 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -21,15 +21,12 @@ #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> -#include <editeng/lspcitem.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <svx/relfld.hxx> -#include <editeng/svxenum.hxx> #include <com/sun/star/frame/XFrame.hpp> #include <com/sun/star/ui/XSidebar.hpp> -#include <vcl/vclenum.hxx> #include <svl/poolitem.hxx> #include <tools/fldunit.hxx> diff --git a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx index d2fe7d247216..29ce7e3bbc0d 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingControl.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingControl.cxx @@ -19,6 +19,7 @@ #include "ParaSpacingWindow.hxx" +#include <cppuhelper/queryinterface.hxx> #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/editids.hrc> diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx index d6800db15b8c..4e777a6e2b6e 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.cxx @@ -19,6 +19,7 @@ #include "ParaSpacingWindow.hxx" #include <editeng/editids.hrc> +#include <editeng/lrspitem.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/app.hxx> #include <sfx2/viewfrm.hxx> diff --git a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx index 6d7ad8232102..88ba80e26489 100644 --- a/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx +++ b/svx/source/sidebar/paragraph/ParaSpacingWindow.hxx @@ -19,15 +19,11 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARASPACINGWINDOW_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARASPACINGWINDOW_HXX -#include <cppuhelper/queryinterface.hxx> #include <editeng/ulspitem.hxx> -#include <editeng/lrspitem.hxx> #include <vcl/builder.hxx> #include <vcl/layout.hxx> #include <vcl/EnumContext.hxx> #include <svx/relfld.hxx> -#include <svtools/unitconv.hxx> -#include <sfx2/sidebar/ControllerItem.hxx> using namespace com::sun::star; diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index c9f4b5d34c7d..5e3ab55411f0 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -34,6 +34,7 @@ #include <sfx2/weldutils.hxx> #include <svx/dialcontrol.hxx> #include <svx/dlgutil.hxx> +#include <svx/rectenum.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/viewoptions.hxx> #include <vcl/canvastools.hxx> diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 271b160d88d1..8ec9b27a349d 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -19,11 +19,9 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_POSSIZE_POSSIZEPROPERTYPANEL_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <sfx2/sidebar/IContextChangeReceiver.hxx> #include <sfx2/weldutils.hxx> -#include <svx/rectenum.hxx> #include <svx/sidebar/PanelLayout.hxx> #include <svl/poolitem.hxx> #include <tools/fldunit.hxx> diff --git a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx index c2bc4abcc599..b50d14d0a98b 100644 --- a/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx +++ b/svx/source/sidebar/shadow/ShadowPropertyPanel.hxx @@ -10,13 +10,8 @@ #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_SHADOWPROPERTYPANEL_HXX #include <vcl/vclptr.hxx> -#include <sfx2/sidebar/SidebarPanelBase.hxx> #include <sfx2/sidebar/ControllerItem.hxx> #include <svx/sidebar/PanelLayout.hxx> -#include <svl/intitem.hxx> -#include <com/sun/star/ui/XUIElement.hpp> -#include <sfx2/request.hxx> -#include <svx/dlgctrl.hxx> class ColorListBox; diff --git a/svx/source/sidebar/styles/StylesPropertyPanel.hxx b/svx/source/sidebar/styles/StylesPropertyPanel.hxx index 9b4867a6b809..b57650348136 100644 --- a/svx/source/sidebar/styles/StylesPropertyPanel.hxx +++ b/svx/source/sidebar/styles/StylesPropertyPanel.hxx @@ -1,15 +1,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_STYLES_STYLESPROPERTYPANEL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_STYLES_STYLESPROPERTYPANEL_HXX -#include <sfx2/sidebar/SidebarPanelBase.hxx> -#include <sfx2/sidebar/ControllerItem.hxx> -#include <sfx2/sidebar/IContextChangeReceiver.hxx> -#include <vcl/EnumContext.hxx> -#include <svtools/ctrlbox.hxx> -#include <editeng/fhgtitem.hxx> -#include <com/sun/star/ui/XUIElement.hpp> -#include <com/sun/star/ui/XSidebar.hpp> - #include <svx/sidebar/PanelLayout.hxx> namespace svx { namespace sidebar{ diff --git a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx index c1ea339b1ae3..22b5e63141ae 100644 --- a/svx/source/sidebar/text/TextCharacterSpacingControl.hxx +++ b/svx/source/sidebar/text/TextCharacterSpacingControl.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTCHARACTERSPACINGCONTROL_HXX -#include <sfx2/bindings.hxx> #include <svtools/toolbarmenu.hxx> namespace svx { diff --git a/svx/source/sidebar/text/TextUnderlineControl.hxx b/svx/source/sidebar/text/TextUnderlineControl.hxx index 1dea62fdbef5..00d3a714d0a4 100644 --- a/svx/source/sidebar/text/TextUnderlineControl.hxx +++ b/svx/source/sidebar/text/TextUnderlineControl.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_TEXT_TEXTUNDERLINECONTROL_HXX -#include <sfx2/bindings.hxx> -#include <vcl/vclenum.hxx> #include <svtools/toolbarmenu.hxx> namespace svx { diff --git a/svx/source/stbctrls/modctrl_internal.hxx b/svx/source/stbctrls/modctrl_internal.hxx index 21af209b72f7..d6d3d6834503 100644 --- a/svx/source/stbctrls/modctrl_internal.hxx +++ b/svx/source/stbctrls/modctrl_internal.hxx @@ -19,6 +19,10 @@ #ifndef INCLUDED_SVX_SOURCE_STBCTRLS_MODCTRL_INTERNAL_HXX #define INCLUDED_SVX_SOURCE_STBCTRLS_MODCTRL_INTERNAL_HXX +#include <tools/gen.hxx> + +class Image; + Point centerImage(const tools::Rectangle& rBoundingRect, const Image& rImg); #endif // INCLUDED_SVX_SOURCE_STBCTRLS_MODCTRL_INTERNAL_HXX diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 0f98e4c1927d..909df89360be 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -24,7 +24,7 @@ #include <memory> -#include <tools/contnr.hxx> +#include <svl/itemset.hxx> #include <tools/fract.hxx> #include <vcl/metaact.hxx> #include <vcl/virdev.hxx> diff --git a/svx/source/svdraw/svdpdf.hxx b/svx/source/svdraw/svdpdf.hxx index 70b5a44e4ddf..b7ff8beb7d71 100644 --- a/svx/source/svdraw/svdpdf.hxx +++ b/svx/source/svdraw/svdpdf.hxx @@ -28,13 +28,10 @@ #include <memory> #include <sstream> -#include <tools/contnr.hxx> #include <tools/fract.hxx> -#include <vcl/metaact.hxx> #include <vcl/virdev.hxx> #include <svx/svdobj.hxx> #include <svx/xdash.hxx> -#include <com/sun/star/uno/Sequence.hxx> // Prevent workdir/UnpackedTarball/pdfium/public/fpdfview.h from including windows.h in a way that // it will define e.g. Yield as a macro: diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 77c91a0db481..1b0fbc5cc246 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -24,6 +24,7 @@ #include <utility> #include "accessiblecell.hxx" +#include <cell.hxx> #include <svx/DescriptionGenerator.hxx> diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index e3fc510dbfcd..ca908ea2d2c8 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -22,10 +22,6 @@ #include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/accessibility/XAccessibleExtendedComponent.hpp> -#include <com/sun/star/accessibility/AccessibleRole.hpp> -#include <com/sun/star/drawing/XShape.hpp> - -#include <rtl/ref.hxx> #include <editeng/AccessibleContextBase.hxx> #include <editeng/AccessibleComponentBase.hxx> @@ -36,7 +32,7 @@ #include <cppuhelper/implbase.hxx> -#include <cell.hxx> +#include <celltypes.hxx> namespace accessibility diff --git a/svx/source/table/accessibletableshape.cxx b/svx/source/table/accessibletableshape.cxx index bab37ae9ffc5..38b8ff5b03b0 100644 --- a/svx/source/table/accessibletableshape.cxx +++ b/svx/source/table/accessibletableshape.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/table/XMergeableCell.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> +#include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <comphelper/accessiblewrapper.hxx> @@ -29,6 +30,7 @@ #include <AccessibleTableShape.hxx> #include <svx/sdr/table/tablecontroller.hxx> #include "accessiblecell.hxx" +#include <cell.hxx> #include <algorithm> #include <unordered_map> diff --git a/svx/source/table/propertyset.hxx b/svx/source/table/propertyset.hxx index d04bd858a6a5..539beff0775a 100644 --- a/svx/source/table/propertyset.hxx +++ b/svx/source/table/propertyset.hxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/beans/XFastPropertySet.hpp> #include <rtl/ref.hxx> -#include <functional> #include <unordered_map> #include <vector> diff --git a/svx/source/table/tablecolumn.cxx b/svx/source/table/tablecolumn.cxx index 016746a1eea9..d9e33db47525 100644 --- a/svx/source/table/tablecolumn.cxx +++ b/svx/source/table/tablecolumn.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <tablemodel.hxx> #include "tablecolumn.hxx" #include "tableundo.hxx" #include <svx/svdmodel.hxx> diff --git a/svx/source/table/tablecolumn.hxx b/svx/source/table/tablecolumn.hxx index 691bb69b4593..2a1441379eac 100644 --- a/svx/source/table/tablecolumn.hxx +++ b/svx/source/table/tablecolumn.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include "propertyset.hxx" -#include <tablemodel.hxx> +#include <celltypes.hxx> namespace sdr { namespace table { diff --git a/svx/source/table/tablecolumns.cxx b/svx/source/table/tablecolumns.cxx index 1b033c14eae0..a9a37e5ef426 100644 --- a/svx/source/table/tablecolumns.cxx +++ b/svx/source/table/tablecolumns.cxx @@ -21,6 +21,7 @@ #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> +#include <tablemodel.hxx> #include "tablecolumns.hxx" #include "tablecolumn.hxx" diff --git a/svx/source/table/tablecolumns.hxx b/svx/source/table/tablecolumns.hxx index 97d77d3e9054..8780adf84a36 100644 --- a/svx/source/table/tablecolumns.hxx +++ b/svx/source/table/tablecolumns.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/table/XTableColumns.hpp> #include <cppuhelper/implbase1.hxx> -#include <tablemodel.hxx> +#include <celltypes.hxx> namespace sdr { namespace table { diff --git a/svx/source/table/tablehandles.hxx b/svx/source/table/tablehandles.hxx index 1e651bc47533..f7d69fab07a1 100644 --- a/svx/source/table/tablehandles.hxx +++ b/svx/source/table/tablehandles.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_TABLE_TABLEHANDLES_HXX #define INCLUDED_SVX_SOURCE_TABLE_TABLEHANDLES_HXX -#include <svx/sdr/overlay/overlayobject.hxx> - #include <svx/svdhdl.hxx> diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index ba402b262ea0..7978f6913619 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -20,16 +20,13 @@ #ifndef INCLUDED_SVX_SOURCE_TABLE_TABLELAYOUTER_HXX #define INCLUDED_SVX_SOURCE_TABLE_TABLELAYOUTER_HXX -#include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/text/WritingMode.hpp> -#include <com/sun/star/table/XTable.hpp> #include <sal/types.h> #include <basegfx/range/b2irectangle.hxx> #include <basegfx/tuple/b2ituple.hxx> #include <vector> -#include <map> #include <svx/svdotable.hxx> +#include <celltypes.hxx> namespace tools { class Rectangle; } diff --git a/svx/source/table/tablerow.hxx b/svx/source/table/tablerow.hxx index 5c14452831b1..bc4608f07013 100644 --- a/svx/source/table/tablerow.hxx +++ b/svx/source/table/tablerow.hxx @@ -25,7 +25,7 @@ #include <cppuhelper/implbase.hxx> #include "propertyset.hxx" -#include <tablemodel.hxx> +#include <celltypes.hxx> namespace sdr { namespace table { diff --git a/svx/source/table/tablerows.hxx b/svx/source/table/tablerows.hxx index f2d5ca571271..12ac433742eb 100644 --- a/svx/source/table/tablerows.hxx +++ b/svx/source/table/tablerows.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/table/XTableRows.hpp> #include <cppuhelper/implbase1.hxx> -#include <tablemodel.hxx> +#include <celltypes.hxx> namespace sdr { namespace table { diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 33231cdca451..72968311747f 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SOURCE_TABLE_TABLEUNDO_HXX #include <com/sun/star/container/XIndexAccess.hpp> -#include <com/sun/star/table/CellContentType.hpp> #include <svx/svdotable.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/tbxctrls/extrusioncontrols.hxx b/svx/source/tbxctrls/extrusioncontrols.hxx index a081fad87a91..4804c56459c5 100644 --- a/svx/source/tbxctrls/extrusioncontrols.hxx +++ b/svx/source/tbxctrls/extrusioncontrols.hxx @@ -19,11 +19,8 @@ #ifndef INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX #define INCLUDED_SVX_SOURCE_TBXCTRLS_EXTRUSIONCONTROLS_HXX -#include <svx/svxdllapi.h> - #include <svtools/toolbarmenu.hxx> #include <svtools/popupwindowcontroller.hxx> -#include <svtools/popupmenucontrollerbase.hxx> class ValueSet; diff --git a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx index 8407b084dbdc..f9df85210fbe 100644 --- a/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx +++ b/svx/source/unodialogs/textconversiondlgs/chinese_translation_unodialog.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX #define INCLUDED_SVX_SOURCE_UNODIALOGS_TEXTCONVERSIONDLGS_CHINESE_TRANSLATION_UNODIALOG_HXX -#include <cppuhelper/component.hxx> #include <com/sun/star/awt/XWindow.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -29,7 +28,6 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/implbase.hxx> #include <comphelper/interfacecontainer2.hxx> -#include <vcl/vclptr.hxx> namespace textconversiondlgs diff --git a/svx/source/unodraw/UnoNameItemTable.hxx b/svx/source/unodraw/UnoNameItemTable.hxx index 05faef9017f2..db4a643d1a14 100644 --- a/svx/source/unodraw/UnoNameItemTable.hxx +++ b/svx/source/unodraw/UnoNameItemTable.hxx @@ -30,8 +30,6 @@ #include <svl/lstner.hxx> #include <svx/xit.hxx> -#include <svx/xdef.hxx> - class SdrModel; class SfxItemPool; class SfxItemSet; diff --git a/svx/source/unodraw/gluepts.hxx b/svx/source/unodraw/gluepts.hxx index 45397037aa39..1f0f02b489b4 100644 --- a/svx/source/unodraw/gluepts.hxx +++ b/svx/source/unodraw/gluepts.hxx @@ -23,7 +23,6 @@ #include <sal/config.h> #include <com/sun/star/uno/Reference.hxx> -#include <sal/types.h> namespace com { namespace sun { namespace star { namespace uno { class XInterface; |