tdf#146619 Use more forward declarations in include/vcl/[h-p]*

Found after running bin/find-unneeded-includes --headersfwd include/vcl/[n-p]* Change-Id: If6436f3ef8300693c3869c2521e2fa2aa8a4edc8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/196397 Tested-by: Jenkins Reviewed-by: Gabor Kelemen <gabor.kelemen@collabora.com>
2026-01-14 10:19:31 +01:00
parent ff6043a3db
commit 47fe1cce1b
165 changed files with 220 additions and 23 deletions
@@ -19,6 +19,7 @@

 #include <basic/sberrors.hxx>
 #include <tools/lineend.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/DialogController.hxx>
@@ -31,6 +31,7 @@
 #include <basic/sbxvar.hxx>
 #include <basic/sbx.hxx>
 #include <svl/zforlist.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/fract.hxx>
 #include <o3tl/environment.hxx>
@@ -19,6 +19,7 @@

 #include <basic/sberrors.hxx>
 #include <basic/sbstar.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <sbstdobj.hxx>

@@ -22,6 +22,7 @@

 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/canvastools.hxx>
@@ -22,6 +22,7 @@
 #include <basegfx/utils/canvastools.hxx>
 #include <basegfx/utils/unopolypolygon.hxx>
 #include <canvas/canvastools.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/dibtools.hxx>
@@ -20,6 +20,7 @@
 #include "AccessibleViewForwarder.hxx"
 #include <AccessibleChartView.hxx>

+#include <tools/mapunit.hxx>
 #include <vcl/window.hxx>

 using namespace ::com::sun::star;
@@ -28,6 +28,7 @@
 #include <unonames.hxx>

 #include <svtools/valueset.hxx>
+#include <tools/mapunit.hxx>

 #include <utility>
 #include <vcl/weld/TreeView.hxx>
@@ -19,6 +19,7 @@

 #include <comphelper/diagnose_ex.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/svapp.hxx>
 #include <comphelper/propertysequence.hxx>
@@ -36,6 +36,7 @@

 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <sfx2/filedlghelper.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/urlobj.hxx>
 #include <vcl/bitmap.hxx>
@@ -25,6 +25,7 @@
 #include <svl/cjkoptions.hxx>
 #include <svl/ctloptions.hxx>
 #include <svtools/unitconv.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
 #include <sfx2/htmlmode.hxx>
@@ -20,6 +20,7 @@
 #include "AppView.hxx"
 #include <strings.hrc>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/weld/weld.hxx>
 #include <com/sun/star/sdbcx/XTablesSupplier.hpp>
@@ -21,6 +21,7 @@
 #include <FieldDescControl.hxx>
 #include <FieldControls.hxx>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>
 #include <TableDesignHelpBar.hxx>
 #include <vcl/svapp.hxx>
 #include <FieldDescriptions.hxx>
@@ -22,6 +22,7 @@
 #include <TableController.hxx>
 #include <com/sun/star/util/URL.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
+#include <tools/mapunit.hxx>
 #include <vcl/commandevent.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weldutils.hxx>
@@ -38,6 +38,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <rtl/ustrbuf.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/event.hxx>
 #include <vcl/ptrstyle.hxx>
@@ -15,6 +15,7 @@
 #include <vcl/graphicfilter.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/gdimtf.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <drawinglayer/primitive2d/PolygonStrokePrimitive2D.hxx>
@@ -25,6 +25,7 @@
 #include <cppuhelper/supportsservice.hxx>
 #include <drawinglayer/geometry/viewinformation2d.hxx>
 #include <basegfx/numeric/ftools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/canvastools.hxx>
 #include <com/sun/star/geometry/RealRectangle2D.hpp>
@@ -33,6 +33,7 @@
 #include <processor3d/geometry2dextractor.hxx>
 #include <basegfx/raster/bzpixelraster.hxx>
 #include <utility>
+#include <tools/mapunit.hxx>
 #include <vcl/BitmapTools.hxx>
 #include <vcl/RawBitmap.hxx>
 #include <vcl/skia/SkiaHelper.hxx>
