tdf#146619 Use more forward declarations in include/vcl/[d-g]*

Found after running bin/find-unneeded-includes --headersfwd include/vcl/[d-g]* This shaves off about 150M input Change-Id: I2b15257451d4b392dca3e5d07f4a443ee653b04c Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196395 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen@collabora.com>
2026-01-11 21:38:37 +01:00
parent 983c3951fd
commit b63115f3fa
142 changed files with 382 additions and 49 deletions
@@ -23,6 +23,7 @@

 #include <gst/gstbuffer.h>
 #include <o3tl/safeint.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/BitmapTools.hxx>

@@ -37,6 +37,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <osl/file.hxx>
 #include <tools/stream.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/BitmapTools.hxx>
@@ -23,6 +23,7 @@
 #include <basic/sbxvar.hxx>
 #include <basic/sbuno.hxx>
 #include <osl/process.h>
+#include <vcl/bitmap.hxx>
 #include <vcl/dibtools.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -32,6 +32,7 @@
 #include <basegfx/utils/keystoplerp.hxx>
 #include <basegfx/utils/lerp.hxx>
 #include <basegfx/utils/tools.hxx>
+#include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/rendering/TexturingMode.hpp>
 #include <rtl/math.hxx>
 #include <comphelper/diagnose_ex.hxx>
@@ -17,6 +17,8 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>

+#include <vcl/gfxlink.hxx>
+
 using uno::Reference;
 using beans::XPropertySet;

@@ -14,6 +14,7 @@
 #include <com/sun/star/awt/FontSlant.hpp>
 #include <com/sun/star/awt/FontUnderline.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/util/DateTime.hpp>

 using uno::Reference;
 using beans::XPropertySet;
@@ -19,6 +19,7 @@
 #include <com/sun/star/chart/DataLabelPlacement.hpp>
 #include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/drawing/FillStyle.hpp>
