diff options
42 files changed, 26 insertions, 43 deletions
diff --git a/include/sax/fastattribs.hxx b/include/sax/fastattribs.hxx index 61eb048e881a..fb6f47eb7f9d 100644 --- a/include/sax/fastattribs.hxx +++ b/include/sax/fastattribs.hxx @@ -26,7 +26,6 @@ #include <cppuhelper/implbase.hxx> #include <o3tl/string_view.hxx> -#include <rtl/math.h> #include <sax/saxdllapi.h> #include <string_view> diff --git a/include/sfx2/LokControlHandler.hxx b/include/sfx2/LokControlHandler.hxx index a292f137471b..d8ff3811240b 100644 --- a/include/sfx2/LokControlHandler.hxx +++ b/include/sfx2/LokControlHandler.hxx @@ -9,8 +9,6 @@ #pragma once -#include <LibreOfficeKit/LibreOfficeKitEnums.h> -#include <sfx2/dllapi.h> #include <sfx2/lokhelper.hxx> #include <svx/svdouno.hxx> #include <svx/svditer.hxx> @@ -25,8 +23,6 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/UnitConversion.hxx> -#include <sal/log.hxx> - #include <optional> class LokControlHandler diff --git a/include/sfx2/lokhelper.hxx b/include/sfx2/lokhelper.hxx index 26b222bc8aa9..bd2014f9c9d9 100644 --- a/include/sfx2/lokhelper.hxx +++ b/include/sfx2/lokhelper.hxx @@ -10,6 +10,8 @@ #ifndef INCLUDED_SFX2_LOKHELPER_HXX #define INCLUDED_SFX2_LOKHELPER_HXX +#include <com/sun/star/ui/XAcceleratorConfiguration.hpp> + #include <vcl/IDialogRenderable.hxx> #include <vcl/ITiledRenderable.hxx> #include <vcl/event.hxx> @@ -23,7 +25,6 @@ #include <rtl/string.hxx> #include <optional> #include <string_view> -#include <sfx2/app.hxx> struct SFX2_DLLPUBLIC LokMouseEventData { diff --git a/include/sfx2/msg.hxx b/include/sfx2/msg.hxx index 7962fba85b0b..c8d343b04bcf 100644 --- a/include/sfx2/msg.hxx +++ b/include/sfx2/msg.hxx @@ -20,7 +20,6 @@ #define INCLUDED_SFX2_MSG_HXX #include <sfx2/shell.hxx> -#include <rtl/string.hxx> #include <rtl/ustring.hxx> #include <svl/poolitem.hxx> #include <sfx2/dllapi.h> diff --git a/include/svl/itemset.hxx b/include/svl/itemset.hxx index 6d95ec505c0f..01d9d5058b14 100644 --- a/include/svl/itemset.hxx +++ b/include/svl/itemset.hxx @@ -21,9 +21,7 @@ #include <sal/config.h> #include <cassert> -#include <cstddef> #include <memory> -#include <optional> #include <utility> #include <svl/svldllapi.h> diff --git a/include/svtools/genericasyncunodialog.hxx b/include/svtools/genericasyncunodialog.hxx index 937f9778030d..058c37b00cdb 100644 --- a/include/svtools/genericasyncunodialog.hxx +++ b/include/svtools/genericasyncunodialog.hxx @@ -20,7 +20,6 @@ #pragma once #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> -#include <sfx2/tabdlg.hxx> #include <svtools/genericunodialog.hxx> #include <vcl/svapp.hxx> diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index 8a734c3e876f..5e474cad33a9 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -19,7 +19,6 @@ #pragma once #include <svtools/svtdllapi.h> -#include <rtl/textenc.h> #define HTML_FONT_COUNT 7 diff --git a/include/svtools/htmlout.hxx b/include/svtools/htmlout.hxx index 04b643c2d951..6e053977d964 100644 --- a/include/svtools/htmlout.hxx +++ b/include/svtools/htmlout.hxx @@ -24,7 +24,6 @@ #include <string_view> #include <svtools/svtdllapi.h> -#include <rtl/textenc.h> #include <rtl/string.hxx> #include <svl/macitem.hxx> diff --git a/include/svtools/rtfout.hxx b/include/svtools/rtfout.hxx index 08d81514dc3d..ae54056be0ca 100644 --- a/include/svtools/rtfout.hxx +++ b/include/svtools/rtfout.hxx @@ -21,9 +21,10 @@ #include <svtools/svtdllapi.h> -#include <rtl/ustring.hxx> #include <rtl/textenc.h> +#include <string_view> + class SvStream; namespace RTFOutFuncs { diff --git a/include/svtools/rtftoken.h b/include/svtools/rtftoken.h index 11c96a2f75e6..f530c8e5ba33 100644 --- a/include/svtools/rtftoken.h +++ b/include/svtools/rtftoken.h @@ -19,11 +19,7 @@ #pragma once -#include <rtl/ustring.hxx> - -namespace rtl { - class OUString; -}; +#include <string_view> // search the TokenID for the token int GetRTFToken( std::u16string_view rSearch ); diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index e33acec69b15..23a877c25f60 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <rtl/ref.hxx> #include <svx/svxdllapi.h> -#include <tools/long.hxx> namespace com::sun::star { diff --git a/include/svx/ColorSets.hxx b/include/svx/ColorSets.hxx index f95859044b28..6d7ba41398b4 100644 --- a/include/svx/ColorSets.hxx +++ b/include/svx/ColorSets.hxx @@ -11,11 +11,8 @@ #ifndef INCLUDED_SVX_COLORSETS_HXX #define INCLUDED_SVX_COLORSETS_HXX -#include <rtl/ustring.hxx> -#include <sal/log.hxx> #include <svx/svxdllapi.h> #include <docmodel/theme/ColorSet.hxx> -#include <optional> namespace svx { diff --git a/include/svx/constructhelper.hxx b/include/svx/constructhelper.hxx index 928e6b1d3c68..34f1a4f6df06 100644 --- a/include/svx/constructhelper.hxx +++ b/include/svx/constructhelper.hxx @@ -19,7 +19,7 @@ #pragma once -#include <basegfx/polygon/b2dpolygontools.hxx> +#include <basegfx/polygon/b2dpolygontriangulator.hxx> #include <svx/svxdllapi.h> #include <tools/long.hxx> #include <unotools/resmgr.hxx> diff --git a/include/svx/dialog/ThemeDialog.hxx b/include/svx/dialog/ThemeDialog.hxx index 9536bdb38d84..5b534ea4785a 100644 --- a/include/svx/dialog/ThemeDialog.hxx +++ b/include/svx/dialog/ThemeDialog.hxx @@ -12,10 +12,8 @@ #include <svx/svxdllapi.h> #include <vcl/weld.hxx> #include <svx/svdpage.hxx> -#include <svx/theme/IThemeColorChanger.hxx> #include <svx/dialog/ThemeColorEditDialog.hxx> #include <svx/dialog/ThemeColorValueSet.hxx> -#include <functional> namespace model { diff --git a/include/svx/dlgctl3d.hxx b/include/svx/dlgctl3d.hxx index 5d6449e63cee..16873e7b3e17 100644 --- a/include/svx/dlgctl3d.hxx +++ b/include/svx/dlgctl3d.hxx @@ -24,6 +24,7 @@ #include <vcl/weld.hxx> #include <svl/itemset.hxx> #include <svx/svxdllapi.h> +#include <svx/obj3d.hxx> #include <basegfx/vector/b3dvector.hxx> #include <memory> diff --git a/include/svx/extedit.hxx b/include/svx/extedit.hxx index 04fd9dfb8e54..39d8dba7959a 100644 --- a/include/svx/extedit.hxx +++ b/include/svx/extedit.hxx @@ -11,6 +11,7 @@ #define INCLUDED_SVX_EXTEDIT_HXX #include <svx/svxdllapi.h> +#include <svx/svdograf.hxx> #include <svl/lstner.hxx> #include <rtl/ustring.hxx> #include <rtl/ref.hxx> diff --git a/include/svx/fmgridif.hxx b/include/svx/fmgridif.hxx index f978b70b546e..a7ffb7289797 100644 --- a/include/svx/fmgridif.hxx +++ b/include/svx/fmgridif.hxx @@ -45,7 +45,6 @@ #include <toolkit/controls/unocontrol.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <comphelper/interfacecontainer4.hxx> -#include <comphelper/servicehelper.hxx> #include <comphelper/uno3.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/implbase10.hxx> diff --git a/include/svx/hlnkitem.hxx b/include/svx/hlnkitem.hxx index 19e8f10b73a5..03eb8424561c 100644 --- a/include/svx/hlnkitem.hxx +++ b/include/svx/hlnkitem.hxx @@ -26,7 +26,6 @@ #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> #include <memory> -#include <rtl/ustrbuf.hxx> enum class HyperDialogEvent { NONE = 0x0000, diff --git a/include/svx/ofaitem.hxx b/include/svx/ofaitem.hxx index 5ccc030b3b2b..3e9b90ea0060 100644 --- a/include/svx/ofaitem.hxx +++ b/include/svx/ofaitem.hxx @@ -22,6 +22,7 @@ #include <svl/poolitem.hxx> #include <rtl/ref.hxx> #include <svx/svxdllapi.h> +#include <svx/xtable.hxx> class SVX_DLLPUBLIC OfaPtrItem final : public SfxPoolItem { @@ -37,7 +38,6 @@ public: void* GetValue() const { return pPtr; } }; -class XColorList; class SVX_DLLPUBLIC OfaXColorListItem final : public SfxPoolItem { private: diff --git a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx index 93ebdcfde7f2..13d1ccd64246 100644 --- a/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx +++ b/include/svx/sdr/primitive2d/sdrframeborderprimitive2d.hxx @@ -23,8 +23,6 @@ #include <drawinglayer/primitive2d/BufferedDecompositionPrimitive2D.hxx> #include <svx/framelink.hxx> -#include <memory> - // predefines namespace drawinglayer::primitive2d diff --git a/include/svx/sdr/table/tablecontroller.hxx b/include/svx/sdr/table/tablecontroller.hxx index bb02fc271f52..91b9ca7ce7b2 100644 --- a/include/svx/sdr/table/tablecontroller.hxx +++ b/include/svx/sdr/table/tablecontroller.hxx @@ -29,7 +29,6 @@ #include <svx/svdview.hxx> #include <optional> #include <unotools/weakref.hxx> -#include <memory> struct ImplSVEvent; class SdrView; diff --git a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx index 6caf6487417b..09931e89e1cd 100644 --- a/include/svx/sidebar/AreaTransparencyGradientPopup.hxx +++ b/include/svx/sidebar/AreaTransparencyGradientPopup.hxx @@ -19,15 +19,14 @@ #ifndef INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX #define INCLUDED_SVX_SOURCE_SIDEBAR_AREA_AREATRANSPARENCYGRADIENTPOPUP_HXX +#include <basegfx/utils/bgradient.hxx> #include <vcl/weld.hxx> #include <svtools/toolbarmenu.hxx> -#include <basegfx/utils/gradienttools.hxx> class XFillFloatTransparenceItem; namespace svx::sidebar { -class AreaTransparencyGradientControl; class AreaPropertyPanelBase; class AreaTransparencyGradientPopup final : public WeldToolbarPopup diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx index 61c8a34867cf..bcff88d33809 100644 --- a/include/svx/svdetc.hxx +++ b/include/svx/svdetc.hxx @@ -23,7 +23,6 @@ #include <editeng/outliner.hxx> #include <svx/svxdllapi.h> #include <tools/link.hxx> -#include <tools/fract.hxx> #include <svx/svdobj.hxx> #include <svl/whichranges.hxx> #include <unotools/syslocale.hxx> diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 9c02d7e0bd64..631a5973bb7b 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -20,6 +20,7 @@ #include <memory> #include <com/sun/star/uno/Any.hxx> +#include <cppuhelper/weak.hxx> #include <cppuhelper/weakref.hxx> #include <rtl/ustring.hxx> #include <vcl/outdev.hxx> @@ -33,9 +34,6 @@ #include <tools/link.hxx> #include <tools/gen.hxx> #include <unotools/resmgr.hxx> -#include <unotools/weakref.hxx> -#include <osl/diagnose.h> -#include <typeinfo> #include <unordered_set> diff --git a/include/svx/theme/ThemeColorChangerCommon.hxx b/include/svx/theme/ThemeColorChangerCommon.hxx index d60d9c1ba7fb..febc34ae3873 100644 --- a/include/svx/theme/ThemeColorChangerCommon.hxx +++ b/include/svx/theme/ThemeColorChangerCommon.hxx @@ -10,9 +10,7 @@ #pragma once #include <svx/svxdllapi.h> -#include <svx/theme/IThemeColorChanger.hxx> #include <docmodel/theme/ColorSet.hxx> -#include <svx/svdpage.hxx> #include <svx/svdobj.hxx> #include <svx/svdview.hxx> #include <svl/undo.hxx> diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx index 331a8e4ae67e..01269e6fd844 100644 --- a/include/svx/unopool.hxx +++ b/include/svx/unopool.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_UNOPOOL_HXX #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> #include <comphelper/propertysethelper.hxx> #include <comphelper/compbase.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx index 382a8dbd38f1..fd7fa350e65a 100644 --- a/include/svx/unoprov.hxx +++ b/include/svx/unoprov.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_SVX_UNOPROV_HXX #define INCLUDED_SVX_UNOPROV_HXX -#include <config_options.h> #include <com/sun/star/uno/Sequence.hxx> #include <svl/itemprop.hxx> #include <svx/svxdllapi.h> diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 964156f1a60f..3c8fa07bd99e 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -51,10 +51,10 @@ #include <editeng/unotext.hxx> #include <svx/svdobj.hxx> +#include <unotools/weakref.hxx> #include <comphelper/servicehelper.hxx> -#include <cppuhelper/basemutex.hxx> #include <cppuhelper/implbase12.hxx> class SfxItemSet; diff --git a/include/svx/xcolit.hxx b/include/svx/xcolit.hxx index 965d10195146..26941279490c 100644 --- a/include/svx/xcolit.hxx +++ b/include/svx/xcolit.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_XCOLIT_HXX #include <tools/color.hxx> -#include <editeng/colritem.hxx> #include <docmodel/color/ComplexColor.hxx> #include <svx/svxdllapi.h> diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index c1b36c2fbd53..0eea4d0f6bdf 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -53,6 +53,7 @@ #include <editeng/justifyitem.hxx> #include <editeng/fhgtitem.hxx> #include <sal/log.hxx> +#include <osl/diagnose.h> #include <comphelper/lok.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx index 93ab32aba214..e65efbbb8686 100644 --- a/sd/inc/OutlinerIterator.hxx +++ b/sd/inc/OutlinerIterator.hxx @@ -20,6 +20,7 @@ #pragma once #include <svx/svdobj.hxx> +#include <unotools/weakref.hxx> #include "pres.hxx" #include <sal/types.h> diff --git a/sd/source/core/ThemeColorChanger.cxx b/sd/source/core/ThemeColorChanger.cxx index b475aa6f6060..70d14bc37438 100644 --- a/sd/source/core/ThemeColorChanger.cxx +++ b/sd/source/core/ThemeColorChanger.cxx @@ -7,6 +7,7 @@ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ +#include <editeng/colritem.hxx> #include <theme/ThemeColorChanger.hxx> #include <svx/theme/ThemeColorChangerCommon.hxx> #include <svx/svdmodel.hxx> diff --git a/sfx2/source/view/lokhelper.cxx b/sfx2/source/view/lokhelper.cxx index cc3920fd0f35..e7fdc3d024be 100644 --- a/sfx2/source/view/lokhelper.cxx +++ b/sfx2/source/view/lokhelper.cxx @@ -25,6 +25,7 @@ #include <vcl/commandevent.hxx> #include <vcl/window.hxx> #include <sal/log.hxx> +#include <sfx2/app.hxx> #include <sfx2/msg.hxx> #include <sfx2/viewsh.hxx> #include <sfx2/request.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index 905f31fe6f08..afd73e744780 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -38,6 +38,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/e3dsceneupdater.hxx> #include <svx/svdmodel.hxx> +#include <osl/diagnose.h> namespace { diff --git a/svx/source/sdr/contact/viewcontactofe3dscene.cxx b/svx/source/sdr/contact/viewcontactofe3dscene.cxx index 4040ace8c8f6..63b031fdeb54 100644 --- a/svx/source/sdr/contact/viewcontactofe3dscene.cxx +++ b/svx/source/sdr/contact/viewcontactofe3dscene.cxx @@ -28,6 +28,7 @@ #include <drawinglayer/primitive2d/sceneprimitive2d.hxx> #include <drawinglayer/primitive3d/transformprimitive3d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> +#include <osl/diagnose.h> using namespace com::sun::star; diff --git a/svx/source/styles/ColorSets.cxx b/svx/source/styles/ColorSets.cxx index cfdeb83df442..d8c86b874336 100644 --- a/svx/source/styles/ColorSets.cxx +++ b/svx/source/styles/ColorSets.cxx @@ -10,6 +10,7 @@ #include <svx/ColorSets.hxx> +#include <optional> #include <utility> #include <unordered_set> #include <docmodel/theme/ColorSet.hxx> diff --git a/svx/source/table/tableundo.hxx b/svx/source/table/tableundo.hxx index 166d0a33a07a..e9f4cfe903e4 100644 --- a/svx/source/table/tableundo.hxx +++ b/svx/source/table/tableundo.hxx @@ -27,6 +27,7 @@ #include <svx/svdobj.hxx> #include <svx/svdundo.hxx> #include <svx/sdrobjectuser.hxx> +#include <unotools/weakref.hxx> #include <celltypes.hxx> diff --git a/svx/source/theme/ThemeColorChangerCommon.cxx b/svx/source/theme/ThemeColorChangerCommon.cxx index 446943100101..82f915fef930 100644 --- a/svx/source/theme/ThemeColorChangerCommon.cxx +++ b/svx/source/theme/ThemeColorChangerCommon.cxx @@ -10,6 +10,7 @@ #include <svx/theme/ThemeColorChangerCommon.hxx> #include <sal/config.h> +#include <editeng/colritem.hxx> #include <editeng/unoprnms.hxx> #include <docmodel/uno/UnoComplexColor.hxx> #include <docmodel/theme/ColorSet.hxx> diff --git a/svx/source/unodraw/gluepts.cxx b/svx/source/unodraw/gluepts.cxx index a0fc6a1b7b92..1547b9fed7f0 100644 --- a/svx/source/unodraw/gluepts.cxx +++ b/svx/source/unodraw/gluepts.cxx @@ -26,6 +26,7 @@ #include <cppuhelper/implbase.hxx> #include <tools/weakbase.hxx> +#include <unotools/weakref.hxx> #include <svx/svdobj.hxx> #include <svx/svdglue.hxx> diff --git a/sw/source/filter/ww8/ww8graf.cxx b/sw/source/filter/ww8/ww8graf.cxx index accf7cf53098..8a9dd1197129 100644 --- a/sw/source/filter/ww8/ww8graf.cxx +++ b/sw/source/filter/ww8/ww8graf.cxx @@ -58,6 +58,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdograf.hxx> #include <svx/svdoole2.hxx> +#include <editeng/colritem.hxx> #include <editeng/ulspitem.hxx> #include <editeng/brushitem.hxx> #include <editeng/opaqitem.hxx> diff --git a/sw/source/ui/dbui/mailmergewizard.cxx b/sw/source/ui/dbui/mailmergewizard.cxx index 634e984f2e30..7090d5c3e2ec 100644 --- a/sw/source/ui/dbui/mailmergewizard.cxx +++ b/sw/source/ui/dbui/mailmergewizard.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <osl/diagnose.h> + #include <mailmergewizard.hxx> #include "mmdocselectpage.hxx" #include "mmoutputtypepage.hxx" diff --git a/sw/source/ui/envelp/mailmrge.cxx b/sw/source/ui/envelp/mailmrge.cxx index eb45452c2245..8567b1144307 100644 --- a/sw/source/ui/envelp/mailmrge.cxx +++ b/sw/source/ui/envelp/mailmrge.cxx @@ -49,6 +49,7 @@ #include <com/sun/star/view/XSelectionSupplier.hpp> #include <comphelper/processfactory.hxx> #include <cppuhelper/implbase.hxx> +#include <osl/diagnose.h> #include <algorithm> |