@@ -22,6 +22,7 @@
 #include "vclmetafileprocessor2d.hxx"
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <comphelper/flagguard.hxx>
@@ -23,6 +23,7 @@
 #include <drawinglayer/primitive2d/transformprimitive2d.hxx>
 #include <drawinglayer/processor2d/baseprocessor2d.hxx>
 #include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/virdev.hxx>
@@ -49,6 +49,7 @@
 #include <drawinglayer/primitive2d/epsprimitive2d.hxx>
 #include <sal/log.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <vcl/canvastools.hxx>
 #include <vcl/gradient.hxx>
@@ -19,6 +19,7 @@
 #pragma once

 #include <basegfx/utils/b2dclipstate.hxx>
+#include <basegfx/vector/b2enums.hxx>
 #include <tools/poly.hxx>
 #include <vcl/font.hxx>
 #include <vcl/bitmap.hxx>
@@ -27,6 +28,8 @@
 #include <vcl/metaact.hxx>
 #include <rtl/ref.hxx>

+#include <com/sun/star/drawing/LineCap.hpp>
+
 #include "emfiodllapi.h"

 namespace emfio
@@ -25,6 +25,7 @@
 #include <cppuhelper/supportsservice.hxx>

 #include <utility>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/wmfexternal.hxx>
@@ -23,6 +23,7 @@
 #include <memory>
 #include <basegfx/matrix/b2dhommatrix.hxx>
 #include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/graphictools.hxx>
 #include <vcl/BitmapTools.hxx>
@@ -29,6 +29,7 @@
 #include <rtl/crc.h>
 #include <rtl/tencinfo.h>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <osl/endian.h>
 #include <vcl/gdimtf.hxx>
 #include <vcl/svapp.hxx>
@@ -21,6 +21,7 @@
 #include <o3tl/sprintf.hxx>
 #include <osl/thread.h>
 #include <rtl/math.hxx>
+#include <tools/mapunit.hxx>

 #include <bitmaps.hlst>
 #include <cmath>
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <o3tl/sprintf.hxx>
 #include <tools/config.hxx>
+#include <tools/mapunit.hxx>
 #include <unotools/resmgr.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/dibtools.hxx>
@@ -20,6 +20,7 @@

 #include <osl/file.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/urlobj.hxx>
 #include <tools/poly.hxx>
 #include <comphelper/diagnose_ex.hxx>
@@ -27,6 +28,7 @@
 #include <vcl/canvastools.hxx>
 #include <vcl/mapmod.hxx>
 #include <vcl/gdimtf.hxx>
+#include <vcl/graph.hxx>
 #include <vcl/graphic/GraphicMetadata.hxx>
 #include <vcl/pdf/PDFEncryptionInitialization.hxx>
 #include <rtl/ustring.hxx>
@@ -26,6 +26,7 @@
 #include <vcl/image.hxx>

 #include <memory>
+#include <vector>


 namespace frm
@@ -10,6 +10,7 @@
 #pragma once

 #include <vcl/image.hxx>
+#include <vcl/vclenum.hxx>

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

@@ -19,6 +19,7 @@

 #include <sal/log.hxx>
 #include <tools/debug.hxx>
+#include <vcl/bitmap.hxx>
 #include <vcl/image.hxx>
 #include "ImageList.hxx"

@@ -37,6 +37,7 @@
 #include <com/sun/star/io/IOException.hpp>
 #include <com/sun/star/io/XStream.hpp>
 #include <com/sun/star/ui/ImageType.hpp>
+#include <vcl/bitmap.hxx>
 #include <vcl/graph.hxx>
 #include <vcl/svapp.hxx>
 #include <o3tl/enumrange.hxx>
@@ -342,6 +342,9 @@ excludelist:
    # Needed for macros
    - com/sun/star/awt/Key.hpp
    - com/sun/star/awt/KeyGroup.hpp