+#include <sal/log.hxx>

 class Chart2ImportTest2 : public ChartTest
 {
@@ -34,6 +34,7 @@
 #include <vcl/formatter.hxx>
 #include <vcl/weld/weld.hxx>
 #include <svl/zformat.hxx>
+#include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>

 #include <com/sun/star/chart2/AxisType.hpp>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <vcl/animate/Animation.hxx>
 #include <vcl/bitmap/BitmapMosaicFilter.hxx>
 #include <vcl/bitmap/BitmapSharpenFilter.hxx>
 #include <vcl/bitmap/BitmapEmbossGreyFilter.hxx>
@@ -41,6 +41,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/event.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/salgtype.hxx>
 #include <vcl/virdev.hxx>
@@ -21,8 +21,10 @@

 #include <algorithm>

+#include <basegfx/range/b2drange.hxx>
 #include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <utility>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>

 namespace drawinglayer::attribute
@@ -21,6 +21,9 @@

 #include <algorithm>

+#include <basegfx/point/b2dpoint.hxx>
+#include <basegfx/range/b2drange.hxx>
+#include <basegfx/vector/b2dvector.hxx>
 #include <drawinglayer/attribute/sdrfillgraphicattribute.hxx>
 #include <drawinglayer/attribute/fillgraphicattribute.hxx>
 #include <utility>
@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/converters.hxx>
+#include <vcl/graph.hxx>
 #include "GlowSoftEgdeShadowTools.hxx"

 #ifdef DBG_UTIL
@@ -48,6 +48,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 namespace drawinglayer::primitive2d
 {
@@ -25,6 +25,7 @@
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <drawinglayer/converters.hxx>
+#include <vcl/graph.hxx>
 #include "GlowSoftEgdeShadowTools.hxx"

 #ifdef DBG_UTIL
@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <drawinglayer/converters.hxx>
+#include <vcl/graph.hxx>
 #include "GlowSoftEgdeShadowTools.hxx"

 #ifdef DBG_UTIL
@@ -27,6 +27,7 @@
 #include <tools/fract.hxx>
 #include <utility>
 #include <vcl/canvastools.hxx>
+#include <vcl/fntstyle.hxx>
 #include <vcl/glyphitemcache.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/kernarray.hxx>
@@ -47,6 +47,7 @@
 #include <basegfx/polygon/b2dpolygonclipper.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/vector/b2dsize.hxx>
 #include <sal/log.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -21,6 +21,7 @@
 #include <drawinglayer/primitive2d/pointarrayprimitive2d.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/BitmapColor.hxx>
+#include <vcl/fntstyle.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/metaact.hxx>
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
@@ -30,6 +30,7 @@
 #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx>
 #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx>
 #include <drawinglayer/primitive2d/graphicprimitive2d.hxx>
+#include <vcl/fntstyle.hxx>

 // anonymous Outline/EditEngine decompose helpers
 namespace
@@ -18,6 +18,7 @@
 */


+#include <vcl/fntstyle.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/window.hxx>
@@ -35,6 +35,7 @@
 #include <editeng/editstat.hxx>
 #include <editeng/overflowingtxt.hxx>
 #include <editeng/editobj.hxx>
+#include <vcl/fntstyle.hxx>
 #include <svl/itemset.hxx>
 #include <vcl/metric.hxx>
 #include <editeng/numitem.hxx>
@@ -32,6 +32,7 @@
 #include <editeng/memberids.h>
 #include <svl/itempool.hxx>
 #include <vcl/font.hxx>
+#include <vcl/fntstyle.hxx>
 #include <vcl/unohelp.hxx>
 #include <tools/gen.hxx>

@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
 #include <drawinglayer/tools/primitive2dxmldump.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <memory>
 #include <string_view>
@@ -32,6 +32,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/pdfread.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <rtl/bootstrap.hxx>

 #ifdef DBG_UTIL
@@ -16,12 +16,15 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/graphic/XGraphic.hpp>

+#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <comphelper/lok.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <tools/color.hxx>
 #include <tools/stream.hxx>
 #include <unotools/streamwrap.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
 #include <vcl/ITiledRenderable.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <tools/helpers.hxx>

 using namespace ::com::sun::star;
@@ -37,6 +37,7 @@
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/vector/b2dsize.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
 #include <unotools/configmgr.hxx>
 #include <comphelper/compbase.hxx>
@@ -31,6 +31,7 @@
 #include <vcl/settings.hxx>
 #include <vcl/filter/SvmReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
+#include <vcl/fntstyle.hxx>
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
 #include <tools/stream.hxx>
@@ -30,6 +30,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/errinf.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
@@ -31,6 +31,7 @@
 #include <toolkit/awt/vclxmenu.hxx>
 #include <unotools/historyoptions.hxx>
 #include <vcl/abstdlg.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/settings.hxx>
@@ -332,6 +332,12 @@ excludelist:
    include/vcl/CairoFormats.hxx:
    # Needed for macro #define
    - vcl/Scanline.hxx
+    include/vcl/dndlistenercontainer.hxx:
+    # base class has to be a complete type
+    - com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp
+    - com/sun/star/datatransfer/dnd/XDropTarget.hpp
+    - com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp
+    - com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp
    include/vcl/keycodes.hxx:
    # Needed for macros
    - com/sun/star/awt/Key.hpp
@@ -22,10 +22,13 @@

 #include <vector>

+#include <tools/color.hxx>
 #include <vcl/graph.hxx>

 #include <svtools/svtdllapi.h>

+#include <com/sun/star/uno/Reference.hxx>
+
 namespace com :: sun :: star :: awt { class XToolkit; }
 namespace com :: sun :: star :: frame { class XModel; }
 namespace com :: sun :: star :: lang { class XComponent; }
@@ -21,10 +21,13 @@

 #include <svtools/svtdllapi.h>
 #include <com/sun/star/uno/Reference.hxx>
+#include <tools/link.hxx>
 #include <vcl/graph.hxx>
 #include <rtl/ustring.hxx>
 #include <memory>

+class SvStream;
+
 namespace com :: sun :: star :: io { class XInputStream; }

 namespace comphelper
@@ -21,6 +21,7 @@
 #ifndef INCLUDED_SVX_XOUTBMP_HXX
 #define INCLUDED_SVX_XOUTBMP_HXX

+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <comphelper/errcode.hxx>
 #include <com/sun/star/uno/Sequence.h>
@@ -20,13 +20,13 @@
 #define INCLUDED_VCL_DIBTOOLS_HXX

 #include <vcl/dllapi.h>
-#include <vcl/Scanline.hxx>

 // predefines

 class SvStream;
 class Bitmap;
 class AlphaMask;
+enum class ScanlineFormat : sal_uInt8;

 // - Compression defines

@@ -20,13 +20,14 @@
 #pragma once

 #include <com/sun/star/datatransfer/dnd/XDragGestureRecognizer.hpp>
-#include <com/sun/star/datatransfer/dnd/XDragSource.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTarget.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDragContext.hpp>
 #include <com/sun/star/datatransfer/dnd/XDropTargetDropContext.hpp>
 #include <comphelper/compbase.hxx>
 #include <comphelper/interfacecontainer4.hxx>

+namespace com::sun::star::datatransfer::dnd { class XDragSource; }
+
 class DNDListenerContainer final :
                                public ::comphelper::WeakComponentImplHelper<
    css::datatransfer::dnd::XDragGestureRecognizer,
@@ -25,10 +25,10 @@
 #include <string_view>

 #include <vcl/dllapi.h>
-#include <tools/fldunit.hxx>
-#include <tools/mapunit.hxx>

 class LocaleDataWrapper;
+enum class FieldUnit : sal_uInt16;
+enum class MapUnit : sal_uInt8;

 namespace vcl
 {
@@ -12,32 +12,32 @@

 #include <memory>

-#include <com/sun/star/util/DateTime.hpp>
-
 #include <vcl/dllapi.h>
-#include <basegfx/vector/b2dsize.hxx>
 #include <basegfx/range/b2drectangle.hxx>
-#include <basegfx/point/b2dpoint.hxx>
-#include <basegfx/matrix/b2dhommatrix.hxx>
 #include <rtl/ustring.hxx>
-#include <tools/color.hxx>
-#include <tools/gen.hxx>
 #include <vcl/checksum.hxx>
 #include <vcl/Scanline.hxx>
-#include <vcl/pdf/PDFAnnotationSubType.hxx>
-#include <vcl/pdf/PDFPageObjectType.hxx>
-#include <vcl/pdf/PDFSegmentType.hxx>
-#include <vcl/pdf/PDFBitmapType.hxx>
-#include <vcl/pdf/PDFObjectType.hxx>
-#include <vcl/pdf/PDFTextRenderMode.hxx>
-#include <vcl/pdf/PDFFillMode.hxx>
-#include <vcl/pdf/PDFFindFlags.hxx>
-#include <vcl/pdf/PDFErrorType.hxx>
-#include <vcl/pdf/PDFFormFieldType.hxx>
-#include <vcl/pdf/PDFAnnotAActionType.hxx>

-class SvMemoryStream;
 class Bitmap;
+class Color;
+class Size;
+class SvMemoryStream;
+namespace basegfx
+{
+class B2DHomMatrix;
+}
+namespace basegfx
+{
+class B2DPoint;
+}
+namespace basegfx
+{
+class B2DSize;
+}
+namespace com::sun::star::util
+{
+struct DateTime;
+}

 namespace vcl::pdf
 {
@@ -52,6 +52,17 @@ inline constexpr OString constDictionaryKey_RichContent = "RC"_ostr;
 class PDFiumBitmap;
 class PDFiumDocument;
 class PDFiumPageObject;
+enum class PDFAnnotAActionType;
+enum class PDFAnnotationSubType;
+enum class PDFBitmapType;
+enum class PDFErrorType;
+enum class PDFFillMode;
+enum class PDFFindFlags : sal_uInt32;
+enum class PDFFormFieldType;
+enum class PDFObjectType;
+enum class PDFPageObjectType;
+enum class PDFSegmentType;
+enum class PDFTextRenderMode;

 class PDFiumFont
 {
@@ -13,8 +13,6 @@
 #include <sal/config.h>

 #include <vcl/dllapi.h>
-#include <vcl/BinaryDataContainer.hxx>
-#include <vcl/filter/ImportOutput.hxx>

 #include <com/sun/star/uno/Reference.hxx>

@@ -40,7 +38,9 @@ namespace com::sun::star::task
 class XStatusIndicator;
 }

+class BinaryDataContainer;
 class Bitmap;
+class ImportOutput;
 class SvStream;

 namespace vcl
@@ -8,15 +8,29 @@
 */

 #include <vcl/dllapi.h>
-#include <com/sun/star/task/XStatusIndicator.hpp>
-#include <com/sun/star/beans/PropertyValue.hpp>
-#include <com/sun/star/uno/Sequence.hxx>
-#include <tools/stream.hxx>
-#include <vcl/graph.hxx>
+#include <com/sun/star/uno/Reference.hxx>
+
+#include <array>
+#include <stdint.h>
 #include <vector>

 #pragma once

+class Graphic;
+class SvStream;
+namespace com::sun::star::beans
+{
+struct PropertyValue;
+}
+namespace com::sun::star::task
+{
+class XStatusIndicator;
+}
+namespace com::sun::star::uno
+{
+template <class E> class Sequence;
+}
+
 namespace vcl
 {
 // Similar to png_unknown_chunk
@@ -19,10 +19,17 @@

 #pragma once

-#include <vcl/gdimtf.hxx>
+#include <vcl/dllapi.h>

+class Color;
+class GDIMetaFile;
+class MetaAction;
 class SvStream;
 struct ImplMetaReadData;
+namespace rtl
+{
+template <class reference_type> class Reference;
+}

 class SvmReader
 {
@@ -19,10 +19,67 @@

 #pragma once

-#include <vcl/gdimtf.hxx>
-#include <vcl/metaact.hxx>
+#include <vcl/checksum.hxx>
+#include <vcl/dllapi.h>

 class SvStream;
+class Color;
+class GDIMetaFile;
+class MetaAction;
+class MetaArcAction;
+class MetaBmpAction;
+class MetaBmpExAction;
+class MetaBmpExScaleAction;
+class MetaBmpExScalePartAction;
+class MetaBmpScaleAction;
+class MetaBmpScalePartAction;
+class MetaChordAction;
+class MetaClipRegionAction;
+class MetaCommentAction;
+class MetaEPSAction;
+class MetaEllipseAction;
+class MetaFillColorAction;
+class MetaFloatTransparentAction;
+class MetaFontAction;
+class MetaGradientAction;
+class MetaGradientExAction;
+class MetaHatchAction;
+class MetaISectRectClipRegionAction;
+class MetaISectRegionClipRegionAction;
+class MetaLayoutModeAction;
+class MetaLineAction;
+class MetaLineColorAction;
+class MetaMapModeAction;
+class MetaMaskAction;
+class MetaMaskScaleAction;
+class MetaMaskScalePartAction;
+class MetaMoveClipRegionAction;
+class MetaOverlineColorAction;
+class MetaPieAction;
+class MetaPixelAction;
+class MetaPointAction;
+class MetaPolyLineAction;
+class MetaPolyPolygonAction;
+class MetaPolygonAction;
+class MetaPopAction;
+class MetaPushAction;
+class MetaRasterOpAction;
+class MetaRectAction;
+class MetaRefPointAction;
+class MetaRoundRectAction;
+class MetaStretchTextAction;
+class MetaTextAction;
+class MetaTextAlignAction;
+class MetaTextArrayAction;
+class MetaTextColorAction;
+class MetaTextFillColorAction;
+class MetaTextLanguageAction;
+class MetaTextLineAction;
+class MetaTextLineColorAction;
+class MetaTextRectAction;
+class MetaTransparentAction;
+class MetaWallpaperAction;
+struct ImplMetaWriteData;

 class SvmWriter
 {
@@ -23,14 +23,13 @@
 #include <rtl/ustring.hxx>
 #include <sal/types.h>
 #include <vcl/dllapi.h>
-#include <tools/color.hxx>
 #include <tools/fontenum.hxx>
 #include <tools/long.hxx>
 #include <tools/degree.hxx>
 #include <i18nlangtag/lang.h>
-#include <vcl/fntstyle.hxx>
 #include <o3tl/cow_wrapper.hxx>

+class Color;
 class Size;
 class LanguageTag;
 class SvStream;
@@ -38,6 +37,9 @@ class SvStream;
 class ImplFont;
 class FontAttributes;
 namespace vcl { class Font; }
+enum class FontKerning;
+enum class FontRelief;
+
 // need to first declare these outside the vcl namespace, or the friend declarations won't work right
 VCL_DLLPUBLIC SvStream&  ReadFont( SvStream& rIStm, vcl::Font& );
 VCL_DLLPUBLIC SvStream&  WriteFont( SvStream& rOStm, const vcl::Font& );
@@ -10,7 +10,13 @@
 #pragma once

 #include <vcl/dllapi.h>
-#include <vcl/font/FontDataContainer.hxx>
+
+#include <vector>
+
+namespace font
+{
+class FontDataContainer;
+}

 namespace font
 {
@@ -21,13 +21,18 @@

 #include <config_options.h>
 #include <i18nlangtag/lang.h>
+#include <tools/gen.hxx>
 #include <tools/link.hxx>
 #include <tools/solar.h>
-#include <vcl/settings.hxx>
+#include <rtl/ustring.hxx>
+#include <vcl/dllapi.h>
 #include <map>
+#include <optional>
 #include <string_view>

+class Color;
 class SvNumberFormatter;
+enum class SelectionOptions;

 namespace validation
 {
@@ -21,16 +21,16 @@
 #define INCLUDED_VCL_GRADIENT_HXX

 #include <sal/types.h>
-#include <tools/color.hxx>
 #include <tools/degree.hxx>
 #include <tools/long.hxx>
 #include <o3tl/cow_wrapper.hxx>

 #include <vcl/dllapi.h>
-#include <com/sun/star/awt/GradientStyle.hpp>

+namespace com::sun::star::awt { enum class GradientStyle; }
 namespace tools { class Rectangle; }

+class Color;
 class Point;
 class GDIMetaFile;

@@ -22,14 +22,10 @@
 #include <memory>
 #include <vcl/dllapi.h>
 #include <tools/solar.h>
+#include <tools/gen.hxx>
+#include <tools/long.hxx>
 #include <rtl/ustring.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/animate/Animation.hxx>
-#include <vcl/gfxlink.hxx>
-#include <com/sun/star/uno/Reference.hxx>
-#include <vcl/vectorgraphicdata.hxx>
-#include <basegfx/vector/b2dsize.hxx>
-#include <vcl/GraphicExternalLink.hxx>
+#include <vcl/checksum.hxx>

 enum class GraphicType
 {
@@ -41,10 +37,19 @@ enum class GraphicType

 namespace com::sun::star::graphic { class XGraphic; }
 namespace vcl { class Font; }
+namespace basegfx { class B2DSize; }
+namespace com::sun::star::uno { template <class interface_type> class Reference; }
+template <typename Arg, typename Ret> class Link;

+class Animation;
+class Bitmap;
 class GDIMetaFile;
+class GfxLink;
+class GraphicExternalLink;
 class ImpGraphic;
+class MapMode;
 class OutputDevice;
+class VectorGraphicData;

 class SAL_WARN_UNUSED VCL_DLLPUBLIC GraphicConversionParameters
 {
@@ -9,11 +9,10 @@

 #pragma once

-#include <com/sun/star/uno/Reference.hxx>
-
-#include <vcl/bitmap.hxx>
 #include <vcl/dllapi.h>

+class Bitmap;
+
 namespace com::sun::star::awt
 {
 class XBitmap;
@@ -27,6 +26,11 @@ namespace com::sun::star::uno
 class Any;
 }

+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+
 namespace vcl
 {
 VCL_DLLPUBLIC Bitmap GetBitmap(const css::uno::Reference<css::awt::XBitmap>& xBitmap);
@@ -21,6 +21,7 @@
 #define INCLUDED_VCL_GRAPHICFILTER_HXX

 #include <tools/gen.hxx>
+#include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/graph.hxx>
 #include <com/sun/star/task/XInteractionHandler.hpp>
@@ -28,6 +29,8 @@
 #include <o3tl/typed_flags_set.hxx>
 #include <vcl/BinaryDataContainer.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
+#include <vcl/gfxlink.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <memory>

@@ -19,6 +19,8 @@
 **/

 #include <rtl/ustring.hxx>
+#include <tools/stream.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <vcl/image.hxx>
 #include <vcl/outdev.hxx>
@@ -8,6 +8,7 @@
 */

 #include <test/unoapi_test.hxx>
+#include <tools/color.hxx>

 #include <com/sun/star/awt/FontWeight.hpp>
 #include <com/sun/star/awt/FontSlant.hpp>
@@ -26,6 +26,7 @@
 #include <vcl/alpha.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/bitmap/BitmapMonochromeFilter.hxx>
+#include <vcl/gfxlink.hxx>
 #include <docmodel/uno/UnoComplexColor.hxx>
 #include <docmodel/uno/UnoGradientTools.hxx>
 #include <basegfx/utils/gradienttools.hxx>
@@ -120,8 +120,10 @@
 #include <unotools/fontdefs.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/embeddedfontsmanager.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <rtl/strbuf.hxx>
 #include <filter/msfilter/escherex.hxx>
 #include <filter/msfilter/util.hxx>
@@ -20,6 +20,8 @@
 #include <ColorChanger.hxx>
 #include <SectionWindow.hxx>

+#include <com/sun/star/awt/GradientStyle.hpp>
+
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/gradient.hxx>
@@ -33,6 +33,8 @@
 #include <unotools/syslocale.hxx>
 #include <unotools/localedatawrapper.hxx>

+#include <com/sun/star/awt/GradientStyle.hpp>
+
 #define CORNER_SPACE     5


@@ -8,6 +8,7 @@
 */

 #include <test/unoapi_test.hxx>
+#include <tools/color.hxx>

 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/sheet/XConditionalFormats.hpp>
@@ -26,6 +26,7 @@
 #include <comphelper/propertyvalue.hxx>

 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/pdf/PDFAnnotationSubType.hxx>

 #if USE_TLS_NSS
 #include <nss.h>
@@ -24,6 +24,7 @@
 #include <vector>
 #include <memory>
 #include <o3tl/sorted_vector.hxx>
+#include <tools/link.hxx>

 struct ScRTFCellDefault
 {
@@ -32,6 +32,7 @@
 #include <set>
 #include <bitmaps.hlst>

+#include <com/sun/star/awt/GradientStyle.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>

@@ -19,6 +19,7 @@
 #include <editeng/editobj.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
 #include <vcl/pdf/PDFAnnotationSubType.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <Annotation.hxx>
 #include <DrawDocShell.hxx>
@@ -45,6 +45,7 @@

 #include <svx/svdotable.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 using namespace css;
 using namespace css::animations;
@@ -72,6 +72,7 @@
 #include <osl/file.hxx>
 #include <svx/svdograf.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 using namespace ::com::sun::star;

@@ -23,6 +23,7 @@
 #include <sdpage.hxx>
 #include <svx/svdograf.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 using namespace css;

@@ -96,6 +96,7 @@
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/font/EOTConverter.hxx>
+#include <vcl/font/FontDataContainer.hxx>

 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
 #include <com/sun/star/document/XStorageBasedDocument.hpp>
@@ -23,6 +23,7 @@

 #include <com/sun/star/awt/FontDescriptor.hpp>
 #include <com/sun/star/lang/Locale.hpp>
+#include <com/sun/star/uno/Sequence.hxx>
 #include <editeng/svxenum.hxx>
 #include <vector>
 #include <memory>
@@ -33,6 +33,7 @@
 #include <DrawDocShell.hxx>

 #include <comphelper/processfactory.hxx>
+#include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/graphicfilter.hxx>
 #include <vcl/svapp.hxx>
@@ -25,6 +25,7 @@
 #include <svx/svdpagv.hxx>
 #include <sfx2/dispatch.hxx>
 #include <sfx2/progress.hxx>
+#include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/help.hxx>
 #include <vcl/svapp.hxx>
@@ -23,6 +23,7 @@
 #include <vcl/bitmap.hxx>
 #include <vcl/filter/PngImageReader.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/graph.hxx>

 namespace sd::slidesorter::cache {

@@ -19,8 +19,10 @@

 #include <Outliner.hxx>
 #include <boost/property_tree/json_parser.hpp>
+#include <basegfx/vector/b2dsize.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <svl/srchitem.hxx>
 #include <svl/intitem.hxx>
@@ -37,6 +37,7 @@
 #include <comphelper/diagnose_ex.hxx>
 #include <tools/stream.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/pdf/PDFErrorType.hxx>
 #include <vcl/pdf/pwdinteract.hxx>
 #include <memory>
 #include <utility>
@@ -26,6 +26,7 @@
 #include <tools/urlobj.hxx>
 #include <svl/inethist.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <officecfg/Office/Common.hxx>

@@ -24,6 +24,7 @@
 #include <o3tl/safeint.hxx>

 #include <utility>
+#include <vcl/animate/Animation.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/graph.hxx>
@@ -12,6 +12,7 @@
 #include <cppunit/plugin/TestPlugIn.h>

 #include <test/bootstrapfixture.hxx>
+#include <vcl/bitmap.hxx>

 #include <com/sun/star/frame/Desktop.hpp>
 #include <unotest/macros_test.hxx>
@@ -33,6 +33,7 @@
 #include "contwnd.hxx"
 #include <svx/svdopath.hxx>
 #include <vcl/alpha.hxx>
+#include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <vcl/animate/Animation.hxx>
 #include <vcl/bitmap/BitmapSharpenFilter.hxx>
 #include <vcl/bitmap/BitmapMedianFilter.hxx>
 #include <vcl/bitmap/BitmapSobelGreyFilter.hxx>
@@ -28,6 +28,7 @@
 #include "gallerydrawmodel.hxx"
 #include <vcl/cvtgrf.hxx>
 #include <vcl/filter/SvmWriter.hxx>
+#include <vcl/gfxlink.hxx>

 #include <sal/log.hxx>

@@ -31,6 +31,7 @@
 #include <sot/storage.hxx>
 #include <sot/formats.hxx>
 #include <sot/filelist.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/virdev.hxx>
 #include <vcl/weld/weld.hxx>
 #include <avmedia/mediawindow.hxx>
@@ -27,11 +27,13 @@

 #include <tools/fract.hxx>
 #include <vcl/virdev.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/graph.hxx>
 #include <svx/svdobj.hxx>
 #include <svx/xdash.hxx>

 #include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/vector/b2dsize.hxx>

 #include <vcl/filter/PDFiumLibrary.hxx>

@@ -19,6 +19,7 @@
 #include <svx/sdr/attribute/sdrallfillattributeshelper.hxx>
 #include <sdr/primitive2d/sdrattributecreator.hxx>
 #include <sdr/primitive2d/sdrdecompositiontools.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/polygon/b2dpolygon.hxx>
 #include <basegfx/utils/bgradient.hxx>
@@ -29,6 +29,7 @@
 #include <svx/svdmodel.hxx>
 #include <svx/svdtrans.hxx>
 #include <svx/xbtmpit.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 namespace sdr::properties
 {
@@ -49,6 +49,7 @@
 #include <memory>
 #include <vector>
 #include <vcl/graph.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <svx/svxids.hrc>
 #include <dstribut_enum.hxx>
 #include <osl/diagnose.h>
@@ -27,6 +27,7 @@
 #include <sot/formats.hxx>
 #include <vcl/GraphicObject.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <sfx2/linkmgr.hxx>
 #include <sfx2/viewsh.hxx>
@@ -24,6 +24,11 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/embeddedfontsmanager.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/pdf/PDFBitmapType.hxx>
+#include <vcl/pdf/PDFFillMode.hxx>
+#include <vcl/pdf/PDFPageObjectType.hxx>
+#include <vcl/pdf/PDFSegmentType.hxx>
+#include <vcl/pdf/PDFTextRenderMode.hxx>
 #include <vcl/vectorgraphicdata.hxx>

 #include <editeng/eeitem.hxx>
@@ -48,6 +48,7 @@

 #include <utility>
 #include <vcl/gdimtf.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/wmf.hxx>
 #include <svtools/embedhlp.hxx>
 #include <sal/log.hxx>
@@ -23,6 +23,7 @@
 #include <comphelper/base64.hxx>
 #include <comphelper/graphicmimetype.hxx>
 #include <tools/debug.hxx>
+#include <vcl/animate/Animation.hxx>
 #include <vcl/animate/AnimationFrame.hxx>
 #include <vcl/virdev.hxx>
 #include <sfx2/docfile.hxx>
@@ -17,6 +17,10 @@
 #include <editeng/colritem.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
+#include <vcl/pdf/PDFAnnotAActionType.hxx>
+#include <vcl/pdf/PDFAnnotationSubType.hxx>
+#include <vcl/pdf/PDFFormFieldType.hxx>
+#include <vcl/pdf/PDFPageObjectType.hxx>

 #include <IDocumentLayoutAccess.hxx>
 #include <rootfrm.hxx>
@@ -20,6 +20,10 @@
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/filter/PDFiumLibrary.hxx>
+#include <vcl/pdf/PDFAnnotAActionType.hxx>
+#include <vcl/pdf/PDFAnnotationSubType.hxx>
+#include <vcl/pdf/PDFFormFieldType.hxx>
+#include <vcl/pdf/PDFPageObjectType.hxx>
 #include <vcl/filter/pdfdocument.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -10,6 +10,7 @@
 #include <swmodeltestbase.hxx>
 #include <o3tl/string_view.hxx>
 #include <vcl/graph.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 namespace
 {
@@ -20,6 +20,9 @@
 #include <officecfg/Office/Common.hxx>
 #include <tools/zcodec.hxx>
 #include <vcl/filter/pdfdocument.hxx>
+#include <vcl/pdf/PDFAnnotationSubType.hxx>
+#include <vcl/pdf/PDFObjectType.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <comphelper/propertysequence.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -21,6 +21,7 @@
 #include <com/sun/star/drawing/PointSequenceSequence.hpp>
 #include <com/sun/star/qa/XDumper.hpp>

+#include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
 #include <officecfg/Office/Common.hxx>

@@ -18,6 +18,7 @@
 */

 #include <hintids.hxx>
+#include <basegfx/vector/b2dsize.hxx>
 #include <osl/diagnose.h>
 #include <tools/poly.hxx>
 #include <svl/stritem.hxx>
@@ -28,6 +28,7 @@
 #include <tools/UnitConversion.hxx>
 #include <svl/fstathelper.hxx>
 #include <vcl/imap.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <sfx2/docfile.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <editeng/boxitem.hxx>
@@ -31,6 +31,7 @@
 #include <editeng/lrspitem.hxx>
 #include <optional>
 #include <o3tl/enumarray.hxx>
+#include <vcl/fntstyle.hxx>

 class SfxItemSet;
 class SwAttrSet;
@@ -85,6 +85,7 @@
 #include <unomap.hxx>
 #include <names.hxx>
 #include <com/sun/star/awt/FontSlant.hpp>
+#include <com/sun/star/awt/GradientStyle.hpp>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::linguistic2;
@@ -24,7 +24,9 @@
 #include <hintids.hxx>
 #include <tools/fract.hxx>
 #include <svl/urihelper.hxx>
+#include <vcl/gfxlink.hxx>
 #include <vcl/svapp.hxx>
+#include <vcl/vectorgraphicdata.hxx>
 #include <sfx2/event.hxx>
 #include <svtools/htmlkywd.hxx>
 #include <svtools/htmlout.hxx>
@@ -144,6 +144,7 @@
 #include <osl/file.hxx>
 #include <utility>
 #include <vcl/embeddedfontsmanager.hxx>
+#include <vcl/vectorgraphicdata.hxx>

 #include <com/sun/star/i18n/ScriptType.hpp>
 #include <com/sun/star/i18n/XBreakIterator.hpp>
@@ -87,6 +87,7 @@
 #include <redline.hxx>
 #include <rtf.hxx>
 #include <vcl/cvtgrf.hxx>
+#include <vcl/gfxlink.hxx>
 #include <oox/drawingml/drawingmltypes.hxx>
 #include <oox/mathml/imexport.hxx>
 #include <com/sun/star/i18n/ScriptType.hpp>
@@ -42,6 +42,7 @@
 #include <sot/exchange.hxx>
 #include <svl/urihelper.hxx>
 #include <sfx2/frmdescr.hxx>
+#include <vcl/mapmod.hxx>

 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -50,6 +50,8 @@
 #include <editeng/editview.hxx>
 #include <editeng/flditem.hxx>

+#include <com/sun/star/awt/GradientStyle.hpp>
+
 #include <uitool.hxx>
 #include <view.hxx>
 #include <wrtsh.hxx>
@@ -14,9 +14,11 @@
 #include <com/sun/star/text/XTextColumns.hpp>
 #include <com/sun/star/text/XTextSection.hpp>

+#include <vcl/bitmap.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/RawBitmap.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
+#include <vcl/graph.hxx>
 #include <unotools/tempfile.hxx>
 #include <tools/color.hxx>
 #include <tools/stream.hxx>
--- a/Show More
+++ b/Show More