diff options
167 files changed, 206 insertions, 71 deletions
diff --git a/basctl/sdi/basslots.hrc b/basctl/sdi/basslots.hrc index 3056ec844a14..b6ec31a2ccfe 100644 --- a/basctl/sdi/basslots.hrc +++ b/basctl/sdi/basslots.hrc @@ -18,6 +18,7 @@ */ #include <svx/svxids.hrc> +#include <svx/unomid.hxx> #include <editeng/memberids.h> /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index cd2501caa255..82f30d30b1c2 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -45,7 +45,9 @@ #include <svl/itempool.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svxids.hrc> +#include <svx/svdpagv.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <vcl/print.hxx> #include <vcl/svapp.hxx> #include <xmlscript/xml_helper.hxx> #include <xmlscript/xmldlg_imexp.hxx> diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index e53075bb1801..32ad92c98692 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -44,6 +44,7 @@ #include <com/sun/star/table/CellAddress.hpp> #include <cppuhelper/exc_hlp.hxx> #include <o3tl/functional.hxx> +#include <svx/svdpagv.hxx> #include <unotools/sharedunocomponent.hxx> #include <vcl/svapp.hxx> #include <tools/debug.hxx> diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index fa253a6830e3..0676134808e0 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -23,6 +23,7 @@ #include <PropertyHelper.hxx> #include <CommonConverters.hxx> #include <editeng/memberids.h> +#include <svx/unomid.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> #include <svx/xbtmpit.hxx> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index 938c4a777f97..819800c00016 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -71,6 +71,7 @@ #include <LibreOfficeKit/LibreOfficeKitEnums.h> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> +#include <sal/log.hxx> #include <memory> diff --git a/chart2/source/controller/sidebar/ChartLinePanel.cxx b/chart2/source/controller/sidebar/ChartLinePanel.cxx index 8f923bc04103..8310a7a44707 100644 --- a/chart2/source/controller/sidebar/ChartLinePanel.cxx +++ b/chart2/source/controller/sidebar/ChartLinePanel.cxx @@ -12,6 +12,7 @@ #include <PropertyHelper.hxx> #include <ChartController.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlinjoit.hxx> #include <svx/xlndsit.hxx> diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx index 5341f3cd7734..31d8836e45dc 100644 --- a/filter/source/msfilter/msdffimp.cxx +++ b/filter/source/msfilter/msdffimp.cxx @@ -99,6 +99,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdopath.hxx> #include <svx/xlntrit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> @@ -122,6 +123,7 @@ #include <svx/extrud3d.hxx> #include <svx/svditer.hxx> #include <svx/xpoly.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlncapit.hxx> #include <svx/xlinjoit.hxx> #include <svx/xlndsit.hxx> diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index 71fbe72b2f52..5ca81d61f269 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -54,6 +54,7 @@ #include <svx/svdocirc.hxx> #include <svx/svdocapt.hxx> #include <svx/svdotable.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflbstit.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflclit.hxx> @@ -66,6 +67,7 @@ #include <svx/sdtditm.hxx> #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdetc.hxx> @@ -95,6 +97,7 @@ #include <editeng/ulspitem.hxx> #include <editeng/lrspitem.hxx> #include <editeng/numitem.hxx> +#include <vcl/gdimtf.hxx> #include <vcl/metric.hxx> #include <vcl/bitmapaccess.hxx> #include <svx/svditer.hxx> diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx index a674456be182..92c344485e94 100644 --- a/filter/source/svg/svgexport.cxx +++ b/filter/source/svg/svgexport.cxx @@ -40,6 +40,7 @@ #include <svx/unoshape.hxx> #include <svx/svdpage.hxx> #include <svx/svdoutl.hxx> +#include <svx/xfillit0.hxx> #include <editeng/outliner.hxx> #include <editeng/flditem.hxx> #include <editeng/numitem.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 4cc5e4663bd7..850067c0d93a 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -980,3 +980,12 @@ blacklist: include/svx/measctrl.hxx: # Needed for template class - svx/svdobj.hxx + include/svx/svddef.hxx: + # Used in macro definition + - svl/typedwhich.hxx + include/svx/svxerr.hxx: + # Used in macro definition + - vcl/errcode.hxx + include/svx/svxids.hrc: + # Used in macro definition + - svl/typedwhich.hxx diff --git a/include/svx/SvxNumOptionsTabPageHelper.hxx b/include/svx/SvxNumOptionsTabPageHelper.hxx index ada89f794840..eebb5be9da85 100644 --- a/include/svx/SvxNumOptionsTabPageHelper.hxx +++ b/include/svx/SvxNumOptionsTabPageHelper.hxx @@ -20,8 +20,7 @@ #ifndef INCLUDED_SVX_SVXNUMOPTIONSTABPAGEHELPER_HXX #define INCLUDED_SVX_SVXNUMOPTIONSTABPAGEHELPER_HXX -#include <com/sun/star/text/DefaultNumberingProvider.hpp> -#include <com/sun/star/text/XNumberingTypeInfo.hpp> +#include <com/sun/star/text/XDefaultNumberingProvider.hpp> #include <vcl/lstbox.hxx> #include <vcl/weld.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/SvxPresetListBox.hxx b/include/svx/SvxPresetListBox.hxx index f580ebac04fb..4f6f251f48df 100644 --- a/include/svx/SvxPresetListBox.hxx +++ b/include/svx/SvxPresetListBox.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_SVX_SVXPRESETLISTBOX_HXX #define INCLUDED_SVX_SVXPRESETLISTBOX_HXX -#include <svtools/svtdllapi.h> -#include <svx/XPropertyTable.hxx> -#include <vcl/ctrl.hxx> #include <svtools/valueset.hxx> #include <svx/xtable.hxx> #include <tools/gen.hxx> diff --git a/include/svx/SvxShapeTypes.hxx b/include/svx/SvxShapeTypes.hxx index 6af2a822dcdc..65bfa0414927 100644 --- a/include/svx/SvxShapeTypes.hxx +++ b/include/svx/SvxShapeTypes.hxx @@ -20,9 +20,6 @@ #ifndef INCLUDED_SVX_SVXSHAPETYPES_HXX #define INCLUDED_SVX_SVXSHAPETYPES_HXX -#include <svx/ShapeTypeHandler.hxx> -#include <com/sun/star/accessibility/XAccessible.hpp> - namespace accessibility { /** Register the SVX draw shape types with the ShapeTypeHandler singleton. diff --git a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx index e7c39c061f99..9a822d8fbd33 100644 --- a/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx +++ b/include/svx/sdr/contact/objectcontactofobjlistpainter.hxx @@ -23,6 +23,7 @@ #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svxdllapi.h> #include <svx/svdpage.hxx> +#include <tools/weakbase.hxx> class SdrPage; class SdrObject; diff --git a/include/svx/srchdlg.hxx b/include/svx/srchdlg.hxx index 3d19b6e7cae5..94578d9b0f76 100644 --- a/include/svx/srchdlg.hxx +++ b/include/svx/srchdlg.hxx @@ -22,7 +22,6 @@ #include <sfx2/childwin.hxx> #include <sfx2/basedlgs.hxx> #include <svl/srchdefs.hxx> -#include <svl/itempool.hxx> #include <svx/svxdllapi.h> #include <memory> #include <vector> diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 94d3db0240ee..895fc9d95789 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -20,12 +20,10 @@ #ifndef INCLUDED_SVX_SVDETC_HXX #define INCLUDED_SVX_SVDETC_HXX -#include <rtl/ustring.hxx> #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> #include <tools/link.hxx> #include <tools/fract.hxx> -#include <vcl/outdev.hxx> #include <svx/svdobj.hxx> #include <memory> diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index a8e77e4ed285..6a787f608b55 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -23,12 +23,8 @@ #include <tools/gen.hxx> #include <vcl/graph.hxx> -#include <svl/solar.hrc> - -#include <svx/xpoly.hxx> #include <svx/svdoedge.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <svx/sdgcpitm.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/svxdllapi.h> #include <deque> @@ -39,6 +35,7 @@ class SdrMarkView; class SdrObject; class SdrPageView; class MouseEvent; +class HelpEvent; namespace sdr { namespace contact { class ObjectContact; diff --git a/include/svx/svditer.hxx b/include/svx/svditer.hxx index 6dc84ef9f254..6f64ccb31677 100644 --- a/include/svx/svditer.hxx +++ b/include/svx/svditer.hxx @@ -22,7 +22,6 @@ #include <vector> -#include <sal/types.h> #include <svx/svxdllapi.h> class SdrObjList; diff --git a/include/svx/svdlayer.hxx b/include/svx/svdlayer.hxx index 491dcd253bf1..e49e079c82c9 100644 --- a/include/svx/svdlayer.hxx +++ b/include/svx/svdlayer.hxx @@ -23,7 +23,6 @@ #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> #include <svx/svxdllapi.h> -#include <algorithm> #include <memory> #include <vector> diff --git a/include/svx/svdmark.hxx b/include/svx/svdmark.hxx index 4b901f6ab2ad..1c0dd2af670a 100644 --- a/include/svx/svdmark.hxx +++ b/include/svx/svdmark.hxx @@ -23,7 +23,6 @@ #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> #include <svx/sdrobjectuser.hxx> -#include <tools/solar.h> #include <memory> #include <set> diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx index e2dc48461c78..f5a16bd7ec2f 100644 --- a/include/svx/svdmodel.hxx +++ b/include/svx/svdmodel.hxx @@ -23,25 +23,18 @@ #include <functional> #include <memory> #include <com/sun/star/uno/Sequence.hxx> -#include <cppuhelper/weakref.hxx> #include <editeng/forbiddencharacterstable.hxx> #include <editeng/outliner.hxx> #include <rtl/ustring.hxx> -#include <tools/link.hxx> -#include <tools/weakbase.hxx> -#include <vcl/mapmod.hxx> +#include <tools/weakbase.h> #include <svl/SfxBroadcaster.hxx> -#include <tools/datetime.hxx> +#include <tools/fldunit.hxx> #include <tools/fract.hxx> #include <svl/hint.hxx> -#include <o3tl/typed_flags_set.hxx> #include <o3tl/enumarray.hxx> #include <svl/style.hxx> #include <svx/xtable.hxx> -#include <svx/pageitem.hxx> -#include <vcl/field.hxx> -#include <LibreOfficeKit/LibreOfficeKitTypes.h> class OutputDevice; #include <svx/svdtypes.hxx> diff --git a/include/svx/svdoattr.hxx b/include/svx/svdoattr.hxx index bfab6084fcc2..706a3e272b17 100644 --- a/include/svx/svdoattr.hxx +++ b/include/svx/svdoattr.hxx @@ -20,10 +20,6 @@ #ifndef INCLUDED_SVX_SVDOATTR_HXX #define INCLUDED_SVX_SVDOATTR_HXX -#include <svx/xfillit0.hxx> -#include <svx/xflasit.hxx> -#include <svx/xlineit0.hxx> -#include <svx/xlnasit.hxx> #include <svx/svdobj.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 0d2d836f8efc..901d6b1caed1 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -25,21 +25,17 @@ #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> #include <vcl/outdev.hxx> -#include <vcl/vclptr.hxx> #include <svl/lstner.hxx> #include <svl/poolitem.hxx> #include <svl/typedwhich.hxx> #include <svx/svdtypes.hxx> -#include <svx/xenum.hxx> #include <svx/svxdllapi.h> #include <svx/shapeproperty.hxx> #include <tools/link.hxx> -#include <tools/weakbase.hxx> -#include <tools/mapunit.hxx> +#include <tools/weakbase.h> #include <tools/gen.hxx> #include <osl/diagnose.h> #include <typeinfo> -#include <functional> class SfxBroadcaster; class AutoTimer; diff --git a/include/svx/svdopath.hxx b/include/svx/svdopath.hxx index cace0f3764f6..2e7671a6818d 100644 --- a/include/svx/svdopath.hxx +++ b/include/svx/svdopath.hxx @@ -21,9 +21,7 @@ #define INCLUDED_SVX_SVDOPATH_HXX #include <svx/svdotext.hxx> -#include <svx/xpoly.hxx> #include <svx/svxdllapi.h> -#include <basegfx/vector/b2enums.hxx> #include <memory> class ImpPathForDragAndCreate; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 218fe94e8185..f76ab2dc4108 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SVDOTEXT_HXX #define INCLUDED_SVX_SVDOTEXT_HXX -#include <vcl/field.hxx> #include <svx/itextprovider.hxx> #include <svx/svdoattr.hxx> #include <svx/sdtaitm.hxx> @@ -29,12 +28,9 @@ #include <svx/svdtrans.hxx> #include <tools/datetime.hxx> #include <svl/style.hxx> -#include <svx/xtextit0.hxx> #include <svx/svdtext.hxx> #include <svx/svxdllapi.h> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <svx/svdpagv.hxx> -#include <rtl/ref.hxx> #include <memory> #include <vector> diff --git a/include/svx/svdoutl.hxx b/include/svx/svdoutl.hxx index 8fa51167a113..7655dee739b7 100644 --- a/include/svx/svdoutl.hxx +++ b/include/svx/svdoutl.hxx @@ -22,7 +22,7 @@ #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> -#include <svx/svdobj.hxx> +#include <tools/weakbase.h> class SdrTextObj; class SdrPage; diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx index d23957dcd906..b1a93c31e21f 100644 --- a/include/svx/svdpage.hxx +++ b/include/svx/svdpage.hxx @@ -21,14 +21,9 @@ #define INCLUDED_SVX_SVDPAGE_HXX #include <svl/stylesheetuser.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/print.hxx> -#include <vcl/gdimtf.hxx> -#include <tools/weakbase.hxx> -#include <tools/contnr.hxx> -#include <cppuhelper/weakref.hxx> +#include <vcl/prntypes.hxx> +#include <tools/weakbase.h> #include <svl/itemset.hxx> -#include <svx/svdtypes.hxx> #include <svx/sdrpageuser.hxx> #include <svx/sdr/contact/viewobjectcontactredirector.hxx> #include <svx/sdrmasterpagedescriptor.hxx> diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index ea376dc8c035..79e5bbef684a 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -23,7 +23,6 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <rtl/ustring.hxx> #include <tools/color.hxx> -#include <svl/lstner.hxx> #include <svx/svdhlpln.hxx> #include <svx/svdsob.hxx> #include <svx/svdtypes.hxx> @@ -31,7 +30,6 @@ #include <memory> #include <vector> -#include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/b2irectangle.hxx> diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index ce62413bc7c5..2267936d64db 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -27,7 +27,6 @@ #include <svx/svdlayer.hxx> #include <vcl/window.hxx> #include <svtools/colorcfg.hxx> -#include <com/sun/star/awt/XControlContainer.hpp> #include <svl/itemset.hxx> #include <vcl/timer.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/svdpool.hxx b/include/svx/svdpool.hxx index da8c241831d9..13c5fddd31d7 100644 --- a/include/svx/svdpool.hxx +++ b/include/svx/svdpool.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_SVDPOOL_HXX #include <svx/xpool.hxx> -#include <svx/svddef.hxx> #include <svx/svxdllapi.h> class XLineAttrSetItem; diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index c10f9f8fc2f0..e3365c1baaa2 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -21,14 +21,13 @@ #define INCLUDED_SVX_SVDTRANS_HXX #include <rtl/ustring.hxx> -#include <sal/log.hxx> #include <svx/svxdllapi.h> +#include <tools/fldunit.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> #include <tools/helpers.hxx> +#include <tools/mapunit.hxx> #include <tools/poly.hxx> -#include <vcl/field.hxx> -#include <vcl/mapmod.hxx> // The DrawingEngine's angles are specified in 1/100th degrees // We need to convert these angles to radians, in order to be able diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx index 39f514d0f7ab..f368b118917b 100644 --- a/include/svx/svdundo.hxx +++ b/include/svx/svdundo.hxx @@ -25,7 +25,6 @@ #include <memory> #include <vector> -#include <svl/solar.hrc> #include <svl/undo.hxx> #include <svl/style.hxx> #include <tools/gen.hxx> diff --git a/include/svx/svdview.hxx b/include/svx/svdview.hxx index 4b145931896c..6712c79fafc0 100644 --- a/include/svx/svdview.hxx +++ b/include/svx/svdview.hxx @@ -23,14 +23,13 @@ // HACK to avoid too deep includes and to have some // levels free in svdmark itself (MS compiler include depth limit) #include <svx/svdhdl.hxx> -#include <tools/weakbase.hxx> +#include <tools/weakbase.h> #include <svtools/accessibilityoptions.hxx> #include <svx/svxdllapi.h> #include <svx/svdcrtv.hxx> #include <vcl/event.hxx> #include <unotools/options.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> // class hierarchy of View: // SfxListener diff --git a/include/svx/svdviter.hxx b/include/svx/svdviter.hxx index 125a4c5e6180..1343de7c3931 100644 --- a/include/svx/svdviter.hxx +++ b/include/svx/svdviter.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_SVDVITER_HXX #define INCLUDED_SVX_SVDVITER_HXX -#include <sal/types.h> #include <svx/svxdllapi.h> /* diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx index 58acee4b86a1..e5307196038c 100644 --- a/include/svx/svxdlg.hxx +++ b/include/svx/svxdlg.hxx @@ -25,7 +25,6 @@ #include <editeng/edtdlg.hxx> #include <svx/dstribut_enum.hxx> -#include <svx/rectenum.hxx> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> #include <svx/svxdllapi.h> diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc index ac2fadfb611c..b5cbbab79d47 100644 --- a/include/svx/svxids.hrc +++ b/include/svx/svxids.hrc @@ -19,11 +19,9 @@ #ifndef INCLUDED_SVX_SVXIDS_HRC #define INCLUDED_SVX_SVXIDS_HRC -#include <svl/memberid.h> #include <svl/solar.hrc> #include <sfx2/sfxsids.hrc> #include <editeng/editids.hrc> -#include <svx/unomid.hxx> #include <svl/typedwhich.hxx> class SfxInt32Item; @@ -53,6 +51,7 @@ class SvxLineEndListItem; class SvxLineItem; class SvxBoxInfoItem; class SfxStringItem; +class SvxSetItem; // member IDs diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx index 0437831781ca..ab945321a59f 100644 --- a/include/svx/swframeexample.hxx +++ b/include/svx/swframeexample.hxx @@ -24,7 +24,6 @@ #include <svx/svxdllapi.h> #include <svx/swframetypes.hxx> #include <vcl/customweld.hxx> -#include <vcl/window.hxx> #include <com/sun/star/text/WrapTextMode.hpp> class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController diff --git a/include/svx/swframeposstrings.hxx b/include/svx/swframeposstrings.hxx index 0a52979a0219..c0ef3a3520d0 100644 --- a/include/svx/swframeposstrings.hxx +++ b/include/svx/swframeposstrings.hxx @@ -21,7 +21,6 @@ #include <rtl/ustring.hxx> #include <svx/svxdllapi.h> -#include <memory> /* contains strings needed for positioning dialogs diff --git a/include/svx/swframevalidation.hxx b/include/svx/swframevalidation.hxx index 09836db8ede1..049fce9afac1 100644 --- a/include/svx/swframevalidation.hxx +++ b/include/svx/swframevalidation.hxx @@ -21,7 +21,6 @@ #include <sal/types.h> #include <tools/gen.hxx> -#include <limits.h> #include <svx/swframetypes.hxx> /* diff --git a/include/svx/sxcaitm.hxx b/include/svx/sxcaitm.hxx index 5692faed0e97..adfa16afe517 100644 --- a/include/svx/sxcaitm.hxx +++ b/include/svx/sxcaitm.hxx @@ -22,7 +22,6 @@ #include <svx/svddef.hxx> #include <svx/sdangitm.hxx> -#include <svx/sdooitm.hxx> // SDRATTR_CAPTIONFIXEDANGLE SdrOnOffItem: // sal_True=angle predefined by SdrCaptionAngleItem diff --git a/include/svx/sxelditm.hxx b/include/svx/sxelditm.hxx index c2ecfa5d8248..445f00214033 100644 --- a/include/svx/sxelditm.hxx +++ b/include/svx/sxelditm.hxx @@ -21,7 +21,6 @@ #include <svx/svddef.hxx> #include <svx/sdmetitm.hxx> -#include <svx/svxdllapi.h> class SdrEdgeLineDeltaCountItem: public SfxUInt16Item { public: diff --git a/include/svx/sxmuitm.hxx b/include/svx/sxmuitm.hxx index 52c6e826be28..f05de22226b5 100644 --- a/include/svx/sxmuitm.hxx +++ b/include/svx/sxmuitm.hxx @@ -19,10 +19,10 @@ #ifndef INCLUDED_SVX_SXMUITM_HXX #define INCLUDED_SVX_SXMUITM_HXX -#include <vcl/field.hxx> #include <svx/svddef.hxx> #include <svl/eitem.hxx> #include <svx/svxdllapi.h> +#include <tools/fldunit.hxx> // specification of the unit if measurement. The numerical quantity value is converted in this unity. // (based on the facts of the MapUnit of the model). This unity is displayed if necessary. diff --git a/include/svx/transfrmhelper.hxx b/include/svx/transfrmhelper.hxx index ddc542c8a533..0fe92067884c 100644 --- a/include/svx/transfrmhelper.hxx +++ b/include/svx/transfrmhelper.hxx @@ -23,6 +23,7 @@ #include <basegfx/range/b2drange.hxx> #include <tools/fldunit.hxx> #include <tools/mapunit.hxx> +#include <vcl/field.hxx> class SVX_DLLPUBLIC TransfrmHelper { diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx index 8c19ce84e869..6e19aa77841f 100644 --- a/oox/source/drawingml/shape.cxx +++ b/oox/source/drawingml/shape.cxx @@ -95,6 +95,7 @@ #include <vcl/wmfexternal.hxx> #include <sal/log.hxx> #include <svx/unoshape.hxx> +#include <svx/xfillit0.hxx> #include <vcl/wmf.hxx> diff --git a/oox/source/shape/WpsContext.cxx b/oox/source/shape/WpsContext.cxx index 0692ea43777d..132143685c90 100644 --- a/oox/source/shape/WpsContext.cxx +++ b/oox/source/shape/WpsContext.cxx @@ -9,6 +9,7 @@ #include "WpsContext.hxx" #include <basegfx/matrix/b2dhommatrix.hxx> +#include <basegfx/tuple/b2dtuple.hxx> #include <comphelper/sequenceashashmap.hxx> #include <drawingml/customshapeproperties.hxx> #include <drawingml/shapepropertiescontext.hxx> diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx index c12b8b9025c5..27d7b51959ca 100644 --- a/oox/source/vml/vmlshape.cxx +++ b/oox/source/vml/vmlshape.cxx @@ -73,6 +73,7 @@ #include <svx/unoapi.hxx> #include <svx/svdoashp.hxx> #include <svx/sdtagitm.hxx> +#include <svx/xfillit0.hxx> #include <comphelper/sequence.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> diff --git a/reportdesign/source/core/sdr/UndoEnv.cxx b/reportdesign/source/core/sdr/UndoEnv.cxx index c55bf8b5210f..a4abf09b6e58 100644 --- a/reportdesign/source/core/sdr/UndoEnv.cxx +++ b/reportdesign/source/core/sdr/UndoEnv.cxx @@ -45,6 +45,8 @@ #include <svx/unoshape.hxx> #include <osl/mutex.hxx> +#include <unordered_map> + namespace rptui { using namespace ::com::sun::star; diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx index 220e913b2d09..29f121965569 100644 --- a/reportdesign/source/ui/misc/UITools.cxx +++ b/reportdesign/source/ui/misc/UITools.cxx @@ -74,6 +74,7 @@ #include <svx/svdview.hxx> #include <svx/svdpage.hxx> #include <svx/svxdlg.hxx> +#include <svx/unomid.hxx> #include <svx/unoprov.hxx> #include <unotools/pathoptions.hxx> diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index 315061709c5e..42ab6c415021 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -84,7 +84,9 @@ #include <editeng/memberids.h> #include <svx/svxids.hrc> #include <svx/svdobj.hxx> +#include <svx/unomid.hxx> #include <svx/dataaccessdescriptor.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> diff --git a/sc/sdi/scslots.hrc b/sc/sdi/scslots.hrc index 4697d1d17d38..4fc739b61fc5 100644 --- a/sc/sdi/scslots.hrc +++ b/sc/sdi/scslots.hrc @@ -18,6 +18,7 @@ */ #include <sfx2/sfxsids.hrc> #include <svx/svxids.hrc> +#include <svx/unomid.hxx> #include <editeng/editids.hrc> #include <editeng/memberids.h> #include <sc.hrc> diff --git a/sc/source/core/data/postit.cxx b/sc/source/core/data/postit.cxx index d2142f84747c..5b92edc04e4b 100644 --- a/sc/source/core/data/postit.cxx +++ b/sc/source/core/data/postit.cxx @@ -30,6 +30,7 @@ #include <basegfx/polygon/b2dpolygon.hxx> #include <scitems.hxx> +#include <svx/xfillit0.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnstcit.hxx> diff --git a/sc/source/filter/excel/xeescher.cxx b/sc/source/filter/excel/xeescher.cxx index 40cd9764ed6a..c1d139a629e3 100644 --- a/sc/source/filter/excel/xeescher.cxx +++ b/sc/source/filter/excel/xeescher.cxx @@ -59,6 +59,7 @@ #include <svx/unoapi.hxx> #include <svx/sdtaitm.hxx> #include <document.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <oox/token/tokens.hxx> diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx index 43c6fb3aa788..15fea088d3a2 100644 --- a/sc/source/filter/excel/xiescher.cxx +++ b/sc/source/filter/excel/xiescher.cxx @@ -45,6 +45,8 @@ #include <unotools/moduleoptions.hxx> #include <unotools/fltrcfg.hxx> #include <vcl/dibtools.hxx> +#include <vcl/gdimtf.hxx> +#include <vcl/window.hxx> #include <vcl/wmf.hxx> #include <comphelper/classids.hxx> #include <toolkit/helper/vclunohelper.hxx> @@ -86,6 +88,8 @@ #include <svx/xflclit.hxx> #include <sal/macros.h> #include <editeng/adjustitem.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlinjoit.hxx> #include <svx/xlntrit.hxx> #include <svx/xbtmpit.hxx> diff --git a/sc/source/ui/app/typemap.cxx b/sc/source/ui/app/typemap.cxx index 3a0f55977a00..bf40d09962b7 100644 --- a/sc/source/ui/app/typemap.cxx +++ b/sc/source/ui/app/typemap.cxx @@ -21,6 +21,7 @@ #include <mid.h> #include <editeng/memberids.h> +#include <svx/unomid.hxx> #include <sfx2/msg.hxx> #include <svl/slstitm.hxx> diff --git a/sc/source/ui/docshell/docsh3.cxx b/sc/source/ui/docshell/docsh3.cxx index 38363688641e..64fc29f7634a 100644 --- a/sc/source/ui/docshell/docsh3.cxx +++ b/sc/source/ui/docshell/docsh3.cxx @@ -30,6 +30,7 @@ #include <sfx2/app.hxx> #include <sfx2/docfile.hxx> #include <sfx2/printer.hxx> +#include <svx/pageitem.hxx> #include <svx/postattr.hxx> #include <svx/svxids.hrc> #include <unotools/misccfg.hxx> diff --git a/sc/source/ui/drawfunc/fuconcustomshape.cxx b/sc/source/ui/drawfunc/fuconcustomshape.cxx index 2459720c251a..6650456afa34 100644 --- a/sc/source/ui/drawfunc/fuconcustomshape.cxx +++ b/sc/source/ui/drawfunc/fuconcustomshape.cxx @@ -26,6 +26,7 @@ #include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> +#include <svx/xfillit0.hxx> #include <editeng/eeitem.hxx> #include <svx/sdtagitm.hxx> #include <tabvwsh.hxx> diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index 9b4355817bcc..e1f8a0ea06ea 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -23,6 +23,7 @@ #include <sfx2/basedlgs.hxx> #include <sfx2/sfxdlg.hxx> #include <svl/style.hxx> +#include <svx/pageitem.hxx> #include <vcl/svapp.hxx> #include <attrib.hxx> diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx index 8a7c786a9a3e..be8c28c0e646 100644 --- a/sc/source/ui/view/colrowba.cxx +++ b/sc/source/ui/view/colrowba.cxx @@ -18,6 +18,7 @@ */ #include <unotools/localedatawrapper.hxx> +#include <vcl/field.hxx> #include <colrowba.hxx> #include <document.hxx> diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx index f5d91a286dee..544644341a6b 100644 --- a/sc/source/ui/view/drawview.cxx +++ b/sc/source/ui/view/drawview.cxx @@ -27,6 +27,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdouno.hxx> #include <svx/svdpage.hxx> +#include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> #include <editeng/outlobj.hxx> @@ -35,6 +36,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/viewfrm.hxx> #include <svx/sdrundomanager.hxx> +#include <svx/xfillit0.hxx> #include <svx/xbtmpit.hxx> #include <comphelper/lok.hxx> #include <sfx2/lokhelper.hxx> diff --git a/sd/qa/unit/dialogs-test.cxx b/sd/qa/unit/dialogs-test.cxx index 05ab4168b181..d1d6e1518661 100644 --- a/sd/qa/unit/dialogs-test.cxx +++ b/sd/qa/unit/dialogs-test.cxx @@ -28,6 +28,7 @@ #include <editeng/colritem.hxx> #include <svx/svdtext.hxx> #include <svx/svdotext.hxx> +#include <svx/xfillit0.hxx> #include <vcl/sound.hxx> #include <vcl/svapp.hxx> diff --git a/sd/qa/unit/export-tests-ooxml1.cxx b/sd/qa/unit/export-tests-ooxml1.cxx index de601f968cdb..d45b58b89504 100644 --- a/sd/qa/unit/export-tests-ooxml1.cxx +++ b/sd/qa/unit/export-tests-ooxml1.cxx @@ -35,7 +35,9 @@ #include <svx/svdogrp.hxx> #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/sdooitm.hxx> #include <svx/sdmetitm.hxx> #include <animations/animationnodehelper.hxx> @@ -55,6 +57,7 @@ #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> +#include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/sd/qa/unit/export-tests-ooxml2.cxx b/sd/qa/unit/export-tests-ooxml2.cxx index 9c6cc27aa804..6bee011d6ada 100644 --- a/sd/qa/unit/export-tests-ooxml2.cxx +++ b/sd/qa/unit/export-tests-ooxml2.cxx @@ -56,6 +56,7 @@ #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp> #include <com/sun/star/chart2/data/XDataSequence.hpp> #include <com/sun/star/chart2/data/XNumericalDataSequence.hpp> +#include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/awt/FontDescriptor.hpp> #include <com/sun/star/graphic/XGraphic.hpp> diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx index 04ac4b474ab8..e251f3443382 100644 --- a/sd/qa/unit/import-tests.cxx +++ b/sd/qa/unit/import-tests.cxx @@ -37,6 +37,7 @@ #include <svx/svdomedia.hxx> #include <svx/svdoole2.hxx> #include <svx/svdotable.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> @@ -47,6 +48,8 @@ #include <animations/animationnodehelper.hxx> #include <sax/tools/converter.hxx> +#include <com/sun/star/awt/Gradient.hpp> +#include <com/sun/star/awt/XBitmap.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/document/XEventsSupplier.hpp> #include <com/sun/star/presentation/ClickAction.hpp> diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx index 5c6848dfb959..831c12b287e7 100644 --- a/sd/qa/unit/misc-tests.cxx +++ b/sd/qa/unit/misc-tests.cxx @@ -38,6 +38,7 @@ #include <sdmod.hxx> #include <svx/sdr/table/tablecontroller.hxx> #include <sfx2/request.hxx> +#include <svx/svdpagv.hxx> #include <svx/svxids.hrc> #include <editeng/eeitem.hxx> #include <editeng/adjustitem.hxx> diff --git a/sd/sdi/sdslots.hrc b/sd/sdi/sdslots.hrc index 969e8a64c7ec..64760097e378 100644 --- a/sd/sdi/sdslots.hrc +++ b/sd/sdi/sdslots.hrc @@ -20,6 +20,7 @@ #include <editeng/editids.hrc> #include <editeng/memberids.h> #include <svx/svxids.hrc> +#include <svx/unomid.hxx> #include <app.hrc> #include <sdattr.hrc> diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx index 1735104c4089..21875ad23078 100644 --- a/sd/source/core/sdpage.cxx +++ b/sd/source/core/sdpage.cxx @@ -48,6 +48,7 @@ #include <svx/sdtmfitm.hxx> #include <svx/sdtagitm.hxx> #include <svx/sdtcfitm.hxx> +#include <svx/xfillit0.hxx> #include <com/sun/star/animations/XAnimationNode.hpp> #include <com/sun/star/animations/XTimeContainer.hpp> #include <com/sun/star/container/XEnumerationAccess.hpp> diff --git a/sd/source/core/stlfamily.cxx b/sd/source/core/stlfamily.cxx index b47c130b27c2..5e5e2ac84b37 100644 --- a/sd/source/core/stlfamily.cxx +++ b/sd/source/core/stlfamily.cxx @@ -27,6 +27,7 @@ #include <svl/style.hxx> #include <tools/debug.hxx> +#include <tools/weakbase.hxx> #include <strings.hrc> #include <stlfamily.hxx> diff --git a/sd/source/core/typemap.cxx b/sd/source/core/typemap.cxx index 57e892184c2c..60392f6671c8 100644 --- a/sd/source/core/typemap.cxx +++ b/sd/source/core/typemap.cxx @@ -55,6 +55,7 @@ #include <editeng/lineitem.hxx> #include <svx/zoomslideritem.hxx> #include <editeng/memberids.h> +#include <svx/unomid.hxx> #include <svx/xftstit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlineit0.hxx> diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 92caecc4da3c..73a6bfc9dfaa 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -27,6 +27,7 @@ #include <svx/unoapi.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> +#include <svx/xfillit0.hxx> #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> #include <com/sun/star/office/XAnnotation.hpp> diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx index 793d26eabe88..a71561373925 100644 --- a/sd/source/filter/ppt/pptin.cxx +++ b/sd/source/filter/ppt/pptin.cxx @@ -36,6 +36,8 @@ #include <editeng/eeitem.hxx> #include <editeng/editeng.hxx> #include <svx/svdoutl.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <sfx2/docinf.hxx> diff --git a/sd/source/ui/animations/motionpathtag.cxx b/sd/source/ui/animations/motionpathtag.cxx index 2c0bb805e493..c6f6a2eade54 100644 --- a/sd/source/ui/animations/motionpathtag.cxx +++ b/sd/source/ui/animations/motionpathtag.cxx @@ -30,6 +30,8 @@ #include <svx/sdrpagewindow.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdopath.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnstit.hxx> diff --git a/sd/source/ui/dlg/PhotoAlbumDialog.cxx b/sd/source/ui/dlg/PhotoAlbumDialog.cxx index cd3918e3c07a..2a65ba448f01 100644 --- a/sd/source/ui/dlg/PhotoAlbumDialog.cxx +++ b/sd/source/ui/dlg/PhotoAlbumDialog.cxx @@ -25,6 +25,7 @@ #include <vcl/graphicfilter.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> +#include <svx/xfillit0.hxx> #include <svx/xfltrit.hxx> #include <svx/xflclit.hxx> #include <tools/diagnose_ex.h> diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx index 49f98e184bf3..f4c5b32d558b 100644 --- a/sd/source/ui/dlg/animobjs.cxx +++ b/sd/source/ui/dlg/animobjs.cxx @@ -22,6 +22,7 @@ #include <svl/intitem.hxx> #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> +#include <svx/svdpagv.hxx> #include <sfx2/dispatch.hxx> #include <sfx2/progress.hxx> #include <vcl/svapp.hxx> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 7d747ba8675e..8e176c294dc0 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -19,6 +19,7 @@ #include <copydlg.hxx> #include <svx/colorbox.hxx> +#include <svx/svdpagv.hxx> #include <sfx2/module.hxx> #include <svx/xcolit.hxx> #include <svl/intitem.hxx> diff --git a/sd/source/ui/dlg/dlgsnap.cxx b/sd/source/ui/dlg/dlgsnap.cxx index 001db4635141..db5328edb471 100644 --- a/sd/source/ui/dlg/dlgsnap.cxx +++ b/sd/source/ui/dlg/dlgsnap.cxx @@ -18,6 +18,7 @@ */ #include <svx/svxids.hrc> +#include <svx/svdpagv.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> #include <svl/aeitem.hxx> diff --git a/sd/source/ui/func/fucon3d.cxx b/sd/source/ui/func/fucon3d.cxx index d5ee31160b63..9385c5d97053 100644 --- a/sd/source/ui/func/fucon3d.cxx +++ b/sd/source/ui/func/fucon3d.cxx @@ -25,6 +25,7 @@ #include <sfx2/viewfrm.hxx> #include <tools/poly.hxx> +#include <svx/xlineit0.hxx> #include <svx/scene3d.hxx> #include <svx/sphere3d.hxx> #include <svx/cube3d.hxx> diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx index ee7f1d54f650..f10e2315f774 100644 --- a/sd/source/ui/func/fuconarc.cxx +++ b/sd/source/ui/func/fuconarc.cxx @@ -37,6 +37,7 @@ #include <ToolBarManager.hxx> #include <svx/sxciaitm.hxx> +#include <svx/xfillit0.hxx> using namespace com::sun::star; diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx index 0963f9e5de47..5d937e118279 100644 --- a/sd/source/ui/func/fuconrec.cxx +++ b/sd/source/ui/func/fuconrec.cxx @@ -26,6 +26,7 @@ #include <app.hrc> #include <svl/itemset.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedwit.hxx> #include <svx/xlnedit.hxx> diff --git a/sd/source/ui/func/fuexpand.cxx b/sd/source/ui/func/fuexpand.cxx index 3366028dd4d4..cc3e910f8819 100644 --- a/sd/source/ui/func/fuexpand.cxx +++ b/sd/source/ui/func/fuexpand.cxx @@ -21,6 +21,7 @@ #include <sfx2/viewfrm.hxx> #include <svx/svdotext.hxx> +#include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> #include <svx/svdundo.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/source/ui/func/fumorph.cxx b/sd/source/ui/func/fumorph.cxx index 0519633b9138..e97cf686e12f 100644 --- a/sd/source/ui/func/fumorph.cxx +++ b/sd/source/ui/func/fumorph.cxx @@ -18,6 +18,8 @@ */ #include <fumorph.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xflclit.hxx> diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/func/fupage.cxx index b410cacb0a1e..ac3512ad5165 100644 --- a/sd/source/ui/func/fupage.cxx +++ b/sd/source/ui/func/fupage.cxx @@ -22,6 +22,7 @@ // arrange Tab-Page #include <sfx2/sfxdlg.hxx> +#include <svx/pageitem.hxx> #include <svx/svxids.hrc> #include <svl/itempool.hxx> #include <sfx2/request.hxx> @@ -31,6 +32,7 @@ #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> #include <svx/graphichelper.hxx> +#include <svx/xfillit0.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflbstit.hxx> #include <svx/xflbmtit.hxx> diff --git a/sd/source/ui/func/fusumry.cxx b/sd/source/ui/func/fusumry.cxx index 2c7c8df8dc3f..f84dba0f65e3 100644 --- a/sd/source/ui/func/fusumry.cxx +++ b/sd/source/ui/func/fusumry.cxx @@ -21,6 +21,8 @@ #include <editeng/eeitem.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <editeng/outlobj.hxx> #include <xmloff/autolayout.hxx> diff --git a/sd/source/ui/sidebar/SlideBackground.cxx b/sd/source/ui/sidebar/SlideBackground.cxx index 12df05bfa0d9..488690f28e80 100644 --- a/sd/source/ui/sidebar/SlideBackground.cxx +++ b/sd/source/ui/sidebar/SlideBackground.cxx @@ -43,6 +43,7 @@ #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> @@ -51,6 +52,7 @@ #include <svx/xflgrit.hxx> #include <svx/rulritem.hxx> #include <svx/svxids.hrc> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xgrad.hxx> #include <svx/xbitmap.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 4686a879fecb..80cab80c199b 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -26,6 +26,7 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> #include <comphelper/interfacecontainer2.hxx> +#include <vcl/menu.hxx> #include <com/sun/star/presentation/ClickAction.hpp> #include <com/sun/star/presentation/XSlideShowListener.hpp> #include <com/sun/star/presentation/XSlideShowController.hpp> diff --git a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx index ee311d1c13e4..836082379d99 100644 --- a/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx +++ b/sd/source/ui/slidesorter/cache/SlsBitmapCache.cxx @@ -18,6 +18,7 @@ */ #include <memory> +#include <unordered_map> #include "SlsBitmapCache.hxx" #include "SlsCacheCompactor.hxx" #include "SlsBitmapCompressor.hxx" diff --git a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx index 3077acb40a19..1865fcdbeab2 100644 --- a/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx +++ b/sd/source/ui/slidesorter/cache/SlsPageCacheManager.cxx @@ -26,6 +26,7 @@ #include <deque> #include <map> #include <memory> +#include <unordered_map> namespace { diff --git a/sd/source/ui/unoidl/unopage.cxx b/sd/source/ui/unoidl/unopage.cxx index 55704fc9e252..fcc49edb09ed 100644 --- a/sd/source/ui/unoidl/unopage.cxx +++ b/sd/source/ui/unoidl/unopage.cxx @@ -58,6 +58,7 @@ #include <svx/svdoole2.hxx> #include <svx/svdpool.hxx> #include <svx/svdview.hxx> +#include <svx/xfillit0.hxx> #include <View.hxx> #include <DrawDocShell.hxx> #include <ViewShell.hxx> diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx index 682c92115360..a79faf8916c5 100644 --- a/sd/source/ui/view/DocumentRenderer.cxx +++ b/sd/source/ui/view/DocumentRenderer.cxx @@ -51,6 +51,8 @@ #include <svx/svditer.hxx> #include <svx/svdopage.hxx> #include <svx/svdopath.hxx> +#include <svx/svdpagv.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <toolkit/awt/vclxdevice.hxx> #include <unotools/localedatawrapper.hxx> diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx index fb89f6290d6f..1b1753d69373 100644 --- a/sd/source/ui/view/drtxtob1.cxx +++ b/sd/source/ui/view/drtxtob1.cxx @@ -47,6 +47,7 @@ #include <editeng/crossedoutitem.hxx> #include <editeng/contouritem.hxx> #include <editeng/shdditem.hxx> +#include <svx/svdpagv.hxx> #include <svx/xtable.hxx> #include <svx/svdobj.hxx> #include <editeng/outlobj.hxx> diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx index e3b46108068a..21884ee6a58e 100644 --- a/sd/source/ui/view/drviews7.cxx +++ b/sd/source/ui/view/drviews7.cxx @@ -29,6 +29,7 @@ #include <com/sun/star/linguistic2/XThesaurus.hpp> #include <svx/fmglob.hxx> #include <svx/globl3d.hxx> +#include <svx/pageitem.hxx> #include <svx/rulritem.hxx> #include <svx/svdouno.hxx> #include <editeng/eeitem.hxx> @@ -53,6 +54,7 @@ #include <svl/whiter.hxx> #include <sfx2/dispatch.hxx> #include <svx/svdograf.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> diff --git a/sd/source/ui/view/drviews9.cxx b/sd/source/ui/view/drviews9.cxx index 8b5b494595b8..48648a0d5189 100644 --- a/sd/source/ui/view/drviews9.cxx +++ b/sd/source/ui/view/drviews9.cxx @@ -24,6 +24,8 @@ #include <vcl/wrkwin.hxx> #include <svx/xgrad.hxx> #include <svx/svdpagv.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlndsit.hxx> #include <svx/xflhtit.hxx> diff --git a/sd/source/ui/view/drviewsi.cxx b/sd/source/ui/view/drviewsi.cxx index e3ca9c9177ed..cde60865c4b4 100644 --- a/sd/source/ui/view/drviewsi.cxx +++ b/sd/source/ui/view/drviewsi.cxx @@ -18,6 +18,7 @@ */ #include <DrawViewShell.hxx> +#include <svx/xfillit0.hxx> #include <svx/xtable.hxx> #include <sdattr.hxx> #include <svl/aeitem.hxx> diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 47930638bdbc..2a78f8f8a24a 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -50,6 +50,7 @@ #include <vcl/EnumContext.hxx> #include <svx/svdopage.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <svx/xfillit0.hxx> #include <svx/xlndsit.hxx> #include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx index 6f09074d2631..98167637628d 100644 --- a/sd/source/ui/view/sdview3.cxx +++ b/sd/source/ui/view/sdview3.cxx @@ -26,6 +26,7 @@ #include <unotools/pathoptions.hxx> #include <editeng/editdata.hxx> #include <svl/urlbmk.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/svdpagv.hxx> diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx index 899c56325b45..9d4bc87a1967 100644 --- a/sd/source/ui/view/sdview4.cxx +++ b/sd/source/ui/view/sdview4.cxx @@ -34,6 +34,7 @@ #include <svx/svdpagv.hxx> #include <svx/xbtmpit.hxx> #include <svx/svdundo.hxx> +#include <svx/xfillit0.hxx> #include <svx/xoutbmp.hxx> #include <svx/svdograf.hxx> #include <svx/svdomedia.hxx> diff --git a/sd/source/ui/view/sdview5.cxx b/sd/source/ui/view/sdview5.cxx index da608462db7e..5378b328499e 100644 --- a/sd/source/ui/view/sdview5.cxx +++ b/sd/source/ui/view/sdview5.cxx @@ -21,6 +21,8 @@ #include <View.hxx> #include <pres.hxx> +#include <svx/svdpagv.hxx> + namespace sd { static bool implIsMultiPresObj( PresObjKind eKind ) diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx index 74262f5cf04a..cd12eff979bb 100644 --- a/sd/source/ui/view/viewoverlaymanager.cxx +++ b/sd/source/ui/view/viewoverlaymanager.cxx @@ -37,6 +37,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <svx/svxids.hrc> +#include <svx/svdpagv.hxx> #include <view/viewoverlaymanager.hxx> diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f4c941cba5f5..f348ac5d86a9 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -123,6 +123,7 @@ #include <unotools/streamwrap.hxx> #include <svx/unoshape.hxx> +#include <svx/xlineit0.hxx> #include <com/sun/star/util/Color.hpp> #include <autoredactdialog.hxx> diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi index e8f6eebf593f..0697dd865994 100644 --- a/starmath/sdi/smslots.sdi +++ b/starmath/sdi/smslots.sdi @@ -24,6 +24,7 @@ StarMath SlotIdFile ( "editeng/editids.hrc" ) SlotIdFile ( "sfx2/sfxsids.hrc" ) SlotIdFile ( "svx/svxids.hrc" ) + SlotIdFile ( "svx/unomid.hxx" ) ] { include "sfxitems.sdi" diff --git a/svx/source/accessibility/SvxShapeTypes.cxx b/svx/source/accessibility/SvxShapeTypes.cxx index eb19e7be6a47..142a9d36b60c 100644 --- a/svx/source/accessibility/SvxShapeTypes.cxx +++ b/svx/source/accessibility/SvxShapeTypes.cxx @@ -23,6 +23,7 @@ #include <svx/AccessibleGraphicShape.hxx> #include <svx/AccessibleOLEShape.hxx> #include <svx/AccessibleControlShape.hxx> +#include <svx/ShapeTypeHandler.hxx> #include <AccessibleTableShape.hxx> namespace accessibility { diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 482650fdf9d0..22eb1cba2c53 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -34,6 +34,7 @@ #include <rtl/crc.h> #include <rtl/math.hxx> #include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnedit.hxx> #include <svx/xlnstwit.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index d34e2d130df9..fec339b5880c 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -28,6 +28,7 @@ #include <svl/poolitem.hxx> #include <svl/itemset.hxx> #include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xsflclit.hxx> #include <svx/xit.hxx> #include <svx/xbtmpit.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 20fc3065f3c2..811793458a16 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -47,6 +47,8 @@ #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/svditer.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <uno/mapping.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <com/sun/star/document/XActionLockable.hpp> diff --git a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx index cc1d1427efc0..044663638358 100644 --- a/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx +++ b/svx/source/dialog/SvxNumOptionsTabPageHelper.cxx @@ -19,6 +19,8 @@ #include <svx/SvxNumOptionsTabPageHelper.hxx> #include <com/sun/star/style/NumberingType.hpp> +#include <com/sun/star/text/DefaultNumberingProvider.hpp> +#include <com/sun/star/text/XNumberingTypeInfo.hpp> #include <comphelper/processfactory.hxx> using namespace css; diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index f8137f7dcd67..820a18918460 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -22,6 +22,7 @@ #include "contwnd.hxx" #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> +#include <svx/xfillit0.hxx> #include <svx/xfltrit.hxx> #include <svx/xflclit.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/dialog/dlgctl3d.cxx b/svx/source/dialog/dlgctl3d.cxx index 209729fd9ce3..56c3f424a34c 100644 --- a/svx/source/dialog/dlgctl3d.cxx +++ b/svx/source/dialog/dlgctl3d.cxx @@ -32,7 +32,9 @@ #include <svx/helperhittest3d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polygn3d.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <helpids.h> diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx index a19b8d2f11c2..4d38e526a1b6 100644 --- a/svx/source/dialog/dlgctrl.cxx +++ b/svx/source/dialog/dlgctrl.cxx @@ -22,6 +22,7 @@ #include <vcl/virdev.hxx> #include <vcl/event.hxx> #include <sfx2/dialoghelper.hxx> +#include <svx/xlineit0.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> #include <svx/strings.hrc> diff --git a/svx/source/dialog/dlgunit.hxx b/svx/source/dialog/dlgunit.hxx index 2af023651d32..aab743480728 100644 --- a/svx/source/dialog/dlgunit.hxx +++ b/svx/source/dialog/dlgunit.hxx @@ -21,6 +21,7 @@ #define INCLUDED_SVX_SOURCE_DIALOG_DLGUNIT_HXX #include <svx/svdtrans.hxx> +#include <vcl/field.hxx> inline OUString GetUnitString( long nVal_100, FieldUnit eFieldUnit, sal_Unicode cSep ) { diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 6f38f8871e60..211be0550022 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -33,6 +33,7 @@ #include <svx/xftshit.hxx> #include <svx/xftshcit.hxx> #include <svx/xftshxy.hxx> +#include <svx/xtextit0.hxx> #include <svx/dlgutil.hxx> diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 544becb46d82..d8a3fd24bd06 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -37,6 +37,7 @@ #include <svx/xfltrit.hxx> #include <svx/svdpagv.hxx> #include <svl/urihelper.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index 8bc13f62ec28..92408c9040d2 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -19,6 +19,7 @@ #include <svx/svxids.hrc> #include <svx/rulritem.hxx> +#include <svx/unomid.hxx> #include <tools/debug.hxx> #include <tools/mapunit.hxx> #include <osl/diagnose.h> diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 5975cdb9db43..8b0123c039cf 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -23,6 +23,7 @@ #include <vcl/builder.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> +#include <vcl/field.hxx> #include <vcl/image.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index c3bcb5736e1d..2d213a32a67d 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -19,6 +19,7 @@ #include <tools/poly.hxx> #include <vcl/metric.hxx> +#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <svtools/colorcfg.hxx> diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index a631659e452f..13d4488afc83 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -31,6 +31,7 @@ #include <svx/svdopath.hxx> #include <svx/svdmodel.hxx> #include <svx/svx3ditems.hxx> +#include <svx/xlineit0.hxx> #include <sdr/properties/e3dextrudeproperties.hxx> #include <sdr/contact/viewcontactofe3dextrude.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index d5a389e7eaf4..c449f1c3505d 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -28,7 +28,9 @@ #include <sfx2/viewsh.hxx> #include <svx/colorbox.hxx> #include <svx/f3dchild.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/svdmodel.hxx> #include <svx/globl3d.hxx> #include <svx/view3d.hxx> diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index 8773b91b5a22..bc5bbd32fce2 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -30,6 +30,7 @@ #include <svx/svdopath.hxx> #include <svx/svdmodel.hxx> #include <svx/svx3ditems.hxx> +#include <svx/xlineit0.hxx> #include <sdr/properties/e3dlatheproperties.hxx> #include <sdr/contact/viewcontactofe3dlathe.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index cb7deb16a2fd..42c6605f288a 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -47,6 +47,8 @@ #include <svx/svdograf.hxx> #include <svx/xbtmpit.hxx> #include <svx/xflbmtit.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index 4a20e3821e9a..b7e9830ef3d4 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -38,6 +38,7 @@ #include <svx/view3d.hxx> #include <svx/cube3d.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/svdogrp.hxx> #include <svx/e3dsceneupdater.hxx> #include <com/sun/star/drawing/LineStyle.hpp> diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 7a9c452f866b..334ab071093d 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -38,7 +38,10 @@ #include <com/sun/star/beans/XPropertyChangeListener.hpp> #include <com/sun/star/beans/PropertyChangeEvent.hpp> #include <com/sun/star/form/runtime/FeatureState.hpp> +#include <vcl/builder.hxx> +#include <vcl/menu.hxx> #include <vcl/timer.hxx> +#include <vcl/window.hxx> #include <sfx2/app.hxx> #include <svx/svdmark.hxx> #include <svx/fmsearch.hxx> diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index bb00dcf9a92d..2626d5340676 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -29,6 +29,7 @@ #include <drawinglayer/processor2d/processor2dtools.hxx> #include <svx/unoapi.hxx> #include <tools/debug.hxx> +#include <vcl/gdimtf.hxx> #include <memory> namespace sdr { namespace contact { diff --git a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx index 98ee5996b343..f9c9041904b4 100644 --- a/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrcaptionobj.cxx @@ -29,9 +29,11 @@ #include <svl/itemset.hxx> #include <svx/xhatch.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfltrit.hxx> +#include <svx/xlineit0.hxx> #include <svx/sdmetitm.hxx> #include <svx/sdprcitm.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx index c6183a2007ba..5a614187e484 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrobj.cxx @@ -28,6 +28,7 @@ #include <svx/sdrpaintwindow.hxx> #include <svx/svdobj.hxx> #include <svx/svdoole2.hxx> +#include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <vcl/outdev.hxx> #include <vcl/canvastools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx index 573f0f585ffb..134643b55e41 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrole2obj.cxx @@ -22,6 +22,7 @@ #include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdoole2.hxx> #include <svx/sdr/contact/objectcontact.hxx> +#include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx index 40b099f32457..5ef073a414b6 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrpage.cxx @@ -23,6 +23,7 @@ #include <sdr/contact/viewcontactofsdrpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpage.hxx> +#include <svx/svdpagv.hxx> #include <svx/sdr/contact/objectcontact.hxx> #include <drawinglayer/primitive2d/backgroundcolorprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/sdr/primitive2d/sdrattributecreator.cxx b/svx/source/sdr/primitive2d/sdrattributecreator.cxx index fe657f5b4974..fb4b8407297f 100644 --- a/svx/source/sdr/primitive2d/sdrattributecreator.cxx +++ b/svx/source/sdr/primitive2d/sdrattributecreator.cxx @@ -52,6 +52,7 @@ #include <svx/xflboxy.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> +#include <svx/xtextit0.hxx> #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx> #include <basegfx/polygon/b2dlinegeometry.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/sdr/properties/graphicproperties.cxx b/svx/source/sdr/properties/graphicproperties.cxx index 38e2d15c6041..a558a83428b6 100644 --- a/svx/source/sdr/properties/graphicproperties.cxx +++ b/svx/source/sdr/properties/graphicproperties.cxx @@ -33,6 +33,8 @@ #include <svx/sdgtritm.hxx> #include <svx/sdginitm.hxx> #include <svx/sdgmoitm.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> namespace sdr { diff --git a/svx/source/sdr/properties/measureproperties.cxx b/svx/source/sdr/properties/measureproperties.cxx index 0760008bc17d..845a744249ee 100644 --- a/svx/source/sdr/properties/measureproperties.cxx +++ b/svx/source/sdr/properties/measureproperties.cxx @@ -25,6 +25,7 @@ #include <svx/svddef.hxx> #include <editeng/eeitem.hxx> #include <svx/svdomeas.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnstit.hxx> #include <svx/xlnstwit.hxx> #include <svx/xlnedit.hxx> diff --git a/svx/source/sdr/properties/textproperties.cxx b/svx/source/sdr/properties/textproperties.cxx index a71240110c88..e6e51437d616 100644 --- a/svx/source/sdr/properties/textproperties.cxx +++ b/svx/source/sdr/properties/textproperties.cxx @@ -33,11 +33,13 @@ #include <svx/svdmodel.hxx> #include <editeng/eeitem.hxx> #include <editeng/outlobj.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <editeng/adjustitem.hxx> #include <svx/svdetc.hxx> #include <editeng/editeng.hxx> #include <editeng/flditem.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnwtit.hxx> #include <svx/svdpool.hxx> diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx index fd45c8cfaa41..51fc48de4673 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx @@ -43,6 +43,7 @@ #include <vcl/toolbox.hxx> #include <svl/aeitem.hxx> #include <svl/intitem.hxx> +#include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/transfrmhelper.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 22efc51b1c65..132870ac0175 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -28,7 +28,9 @@ #include <svx/svdetc.hxx> #include <svx/scene3d.hxx> #include <svx/view3d.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/svdouno.hxx> diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 5883eab62640..e424276da087 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -37,6 +37,7 @@ #include <clonelist.hxx> #include <svx/svdogrp.hxx> #include <svx/scene3d.hxx> +#include <svx/xfillit0.hxx> using namespace com::sun::star; diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index 5ca865a8522c..47dd34025de2 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -31,6 +31,8 @@ #include <svx/dialmgr.hxx> #include <svx/sdooitm.hxx> #include <svx/sdshitm.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include "svdfmtf.hxx" #include "svdpdf.hxx" #include <svx/svdetc.hxx> diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 3e73c8a282fc..eab680743eef 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -56,6 +56,7 @@ #include <vcl/settings.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/svdpage.hxx> +#include <svx/svdpagv.hxx> #include <svx/svdotable.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 329e5ac020ab..1534e661d756 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -29,9 +29,11 @@ #include <editeng/udlnitem.hxx> #include <editeng/crossedoutitem.hxx> #include <editeng/shdditem.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlncapit.hxx> #include <svx/xlnwtit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xgrad.hxx> #include <svx/xflgrit.hxx> diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index 3cd77b138a7c..2f9d53028988 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -18,6 +18,7 @@ */ #include <tools/debug.hxx> +#include <vcl/window.hxx> #include <svx/svdglue.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index 7e557c05a13b..40a9bbdc4429 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -36,6 +36,7 @@ #include <sal/log.hxx> #include <svx/sdrpaintwindow.hxx> +#include <svx/sdooitm.hxx> #include <svx/sdtaaitm.hxx> #include <svx/sdtacitm.hxx> #include <svx/sdtaiitm.hxx> diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index df1c9cc9c51b..cdd7dfc5657d 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -33,7 +33,9 @@ #include <osl/thread.h> #include <svx/svdoole2.hxx> #include <svx/xgrad.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> +#include <svx/xlineit0.hxx> #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index f9b0e58e0aba..45d8db33a2b3 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -65,12 +65,14 @@ #include <com/sun/star/drawing/EnhancedCustomShapeSegment.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeSegmentCommand.hpp> #include <editeng/writingmodeitem.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/svxids.hrc> #include <svl/whiter.hxx> #include <sdr/properties/customshapeproperties.hxx> #include <sdr/contact/viewcontactofsdrobjcustomshape.hxx> #include <svx/xlntrit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xfltrit.hxx> #include <svx/xflclit.hxx> #include <svx/xflgrit.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 119b046ef95f..ab3349fe703b 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -111,12 +111,14 @@ #include <svx/unoshape.hxx> #include <svx/xbtmpit.hxx> #include <svx/xenum.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <svx/xflftrit.hxx> #include <svx/xflhtit.hxx> #include <svx/xfltrit.hxx> #include <svx/xgrad.hxx> #include <svx/xhatch.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlndsit.hxx> #include <svx/xlnedcit.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index f31de7302a20..2b30aaa52cef 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -37,6 +37,7 @@ #include <sdr/contact/viewcontactofsdrcaptionobj.hxx> #include <sdr/properties/captionproperties.hxx> #include <svx/sdrhittesthelper.hxx> +#include <svx/sdooitm.hxx> #include <svx/svddrag.hxx> #include <svx/svdetc.hxx> #include <svx/svdhdl.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 71130028ec48..3e3de148051f 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -42,6 +42,8 @@ #include <svx/svdview.hxx> #include <svx/sxciaitm.hxx> #include <sxcikitm.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnedit.hxx> #include <svx/xlnedwit.hxx> #include <svx/xlnstit.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index d7fa90ba0bd3..b99ab8de5251 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -48,6 +48,7 @@ #include <svx/svdograf.hxx> #include <svx/svdogrp.hxx> #include <svx/xbtmpit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflbmtit.hxx> #include <svx/svdundo.hxx> #include "svdfmtf.hxx" diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 225d31687097..ceca9e1ef5ea 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -78,8 +78,10 @@ #include <sdr/contact/viewcontactofsdrole2obj.hxx> #include <svx/svdograf.hxx> #include <sdr/properties/oleproperties.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xbtmpit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 999d7fbfc57b..08b0b9eaa82a 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -55,6 +55,7 @@ #include <svx/sdtagitm.hxx> #include <svx/sdtfsitm.hxx> #include <svx/sdtmfitm.hxx> +#include <svx/xtextit0.hxx> #include <editeng/editeng.hxx> #include <svl/itemiter.hxx> #include <sdr/properties/textproperties.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 17ddb0f2689f..0406341d5456 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -29,6 +29,7 @@ #include <svx/sdtayitm.hxx> #include <svx/sdtaiitm.hxx> #include <svx/sdtaaitm.hxx> +#include <svx/xfillit0.hxx> #include <basegfx/vector/b2dvector.hxx> #include <sdr/primitive2d/sdrtextprimitive2d.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index 193709d8bfac..0fbbb20d8bd0 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -34,7 +34,9 @@ #include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/sdshitm.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index db871b96110c..e015a4783c50 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -45,7 +45,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdundo.hxx> #include <svx/fmglob.hxx> - +#include <svx/xfillit0.hxx> #include <svx/fmdpage.hxx> #include <sfx2/objsh.hxx> diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx index a3666b5b7d5a..687c3e260341 100644 --- a/svx/source/svdraw/svdpdf.cxx +++ b/svx/source/svdraw/svdpdf.cxx @@ -76,9 +76,11 @@ #include <svx/xlndsit.hxx> #include <basegfx/polygon/b2dpolygonclipper.hxx> #include <svx/xbtmpit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xfltrit.hxx> #include <svx/xflbmtit.hxx> #include <svx/xflbstit.hxx> +#include <svx/xlineit0.hxx> #include <svx/svdpntv.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/svditer.hxx> diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index 8201006ac17f..b8cfc498083f 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -21,7 +21,9 @@ #include <editeng/editdata.hxx> #include <editeng/editeng.hxx> #include <rtl/strbuf.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> +#include <svx/xlineit0.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> #include <svx/svdetc.hxx> diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index ab6b2ce86b05..772cde7797b5 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -34,8 +34,10 @@ #include <svx/svdview.hxx> #include <svx/drawitem.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <editeng/colritem.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index 3b8b1d4fa183..3a83e49f3505 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -65,6 +65,7 @@ #include <svx/pageitem.hxx> #include <editeng/eeitem.hxx> #include <svx/svdoutl.hxx> +#include <svx/xlineit0.hxx> #include <editeng/flditem.hxx> #include "UnoGraphicExporter.hxx" #include <memory> diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index 42882aa0f1e1..445313698ad5 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -23,6 +23,7 @@ #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> #include <cppuhelper/implbase.hxx> +#include <tools/weakbase.hxx> #include <svx/svdmodel.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 46ec04c2f77b..9cd0d2ea520c 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -72,8 +72,10 @@ #include <svx/xflftrit.hxx> #include <svx/xtable.hxx> #include <svx/xbtmpit.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> #include <svx/xflhtit.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> #include <svx/unomaster.hxx> #include <editeng/outlobj.hxx> diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx b/sw/qa/extras/uiwriter/uiwriter.cxx index e403adb33e96..468827925a78 100644 --- a/sw/qa/extras/uiwriter/uiwriter.cxx +++ b/sw/qa/extras/uiwriter/uiwriter.cxx @@ -49,6 +49,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> +#include <svx/xfillit0.hxx> #include <svl/itemiter.hxx> #include <svx/svxids.hrc> #include <unotools/localfilehelper.hxx> diff --git a/sw/sdi/swslots.hrc b/sw/sdi/swslots.hrc index 59bcaa4ccfa0..2c9dafc1b593 100644 --- a/sw/sdi/swslots.hrc +++ b/sw/sdi/swslots.hrc @@ -19,6 +19,7 @@ #include <editeng/memberids.h> #include <editeng/editids.hrc> #include <svx/svxids.hrc> +#include <svx/unomid.hxx> #include "globals.hrc" #include "cmdid.h" #include "unomid.h" diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 0b0ed99ff390..dd6016161955 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -97,6 +97,8 @@ #include <drawinglayer/processor2d/processorfromoutputdevice.hxx> #include <svx/unoapi.hxx> #include <svx/framelinkarray.hxx> +#include <svx/svdpagv.hxx> +#include <svx/xfillit0.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/color/bcolortools.hxx> #include <basegfx/utils/b2dclipstate.hxx> diff --git a/sw/source/core/unocore/unomap1.cxx b/sw/source/core/unocore/unomap1.cxx index f5976ca50a4c..25138d0c4b8e 100644 --- a/sw/source/core/unocore/unomap1.cxx +++ b/sw/source/core/unocore/unomap1.cxx @@ -20,6 +20,7 @@ #include <hintids.hxx> #include <svx/svxids.hrc> +#include <svx/unomid.hxx> #include <com/sun/star/awt/FontSlant.hpp> #include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx index f73337bbd2f4..004696bcb5d1 100644 --- a/sw/source/core/unocore/unostyle.cxx +++ b/sw/source/core/unocore/unostyle.cxx @@ -90,6 +90,7 @@ #include <svx/unobrushitemhelper.hxx> #include <editeng/unoipset.hxx> #include <editeng/memberids.h> +#include <svx/unomid.hxx> #include <svx/unoshape.hxx> #include <svx/xflbstit.hxx> #include <svx/xflbmtit.hxx> diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx index 218ffa02a200..ac13c4b1ac2c 100644 --- a/sw/source/filter/html/htmldrawreader.cxx +++ b/sw/source/filter/html/htmldrawreader.cxx @@ -32,6 +32,7 @@ #include <svx/sdtmfitm.hxx> #include <editeng/eeitem.hxx> #include <editeng/outliner.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <editeng/colritem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/filter/html/htmldrawwriter.cxx b/sw/source/filter/html/htmldrawwriter.cxx index 585a2f8037a1..21a8e15a75d2 100644 --- a/sw/source/filter/html/htmldrawwriter.cxx +++ b/sw/source/filter/html/htmldrawwriter.cxx @@ -29,6 +29,7 @@ #include <svx/sdtaaitm.hxx> #include <editeng/eeitem.hxx> #include <editeng/outliner.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflclit.hxx> #include <editeng/colritem.hxx> #include <editeng/brushitem.hxx> diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 427b110a5e02..765dee2c2455 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -66,6 +66,7 @@ #include <svx/svdouno.hxx> #include <filter/msfilter/rtfutil.hxx> #include <sfx2/sfxbasemodel.hxx> +#include <svx/xfillit0.hxx> #include <svx/xflgrit.hxx> #include <docufld.hxx> #include <fmtclds.hxx> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index 3beb1e2f6181..8fccbd2471f4 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -26,6 +26,8 @@ #include <svx/sdtaitm.hxx> #include <editeng/lrspitem.hxx> #include <editeng/udlnitem.hxx> +#include <svx/xfillit0.hxx> +#include <svx/xlineit0.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> #include <svx/xlndsit.hxx> diff --git a/sw/source/filter/ww8/ww8graf2.cxx b/sw/source/filter/ww8/ww8graf2.cxx index f577ab60d0e1..b3ad4f3f88d3 100644 --- a/sw/source/filter/ww8/ww8graf2.cxx +++ b/sw/source/filter/ww8/ww8graf2.cxx @@ -48,6 +48,7 @@ #include "ww8par.hxx" #include "ww8par2.hxx" #include "ww8graf.hxx" +#include <vcl/gdimtf.hxx> #include <vcl/graphicfilter.hxx> #include <vcl/wmf.hxx> diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx index 4d1f73987f7b..b91501ea5813 100644 --- a/sw/source/uibase/docvw/AnnotationWin2.cxx +++ b/sw/source/uibase/docvw/AnnotationWin2.cxx @@ -58,6 +58,7 @@ #include <sfx2/bindings.hxx> #include <sfx2/dispatch.hxx> +#include <vcl/edit.hxx> #include <vcl/event.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> diff --git a/sw/source/uibase/ribbar/concustomshape.cxx b/sw/source/uibase/ribbar/concustomshape.cxx index 2daf9ef61188..2c5564ecd0a2 100644 --- a/sw/source/uibase/ribbar/concustomshape.cxx +++ b/sw/source/uibase/ribbar/concustomshape.cxx @@ -43,6 +43,7 @@ #include <svl/stritem.hxx> #include <svx/svdpage.hxx> #include <svx/svdoashp.hxx> +#include <svx/xfillit0.hxx> #include <editeng/adjustitem.hxx> #include <math.h> diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx index d558c631d8a1..b19c64eef153 100644 --- a/sw/source/uibase/shells/drawsh.cxx +++ b/sw/source/uibase/shells/drawsh.cxx @@ -43,6 +43,7 @@ #include <tools/diagnose_ex.h> #include <svx/svdoashp.hxx> +#include <svx/xfillit0.hxx> #include <svx/xtable.hxx> #include <vcl/EnumContext.hxx> #include <svx/svdoole2.hxx> diff --git a/sw/source/uibase/shells/slotadd.cxx b/sw/source/uibase/shells/slotadd.cxx index e86a4c0f8deb..9f29aa6a8e58 100644 --- a/sw/source/uibase/shells/slotadd.cxx +++ b/sw/source/uibase/shells/slotadd.cxx @@ -23,6 +23,7 @@ #include <uiitems.hxx> #include <cmdid.h> #include <unomid.h> +#include <svx/unomid.hxx> #include <svl/globalnameitem.hxx> #include <editeng/memberids.h> |