+    include/vcl/imap.hxx:
+    # Needed for std::vector<std::unique_ptr<IMapObject>> type
+    - vcl/imapobj.hxx
    include/vcl/transfer.hxx:
    # base class has to be a complete type
    - com/sun/star/datatransfer/XTransferable2.hpp
@@ -25,11 +25,11 @@
 #include <tools/degree.hxx>
 #include <vcl/dllapi.h>

-#include <vcl/vclenum.hxx>
 #include <o3tl/cow_wrapper.hxx>


 class SvStream;
+enum class HatchStyle;

 struct ImplHatch
 {
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_VCL_HEADBAR_HXX
 #define INCLUDED_VCL_HEADBAR_HXX

-#include <comphelper/OAccessible.hxx>
 #include <vcl/dllapi.h>
 #include <tools/link.hxx>
 #include <vcl/window.hxx>
 #include <o3tl/typed_flags_set.hxx>
 #include <memory>

+namespace comphelper { class OAccessible; }
+
 /*************************************************************************

 Description
@@ -19,13 +19,16 @@

 #pragma once

-#include <tools/color.hxx>
+#include <rtl/ustring.hxx>
 #include <tools/link.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/weld/Entry.hxx>

+#include <memory>
+
 namespace weld { class Entry; }

+class Color;
 struct ImplSVEvent;

 namespace weld {
@@ -21,13 +21,15 @@
 #define INCLUDED_VCL_IMAGE_HXX

 #include <vcl/dllapi.h>
-#include <tools/gen.hxx>
-#include <vcl/bitmap.hxx>
-#include <vcl/outdev.hxx>
-
+#include <rtl/ustring.hxx>
 #include <memory>

 class ImplImage;
+class Bitmap;
+class OutputDevice;
+class Point;
+class Size;
+enum class DrawImageFlags;

 namespace com::sun::star::graphic { class XGraphic; }
 namespace com::sun::star::uno { template <class interface_type> class Reference; }
@@ -22,7 +22,8 @@

 #include <vcl/imapobj.hxx>
 #include <vcl/dllapi.h>
-#include <tools/stream.hxx>
+#include <rtl/ustring.hxx>
+#include <tools/long.hxx>
 #include <tools/solar.h>
 #include <memory>
 #include <vector>
@@ -30,6 +31,9 @@
 class Point;
 class Size;
 class Fraction;
+class SvStream;
+enum class IMapFormat;
+enum class StreamMode;

 class VCL_DLLPUBLIC ImageMap final
 {
@@ -21,10 +21,10 @@

 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
-#include <sot/formats.hxx>
 #include <utility>

 class SvStream;
+enum class SotClipboardFormatId : sal_uInt32;

 class INetImage
 {
@@ -23,14 +23,14 @@
 #include <sal/types.h>
 #include <vcl/dllapi.h>
 #include <vcl/vclenum.hxx>
-#include <basegfx/vector/b2enums.hxx>
-#include <com/sun/star/drawing/LineCap.hpp>
 #include <o3tl/cow_wrapper.hxx>

 #include <vector>

 class SvStream;
 namespace basegfx { class B2DPolyPolygon; }
+namespace basegfx { enum class B2DLineJoin; }
+namespace com::sun::star::drawing { enum class LineCap; }

 struct ImplLineInfo
 {
@@ -12,9 +12,13 @@

 #include <sal/config.h>
 #include <vcl/dllapi.h>
-#include <rtl/strbuf.hxx>
 #include <LibreOfficeKit/LibreOfficeKitTypes.h>

+namespace rtl
+{
+class OStringBuffer;
+}
+
 namespace vcl::lok
 {
 bool VCL_DLLPUBLIC isUnipoll();
@@ -21,13 +21,13 @@
 #define INCLUDED_VCL_MAPMOD_HXX

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

 #include <ostream>

 class Point;
 class Fraction;
+enum class MapUnit : sal_uInt8;

 class SAL_WARN_UNUSED VCL_DLLPUBLIC MapMode
 {
@@ -22,6 +22,7 @@
 #include <tools/link.hxx>
 #include <vcl/idle.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>

 class BubbleWindow;
 class MenuBar;
@@ -22,12 +22,10 @@

 #include <sal/config.h>

-#include <rtl/ref.hxx>
 #include <salhelper/simplereferenceobject.hxx>
 #include <tools/poly.hxx>

 #include <vcl/dllapi.h>
-#include <vcl/rendercontext/State.hxx>
 #include <vcl/bitmap.hxx>
 #include <vcl/font.hxx>
 #include <vcl/gdimtf.hxx>
@@ -36,9 +34,7 @@
 #include <vcl/hatch.hxx>
 #include <vcl/kernarray.hxx>
 #include <vcl/lineinfo.hxx>
-#include <vcl/metaactiontypes.hxx>
 #include <vcl/region.hxx>
-#include <vcl/rendercontext/RasterOp.hxx>
 #include <vcl/wall.hxx>
 #include <basegfx/utils/bgradient.hxx>

@@ -47,6 +43,11 @@

 class OutputDevice;
 enum class DrawTextFlags;
+enum class MetaActionType;
+enum class RasterOp;
+namespace rtl { template <class reference_type> class Reference; }
+namespace vcl { enum class PushFlags; }
+namespace vcl::text { enum class ComplexTextLayoutFlags : sal_uInt8; }

 struct ImplMetaReadData
 {
@@ -11,7 +11,16 @@
 #pragma once

 #include <vcl/dllapi.h>
-#include <com/sun/star/task/XInteractionHandler.hpp>
+#include <rtl/ustring.hxx>
+
+namespace com::sun::star::uno
+{
+template <class interface_type> class Reference;
+}
+namespace com::sun::star::task
+{
+class XInteractionHandler;
+}

 namespace vcl::pdf
 {
@@ -26,21 +26,27 @@

 #include <vcl/dllapi.h>
 #include <vcl/font.hxx>
-#include <vcl/outdev.hxx>
-#include <vcl/graph.hxx>
+#include <vcl/kernarray.hxx>
+#include <vcl/rendercontext/DrawTextFlags.hxx>
+#include <vcl/rendercontext/State.hxx>
+#include <vcl/vclptr.hxx>

 #include <com/sun/star/lang/Locale.hpp>
 #include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/uno/Sequence.hxx>

 #include <memory>
 #include <vector>
 #include <set>
+#include <span>

 namespace com::sun::star::beans { class XMaterialHolder; }
 namespace com::sun::star::io { class XOutputStream; }
 namespace com::sun::star::security { class XCertificate; }

+class AlphaMask;
 class GDIMetaFile;
+class Graphic;
 class MapMode;
 class LineInfo;
 namespace tools {
@@ -26,11 +26,9 @@
 #include <rtl/ustring.hxx>
 #include <tools/gen.hxx>
 #include <tools/long.hxx>
-#include <i18nutil/paper.hxx>

 #include <vcl/dllapi.h>
 #include <utility>
-#include <vcl/PrinterSupport.hxx>
 #include <comphelper/errcode.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/prntypes.hxx>
@@ -38,7 +36,6 @@

 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
-#include <com/sun/star/view/PrintableState.hpp>

 #include <memory>
 #include <unordered_map>
@@ -46,10 +43,13 @@
 class GDIMetaFile;
 class SalInfoPrinter;
 struct SalPrinterQueueInfo;
+class PaperInfo;
 class QueueInfo;
 class SalPrinter;
 class VirtualDevice;
 enum class SalPrinterError;
+enum class PrinterSupport;
+enum Paper : unsigned int;

 namespace vcl {
    class PrinterController;
@@ -60,6 +60,7 @@ namespace vcl {
 }

 namespace weld { class Window; }
+namespace com::sun::star::view { enum class PrintableState; }

 class VCL_DLLPUBLIC Printer : public OutputDevice
 {
@@ -25,6 +25,7 @@

 #include <config_options.h>
 #include <accessibility/accessibletablistbox.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/dllapi.h>
 #include <vcl/toolkit/treelistbox.hxx>
 #include <vcl/accessibletableprovider.hxx>
@@ -75,6 +75,7 @@
 #include <lwpfilehdr.hxx>
 #include <lwpglobalmgr.hxx>
 #include <o3tl/sorted_vector.hxx>
+#include <tools/mapunit.hxx>
 #include <sal/log.hxx>
 #include <vcl/print.hxx>

@@ -26,6 +26,7 @@
 #include <com/sun/star/graphic/GraphicMapper.hpp>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <comphelper/seqstream.hxx>
 #include <utility>
@@ -18,6 +18,7 @@
 */

 #include <comphelper/lok.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/decoview.hxx>
 #include <vcl/svapp.hxx>
@@ -19,6 +19,7 @@

 #include <sal/config.h>

+#include <tools/mapunit.hxx>
 #include <vcl/lineinfo.hxx>
 #include <vcl/outdev.hxx>

@@ -28,6 +28,7 @@
 #include <basegfx/polygon/b2dpolygontools.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 #include <tools/lineend.hxx>
+#include <tools/mapunit.hxx>
 #include <utility>
 #include <vcl/outdev.hxx>
 #include <vcl/settings.hxx>
@@ -24,6 +24,7 @@
 #include <comphelper/compbase.hxx>
 #include <com/sun/star/awt/XBitmap.hpp>
 #include <com/sun/star/rendering/XBitmap.hpp>
+#include <com/sun/star/rendering/XCanvas.hpp>

 namespace com::sun::star::drawing { class XDrawPage; }

@@ -31,6 +31,7 @@
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/UnitConversion.hxx>
 #include <com/sun/star/awt/Rectangle.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -40,6 +40,7 @@
 #include <vcl/weld/weldutils.hxx>
 #include <tools/debug.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>

 #include <sdresid.hxx>
@@ -19,7 +19,9 @@

 #pragma once

+#include <tools/color.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>
 #include <memory>

 #include <svl/lstner.hxx>
@@ -21,6 +21,7 @@

 #include "MasterPageContainer.hxx"
 #include <memory>
+#include <vector>

 namespace sd { class PreviewRenderer; }
 class SdDrawDocument;
@@ -23,6 +23,7 @@
 #include "SlsRequestPriorityClass.hxx"
 #include "SlsBitmapFactory.hxx"

+#include <tools/gen.hxx>
 #include <vcl/timer.hxx>
 #include <mutex>

@@ -22,6 +22,7 @@
 #include <model/SlsSharedPageDescriptor.hxx>
 #include <tools/gen.hxx>
 #include <vcl/image.hxx>
+#include <vcl/vclptr.hxx>

 namespace vcl { class Font; }
 namespace sd { class Window; }
@@ -21,6 +21,7 @@
 #include <view/SlsTheme.hxx>
 #include <controller/SlsProperties.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
@@ -10,6 +10,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <tools/datetime.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>

 Size getParagraphPreviewOptimalSize(const OutputDevice& rReference)
@@ -30,6 +30,7 @@
 #include <com/sun/star/view/DuplexMode.hpp>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
+#include <i18nutil/paper.hxx>
 #include <svl/itemset.hxx>
 #include <svl/lstner.hxx>
 #include <unotools/tempfile.hxx>
@@ -41,6 +42,7 @@
 #include <comphelper/interfacecontainer4.hxx>
 #include <cppuhelper/implbase.hxx>
 #include <utility>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>

@@ -30,6 +30,7 @@
 #include <basegfx/vector/b2dsize.hxx>
 #include <osl/diagnose.h>
 #include <comphelper/diagnose_ex.hxx>
+#include <tools/mapunit.hxx>

 #include <com/sun/star/awt/MouseButton.hpp>
 #include <com/sun/star/awt/MouseEvent.hpp>
@@ -21,6 +21,7 @@
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <svtools/brwbox.hxx>
 #include <svtools/brwhead.hxx>
 #include <svtools/colorcfg.hxx>
@@ -18,6 +18,7 @@
 */

 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/poly.hxx>
 #include <vcl/event.hxx>
 #include <vcl/themecolors.hxx>
@@ -27,6 +27,7 @@
 #include <vcl/QueueInfo.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/print.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/event.hxx>
 #include <sal/log.hxx>

@@ -23,6 +23,7 @@

 #include <comphelper/propertyvalue.hxx>
 #include <o3tl/safeint.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <tools/fract.hxx>
 #include <utility>
@@ -34,6 +34,7 @@
 #include <svl/urihelper.hxx>
 #include <rtl/character.hxx>
 #include <tools/debug.hxx>
+#include <tools/stream.hxx>
 #include <o3tl/string_view.hxx>

 #include <sstream>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <tools/mapunit.hxx>
 #include <sfx2/dialoghelper.hxx>
 #include <svx/paraprev.hxx>
 #include <vcl/outdev.hxx>
@@ -17,6 +17,7 @@
 *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 */

+#include <tools/mapunit.hxx>
 #include <vcl/metric.hxx>
 #include <vcl/outdev.hxx>
 #include <vcl/svapp.hxx>
@@ -59,6 +59,7 @@
 #include <vcl/unohelp.hxx>
 #include <vcl/svapp.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <sal/macros.h>

@@ -21,6 +21,7 @@
 #include <svx/sdr/overlay/overlaymanager.hxx>
 #include <vcl/outdev.hxx>
 #include <tools/gen.hxx>
+#include <tools/mapunit.hxx>

 #include <drawinglayer/processor2d/hittestprocessor2d.hxx>
 #include <comphelper/lok.hxx>
@@ -19,6 +19,7 @@
 #include "LineWidthValueSet.hxx"

 #include <i18nlangtag/mslangid.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/event.hxx>
 #include <vcl/settings.hxx>
 #include <vcl/svapp.hxx>
@@ -17,6 +17,7 @@
 #include <svtools/popupwindowcontroller.hxx>
 #include <svtools/toolbarmenu.hxx>
 #include <svx/numvset.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/commandinfoprovider.hxx>
 #include <vcl/toolbox.hxx>
 #include <vcl/settings.hxx>
@@ -31,6 +31,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/propertyvalue.hxx>
 #include <svtools/toolbarmenu.hxx>
+#include <tools/mapunit.hxx>
 #include <com/sun/star/util/URLTransformer.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>

@@ -19,6 +19,7 @@

 #include <XPropertyTable.hxx>

+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>

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

 #include <XPropertyTable.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>

 #include <vcl/virdev.hxx>
@@ -20,6 +20,7 @@
 #include <swtypes.hxx>

 #include <editeng/unolingu.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/graph.hxx>

@@ -39,6 +39,7 @@
 #include <svl/stritem.hxx>
 #include <svtools/ehdl.hxx>
 #include <svtools/sfxecode.hxx>
+#include <vcl/PrinterSupport.hxx>
 #include <vcl/stdtext.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/weld/weld.hxx>
@@ -38,6 +38,7 @@
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/weakagg.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <vcl/outdev.hxx>
 #include <comphelper/types.hxx>
@@ -35,6 +35,7 @@
 #include <cppuhelper/queryinterface.hxx>
 #include <cppuhelper/weak.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/sequence.hxx>
 #include <vcl/outdev.hxx>

@@ -26,6 +26,7 @@
 #include <controls/table/gridtablerenderer.hxx>
 #include "unocontroltablemodel.hxx"
 #include <sal/log.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/diagnose_ex.hxx>
 #include <helper/property.hxx>
 #include <com/sun/star/awt/grid/XGridColumn.hpp>
@@ -33,6 +33,7 @@
 #include <com/sun/star/accessibility/AccessibleTableModelChangeType.hpp>

 #include <comphelper/flagguard.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/toolkit/scrbar.hxx>
 #include <vcl/seleng.hxx>
 #include <vcl/settings.hxx>
@@ -27,6 +27,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <cppuhelper/supportsservice.hxx>
 #include <tools/debug.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/outdev.hxx>

 #include <controls/controlmodelcontainerbase.hxx>
@@ -21,6 +21,7 @@

 #include <vcl/dllapi.h>
 #include <vcl/GraphicExternalLink.hxx>
+#include <tools/mapunit.hxx>

 struct SwapInfo
 {
@@ -24,6 +24,7 @@
 #include <sal/macros.h>
 #include <osl/diagnose.h>
 #include <tools/long.hxx>
+#include <tools/mapunit.hxx>

 #include <osx/salinst.h>
 #include <osx/salprn.h>
@@ -38,6 +39,7 @@
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/awt/Size.hpp>
 #include <com/sun/star/uno/Sequence.hxx>
+#include <com/sun/star/view/PrintableState.hpp>

 #include <algorithm>
 #include <cstdlib>
@@ -18,6 +18,7 @@

 #include <vcl/graphicfilter.hxx>
 #include <tools/color.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>

 using namespace css;
@@ -26,6 +26,7 @@
 #include <comphelper/hash.hxx>
 #include <unotools/tempfile.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>
 #include <vcl/wmf.hxx>
 #include "CommonTools.hxx"

@@ -21,6 +21,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/gdimtf.hxx>
 #include <comphelper/hash.hxx>
+#include <tools/mapunit.hxx>
 #include <tools/vcompat.hxx>
 #include <comphelper/fileformat.h>
 #include <tools/fract.hxx>
@@ -11,6 +11,7 @@

 #include <test/bootstrapfixture.hxx>

+#include <tools/mapunit.hxx>
 #include <tools/stream.hxx>
 #include <unotest/directories.hxx>
 #include <vcl/graph.hxx>
@@ -12,6 +12,7 @@
 #include <vcl/gradient.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
+#include <vcl/metaactiontypes.hxx>

 class VclGradientTest : public test::BootstrapFixture
 {
@@ -17,6 +17,7 @@
 #include <basegfx/polygon/b2dpolypolygon.hxx>
 #include <basegfx/vector/b2enums.hxx>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <tools/mapunit.hxx>

 #include <vcl/gradient.hxx>
 #include <vcl/lineinfo.hxx>
@@ -23,6 +23,7 @@
 #include <vcl/virdev.hxx>
 #include <vcl/filter/PngImageWriter.hxx>
 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/filter/SvmReader.hxx>
 #include <vcl/filter/SvmWriter.hxx>
@@ -12,6 +12,7 @@
 #include <cppunit/plugin/TestPlugIn.h>

 #include <tools/fract.hxx>
+#include <tools/mapunit.hxx>

 #include <vcl/outdev.hxx>
 #include <vcl/virdev.hxx>
@@ -29,6 +29,7 @@
 #include <comphelper/processfactory.hxx>
 #include <o3tl/test_info.hxx>
 #include <rtl/bootstrap.hxx>
+#include <tools/mapunit.hxx>

 #include <i18nlangtag/mslangid.hxx>
 #include <i18nlangtag/languagetag.hxx>
@@ -14,6 +14,7 @@
 #include <utility>

 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/BitmapTools.hxx>

 #include <sal/log.hxx>
@@ -22,6 +22,7 @@
 #include <tools/link.hxx>
 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>
 #include <vcl/gdimtf.hxx>
 #include <vcl/metaact.hxx>
 #include <vcl/virdev.hxx>
@@ -23,6 +23,7 @@
 #include <sal/log.hxx>
 #include <osl/diagnose.h>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>

 #include <utility>
 #include <vcl/alpha.hxx>
@@ -19,6 +19,7 @@

 #include <tools/poly.hxx>
 #include <tools/helpers.hxx>
+#include <tools/mapunit.hxx>

 #include <vcl/bitmap.hxx>
 #include <vcl/alpha.hxx>
@@ -30,6 +30,7 @@
 #include <tools/fract.hxx>
 #include <tools/helpers.hxx>
 #include <tools/GenericTypeSerializer.hxx>
+#include <tools/mapunit.hxx>
 #include <comphelper/configuration.hxx>
 #include <vcl/alpha.hxx>
 #include <vcl/bitmap.hxx>
--- a/Show More
+++ b/Show More