tdf#42949 Fix IWYU warnings in include/[t-x]*/*hxx
Recheck after 7-0 branchoff
Also drop the now unused file include/vcl/field.hxx
Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.
Change-Id: I9e54c82f50d1e02a0f99858939cac999fc66f7de
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99261
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx
index c602435..2d8435d 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 <tools/UnitConversion.hxx>
#include <memory>
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index 9abd756..c2de665 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -27,6 +27,7 @@
#include <vcl/weld.hxx>
#include <sfx2/htmlmode.hxx>
#include <sal/macros.h>
#include <osl/diagnose.h>
#include <svx/strings.hrc>
#include <svx/dialmgr.hxx>
diff --git a/dbaccess/source/ui/inc/TableWindowListBox.hxx b/dbaccess/source/ui/inc/TableWindowListBox.hxx
index 1e0f8bd..249a1de 100644
--- a/dbaccess/source/ui/inc/TableWindowListBox.hxx
+++ b/dbaccess/source/ui/inc/TableWindowListBox.hxx
@@ -20,6 +20,7 @@
#define INCLUDED_DBACCESS_SOURCE_UI_INC_TABLEWINDOWLISTBOX_HXX
#include <vcl/treelistbox.hxx>
#include <vcl/timer.hxx>
#include "callbacks.hxx"
struct AcceptDropEvent;
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx
index d931ed6..53b3b0d 100644
--- a/editeng/source/items/frmitems.cxx
+++ b/editeng/source/items/frmitems.cxx
@@ -45,6 +45,7 @@
#include <rtl/math.hxx>
#include <rtl/ustring.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/graphicfilter.hxx>
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
diff --git a/editeng/source/items/numitem.cxx b/editeng/source/items/numitem.cxx
index d6f1769..91a6cee 100644
--- a/editeng/source/items/numitem.cxx
+++ b/editeng/source/items/numitem.cxx
@@ -45,6 +45,7 @@
#include <tools/stream.hxx>
#include <tools/debug.hxx>
#include <tools/GenericTypeSerializer.hxx>
#include <tools/UnitConversion.hxx>
#include <unotools/configmgr.hxx>
#include <libxml/xmlwriter.h>
#include <editeng/unonrule.hxx>
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index 0e1e94f..1b1eb2a 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -27,6 +27,7 @@
#include <unotools/localedatawrapper.hxx>
#include <unotools/syslocale.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <svl/itempool.hxx>
#include <svl/memberid.h>
#include <editeng/editrids.hrc>
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 2e2cf4f..fdf0d0f 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -34,6 +34,7 @@
#include <editeng/editids.hrc>
#include <editeng/editrids.hrc>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <rtl/math.hxx>
#include <rtl/ustring.hxx>
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 503224c..ef51e0b 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -23,6 +23,7 @@
#include <vcl/svapp.hxx>
#include <unotools/tempfile.hxx>
#include <tools/diagnose_ex.h>
#include <tools/UnitConversion.hxx>
#include <math.h>
#include <editeng/eeitem.hxx>
#include <editeng/editdata.hxx>
diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index ff20b06..ce376cb 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -236,6 +236,9 @@ excludelist:
include/tools/svlibrary.h:
# Used behind #ifndef
- osl/module.h
include/tools/simdsupport.hxx:
# Needed for CPU intrinsics detection to work
- emmintrin.h
include/unotools/accessiblestatesethelper.hxx:
# base class has to be a complete type
- com/sun/star/accessibility/XAccessibleStateSet.hpp
@@ -906,6 +909,8 @@ excludelist:
- com/sun/star/drawing/CameraGeometry.hpp
- com/sun/star/text/WritingMode.hpp
- com/sun/star/graphic/XGraphic.hpp
- com/sun/star/drawing/QRCode.hpp
- svx/svddef.hxx
include/svx/xdef.hxx:
# Needed for macro defines
- svl/typedwhich.hxx
diff --git a/include/sfx2/AccessibilityCheck.hxx b/include/sfx2/AccessibilityCheck.hxx
index 6de1069..185bc05 100644
--- a/include/sfx2/AccessibilityCheck.hxx
+++ b/include/sfx2/AccessibilityCheck.hxx
@@ -12,9 +12,6 @@
#define INCLUDED_SFX2_ACCESSIBILITYCHECKDIALOG_HXX
#include <sfx2/dllapi.h>
#include <vector>
#include <memory>
#include <rtl/ustring.hxx>
#include <sfx2/AccessibilityIssue.hxx>
namespace sfx
diff --git a/include/sfx2/charmappopup.hxx b/include/sfx2/charmappopup.hxx
index e9bb624..a826655 100644
--- a/include/sfx2/charmappopup.hxx
+++ b/include/sfx2/charmappopup.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SFX2_INC_CHARMAPPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <sfx2/dllapi.h>
class CharmapPopup final : public svt::PopupWindowController
{
diff --git a/include/sfx2/dinfdlg.hxx b/include/sfx2/dinfdlg.hxx
index 5f1efdf..5214342 100644
--- a/include/sfx2/dinfdlg.hxx
+++ b/include/sfx2/dinfdlg.hxx
@@ -30,6 +30,7 @@
#include <svl/stritem.hxx>
#include <svl/zforlist.hxx>
#include <svtools/ctrlbox.hxx>
#include <vcl/idle.hxx>
diff --git a/include/sfx2/emojipopup.hxx b/include/sfx2/emojipopup.hxx
index 04f6fe7..aecdcba 100644
--- a/include/sfx2/emojipopup.hxx
+++ b/include/sfx2/emojipopup.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SFX2_INC_EMOJIPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <sfx2/dllapi.h>
class EmojiPopup final : public svt::PopupWindowController
{
diff --git a/include/sfx2/frmhtml.hxx b/include/sfx2/frmhtml.hxx
index c489390..25f470a 100644
--- a/include/sfx2/frmhtml.hxx
+++ b/include/sfx2/frmhtml.hxx
@@ -23,7 +23,7 @@
#include <sal/config.h>
#include <sfx2/dllapi.h>
#include <sfx2/sfxhtml.hxx>
#include <svtools/parhtml.hxx>
class SfxFrameDescriptor;
diff --git a/include/sfx2/sidebar/TabBar.hxx b/include/sfx2/sidebar/TabBar.hxx
index 0551678..1f24d98 100644
--- a/include/sfx2/sidebar/TabBar.hxx
+++ b/include/sfx2/sidebar/TabBar.hxx
@@ -23,7 +23,7 @@
#include <sfx2//dllapi.h>
#include <sfx2/sidebar/ResourceManager.hxx>
#include <vcl/button.hxx>
#include <vcl/menu.hxx>
#include <vcl/window.hxx>
diff --git a/include/sfx2/tbxctrl.hxx b/include/sfx2/tbxctrl.hxx
index 4785c4d..9ce86c6 100644
--- a/include/sfx2/tbxctrl.hxx
+++ b/include/sfx2/tbxctrl.hxx
@@ -25,7 +25,6 @@
#include <sal/types.h>
#include <svl/poolitem.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <rtl/ref.hxx>
#include <vcl/window.hxx>
namespace com::sun::star::frame { class XDispatchProvider; }
diff --git a/include/sfx2/weldutils.hxx b/include/sfx2/weldutils.hxx
index c72a473..799d203 100644
--- a/include/sfx2/weldutils.hxx
+++ b/include/sfx2/weldutils.hxx
@@ -17,7 +17,6 @@
#include <tools/link.hxx>
#include <sfx2/dllapi.h>
#include <svtools/miscopt.hxx>
#include <vcl/svapp.hxx>
#include <vcl/weld.hxx>
#include <map>
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index 550c88d..447e6d7 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -21,10 +21,8 @@
#include <config_options.h>
#include <svl/svldllapi.h>
#include <svl/eitem.hxx>
#include <svl/poolitem.hxx>
#include <cstddef>
#include <memory>
#include <vector>
class UNLESS_MERGELIBS(SVL_DLLPUBLIC) SfxAllEnumItem final : public SfxPoolItem
diff --git a/include/svtools/framestatuslistener.hxx b/include/svtools/framestatuslistener.hxx
index 3f3e446..32d4c4d 100644
--- a/include/svtools/framestatuslistener.hxx
+++ b/include/svtools/framestatuslistener.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX
#define INCLUDED_SVTOOLS_FRAMESTATUSLISTENER_HXX
#include <svtools/svtdllapi.h>
#include <com/sun/star/frame/XFrameActionListener.hpp>
#include <com/sun/star/frame/XStatusListener.hpp>
#include <cppuhelper/weak.hxx>
diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 1c1e2d2..5f2f643 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -30,7 +30,6 @@
#include <comphelper/uno3.hxx>
#include <comphelper/propertycontainer.hxx>
#include <comphelper/broadcasthelper.hxx>
#include <tools/link.hxx>
#include <vcl/weld.hxx>
namespace com :: sun :: star :: awt { class XWindow; }
diff --git a/include/svtools/sampletext.hxx b/include/svtools/sampletext.hxx
index 9c32cba..3d2ed50 100644
--- a/include/svtools/sampletext.hxx
+++ b/include/svtools/sampletext.hxx
@@ -12,7 +12,6 @@
#include <svtools/svtdllapi.h>
#include <rtl/ustring.hxx>
#include <unicode/uscript.h>
#include <i18nlangtag/lang.h>
#include <vcl/fontcapabilities.hxx>
class OutputDevice;
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 6c6055d..410003e 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVTOOLS_VALUESET_HXX
#define INCLUDED_SVTOOLS_VALUESET_HXX
#include <config_options.h>
#include <svtools/svtdllapi.h>
#include <tools/wintypes.hxx>
#include <vcl/customweld.hxx>
diff --git a/include/svx/AccessibilityCheckDialog.hxx b/include/svx/AccessibilityCheckDialog.hxx
index 9c17aba..5227cbe 100644
--- a/include/svx/AccessibilityCheckDialog.hxx
+++ b/include/svx/AccessibilityCheckDialog.hxx
@@ -11,10 +11,8 @@
#ifndef INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
#define INCLUDED_SVX_ACCESSIBILITYCHECKDIALOG_HXX
#include <sfx2/AccessibilityCheck.hxx>
#include <sal/types.h>
#include <sfx2/AccessibilityIssue.hxx>
#include <svx/svxdllapi.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <vcl/weld.hxx>
diff --git a/include/svx/DiagramDataInterface.hxx b/include/svx/DiagramDataInterface.hxx
index f64dc3a..7279ec8 100644
--- a/include/svx/DiagramDataInterface.hxx
+++ b/include/svx/DiagramDataInterface.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
#define INCLUDED_SVX_DIAGRAMDATAINTERFACE_HXX
#include <rtl/ustring.h>
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <utility>
diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx
index c505eb41..96417c7 100644
--- a/include/svx/Palette.hxx
+++ b/include/svx/Palette.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_PALETTE_HXX
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
class Color;
class SvxColorValueSet;
diff --git a/include/svx/ParaLineSpacingPopup.hxx b/include/svx/ParaLineSpacingPopup.hxx
index a595b95..b76b3ad 100644
--- a/include/svx/ParaLineSpacingPopup.hxx
+++ b/include/svx/ParaLineSpacingPopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_SOURCE_SIDEBAR_PARAGRAPH_PARALINESPACINGPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/TextCharacterSpacingPopup.hxx b/include/svx/TextCharacterSpacingPopup.hxx
index 0c7b5b0..4ed1919 100644
--- a/include/svx/TextCharacterSpacingPopup.hxx
+++ b/include/svx/TextCharacterSpacingPopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_TEXTCHARACTERSPACINGPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/TextUnderlinePopup.hxx b/include/svx/TextUnderlinePopup.hxx
index 1d4074f..530b486a 100644
--- a/include/svx/TextUnderlinePopup.hxx
+++ b/include/svx/TextUnderlinePopup.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_SIDEBAR_TEXT_TEXTUNDERLINEPOPUP_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <svx/svxdllapi.h>
namespace svx {
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index dde83d1..7bb6a3d 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -30,7 +30,6 @@
#include <vcl/bitmapex.hxx>
#include <vcl/gdimtf.hxx>
#include <vcl/graph.hxx>
#include <vcl/vclptr.hxx>
#include <memory>
namespace vcl { class Window; }
diff --git a/include/svx/charthelper.hxx b/include/svx/charthelper.hxx
index e587dbc..3ad1fba 100644
--- a/include/svx/charthelper.hxx
+++ b/include/svx/charthelper.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_CHARTHELPER_HXX
#define INCLUDED_SVX_CHARTHELPER_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <sal/types.h>
#include <svx/svxdllapi.h>
diff --git a/include/svx/dialcontrol.hxx b/include/svx/dialcontrol.hxx
index d4eb266..29c2555 100644
--- a/include/svx/dialcontrol.hxx
+++ b/include/svx/dialcontrol.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_DIALCONTROL_HXX
#define INCLUDED_SVX_DIALCONTROL_HXX
#include <config_options.h>
#include <memory>
#include <vcl/customweld.hxx>
#include <vcl/virdev.hxx>
diff --git a/include/svx/framelinkarray.hxx b/include/svx/framelinkarray.hxx
index 194383b..7c40b33 100644
--- a/include/svx/framelinkarray.hxx
+++ b/include/svx/framelinkarray.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_FRAMELINKARRAY_HXX
#define INCLUDED_SVX_FRAMELINKARRAY_HXX
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <svx/svxdllapi.h>
#include <svx/rotmodit.hxx>
#include <memory>
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index 4bb37f6..61fd629 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -22,7 +22,6 @@
#include <vcl/graph.hxx>
#include <vcl/customweld.hxx>
#include <vcl/transfer.hxx>
#include <svtools/valueset.hxx>
#include <vcl/GraphicObject.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index c0c1bf2..4c3748c 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -26,7 +26,7 @@
#include <tools/debug.hxx>
#include <tools/urlobj.hxx>
#include <vcl/salctype.hxx>
#include <vcl/bitmapex.hxx>
#include <svl/SfxBroadcaster.hxx>
#include <svx/galmisc.hxx>
#include <memory>
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index a270d25..32e5f5b 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -19,10 +19,10 @@
#ifndef INCLUDED_SVX_ITEMWIN_HXX
#define INCLUDED_SVX_ITEMWIN_HXX
#include <vcl/InterimItemWindow.hxx>
#include <svtools/toolbarmenu.hxx>
#include <svx/dlgctrl.hxx>
#include <svx/svxdllapi.h>
#include <svx/xtable.hxx>
#include <vcl/customweld.hxx>
class SfxObjectShell;
class ValueSet;
diff --git a/include/svx/layctrl.hxx b/include/svx/layctrl.hxx
index 9b9e5fe..a6caf1e 100644
--- a/include/svx/layctrl.hxx
+++ b/include/svx/layctrl.hxx
@@ -20,7 +20,6 @@
#define INCLUDED_SVX_LAYCTRL_HXX
#include <svtools/popupwindowcontroller.hxx>
#include <svx/svxdllapi.h>
class SvxTableToolBoxControl final : public svt::PopupWindowController
{
diff --git a/include/svx/lboxctrl.hxx b/include/svx/lboxctrl.hxx
index 0b4b721..6799078 100644
--- a/include/svx/lboxctrl.hxx
+++ b/include/svx/lboxctrl.hxx
@@ -23,7 +23,6 @@
#include <rtl/ustring.hxx>
#include <vector>
#include <svtools/popupwindowcontroller.hxx>
#include <svx/svxdllapi.h>
class ToolBox;
class SvxPopupWindowListBox;
diff --git a/include/svx/legacyitem.hxx b/include/svx/legacyitem.hxx
index 4a96612..b8d1362 100644
--- a/include/svx/legacyitem.hxx
+++ b/include/svx/legacyitem.hxx
@@ -19,7 +19,7 @@
#ifndef INCLUDED_SVX_LEGACYITEM_HXX
#define INCLUDED_SVX_LEGACYITEM_HXX
#include <svx/svxdllapi.h>
#include <sal/types.h>
//////////////////////////////////////////////////////////////////////////////
// // svx
diff --git a/include/svx/sdgmoitm.hxx b/include/svx/sdgmoitm.hxx
index e04872f..9d1fbc8 100644
--- a/include/svx/sdgmoitm.hxx
+++ b/include/svx/sdgmoitm.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SVX_SDGMOITM_HXX
#define INCLUDED_SVX_SDGMOITM_HXX
#include <vcl/GraphicObject.hxx>
#include <vcl/GraphicAttributes.hxx>
#include <svl/eitem.hxx>
#include <svx/svddef.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/sdr/animation/animationstate.hxx b/include/svx/sdr/animation/animationstate.hxx
index 3284a68..078cc63 100644
--- a/include/svx/sdr/animation/animationstate.hxx
+++ b/include/svx/sdr/animation/animationstate.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <svx/sdr/animation/scheduler.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::contact { class ViewObjectContact; }
diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
index 6b72b7d..c8c22af 100644
--- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
+++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx
@@ -22,7 +22,7 @@
#include <svx/svxdllapi.h>
#include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <svl/itemset.hxx>
#include <memory>
diff --git a/include/svx/sdr/contact/viewcontact.hxx b/include/svx/sdr/contact/viewcontact.hxx
index c3e9328..de3ceb3 100644
--- a/include/svx/sdr/contact/viewcontact.hxx
+++ b/include/svx/sdr/contact/viewcontact.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
#include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
class SdrLayerIDSet;
class SdrPage;
diff --git a/include/svx/sdr/contact/viewobjectcontact.hxx b/include/svx/sdr/contact/viewobjectcontact.hxx
index 9c806aa0..a12cb0b 100644
--- a/include/svx/sdr/contact/viewobjectcontact.hxx
+++ b/include/svx/sdr/contact/viewobjectcontact.hxx
@@ -22,7 +22,7 @@
#include <memory>
#include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace vcl { class Region; }
diff --git a/include/svx/sdr/contact/viewobjectcontactredirector.hxx b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
index 1dc69d2..a07217c 100644
--- a/include/svx/sdr/contact/viewobjectcontactredirector.hxx
+++ b/include/svx/sdr/contact/viewobjectcontactredirector.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_SDR_CONTACT_VIEWOBJECTCONTACTREDIRECTOR_HXX
#include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::contact {
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index f8cf8be..d4ef566 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -25,7 +25,7 @@
#include <tools/color.hxx>
#include <svx/sdr/animation/scheduler.hxx>
#include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <vector>
diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
index 5562fa3..fd5a87a 100644
--- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
+++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SVX_SDR_OVERLAY_OVERLAYPRIMITIVE2DSEQUENCEOBJECT_HXX
#include <svx/sdr/overlay/overlayobject.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
namespace sdr::overlay
diff --git a/include/svx/selectioncontroller.hxx b/include/svx/selectioncontroller.hxx
index ded8adf..c9e12c3 100644
--- a/include/svx/selectioncontroller.hxx
+++ b/include/svx/selectioncontroller.hxx
@@ -22,7 +22,6 @@
#include <svx/svxdllapi.h>
#include <cppuhelper/weak.hxx>
#include <memory>
class KeyEvent;
class MouseEvent;
diff --git a/include/svx/shapepropertynotifier.hxx b/include/svx/shapepropertynotifier.hxx
index 455acdde..bdef4e1 100644
--- a/include/svx/shapepropertynotifier.hxx
+++ b/include/svx/shapepropertynotifier.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
#define INCLUDED_SVX_SHAPEPROPERTYNOTIFIER_HXX
#include <config_options.h>
#include <svx/svxdllapi.h>
#include <svx/shapeproperty.hxx>
#include <rtl/ustring.hxx>
diff --git a/include/svx/sidebar/AreaPropertyPanelBase.hxx b/include/svx/sidebar/AreaPropertyPanelBase.hxx
index 2ea0356..a3103b6 100644
--- a/include/svx/sidebar/AreaPropertyPanelBase.hxx
+++ b/include/svx/sidebar/AreaPropertyPanelBase.hxx
@@ -22,10 +22,8 @@
#include <memory>
#include <svx/sidebar/AreaTransparencyGradientPopup.hxx>
#include <sfx2/sidebar/ControllerItem.hxx>
#include <sfx2/sidebar/SidebarToolBox.hxx>
#include <svx/colorbox.hxx>
#include <svx/xgrad.hxx>
#include <svx/itemwin.hxx>
#include <svx/xfillit0.hxx>
#include <svx/xflclit.hxx>
#include <svx/xflgrit.hxx>
diff --git a/include/svx/sidebar/LinePropertyPanelBase.hxx b/include/svx/sidebar/LinePropertyPanelBase.hxx
index 1d73c76..359b822 100644
--- a/include/svx/sidebar/LinePropertyPanelBase.hxx
+++ b/include/svx/sidebar/LinePropertyPanelBase.hxx
@@ -22,9 +22,7 @@
#include <vcl/weld.hxx>
#include <memory>
#include <svl/poolitem.hxx>
#include <svx/dlgctrl.hxx>
#include <sfx2/sidebar/PanelLayout.hxx>
#include <svx/xtable.hxx>
#include <svx/sidebar/LineWidthPopup.hxx>
#include <svx/svxdllapi.h>
diff --git a/include/svx/signaturelinehelper.hxx b/include/svx/signaturelinehelper.hxx
index 70ddbfb..b4a3474 100644
--- a/include/svx/signaturelinehelper.hxx
+++ b/include/svx/signaturelinehelper.hxx
@@ -13,7 +13,6 @@
#include <rtl/ustring.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/awt/XWindow.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/security/XCertificate.hpp>
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index f58fd0f..ef2be49 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -23,14 +23,12 @@
#include <com/sun/star/io/XInputStream.hpp>
#include <com/sun/star/graphic/XGraphic.hpp>
#include <com/sun/star/drawing/QRCode.hpp>
#include <com/sun/star/uno/Sequence.hxx>
#include <vcl/graph.hxx>
#include <svx/svdorect.hxx>
#include <vcl/GraphicObject.hxx>
#include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
#include <cstddef>
namespace sdr
{
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 6f1804b..41e9baa 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -30,7 +30,7 @@
#include <svl/style.hxx>
#include <svx/svdtext.hxx>
#include <svx/svxdllapi.h>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <drawinglayer/primitive2d/Primitive2DContainer.hxx>
#include <memory>
#include <vector>
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index 3614ae4..c020ccd 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -132,7 +132,6 @@
#include <config_options.h>
#include <svl/style.hxx>
#include <sfx2/tbxctrl.hxx>
#include <svx/svxdllapi.h>
#include <com/sun/star/frame/XSubToolbarController.hpp>
#include <svtools/popupwindowcontroller.hxx>
diff --git a/include/svx/verttexttbxctrl.hxx b/include/svx/verttexttbxctrl.hxx
index 6dc437e..324e650 100644
--- a/include/svx/verttexttbxctrl.hxx
+++ b/include/svx/verttexttbxctrl.hxx
@@ -24,8 +24,6 @@
#include <cppuhelper/implbase.hxx>
#include <svtools/toolboxcontroller.hxx>
#include <svx/svxdllapi.h>
//HACK to avoid duplicate ImplInheritanceHelper symbols with MSVC:
class SAL_DLLPUBLIC_TEMPLATE SvxVertCTLTextTbxCtrl_Base:
public cppu::ImplInheritanceHelper<svt::ToolboxController, css::lang::XServiceInfo>
diff --git a/include/svx/xpool.hxx b/include/svx/xpool.hxx
index a7ec8c6..0b31df1 100644
--- a/include/svx/xpool.hxx
+++ b/include/svx/xpool.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_SVX_XPOOL_HXX
#include <svl/itempool.hxx>
#include <svx/svxdllapi.h>
#include <memory>
/*************************************************************************
diff --git a/include/test/xmldocptr.hxx b/include/test/xmldocptr.hxx
index abca726..bb41ddb 100644
--- a/include/test/xmldocptr.hxx
+++ b/include/test/xmldocptr.hxx
@@ -9,6 +9,7 @@
#pragma once
#include <memory>
#include <libxml/tree.h>
struct xmlDocDeleter
{
diff --git a/include/toolkit/awt/vclxdevice.hxx b/include/toolkit/awt/vclxdevice.hxx
index 59d1a65..6db587343 100644
--- a/include/toolkit/awt/vclxdevice.hxx
+++ b/include/toolkit/awt/vclxdevice.hxx
@@ -22,7 +22,6 @@
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XDevice.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/include/toolkit/awt/vclxfont.hxx b/include/toolkit/awt/vclxfont.hxx
index a0f609a..ea7c355 100644
--- a/include/toolkit/awt/vclxfont.hxx
+++ b/include/toolkit/awt/vclxfont.hxx
@@ -23,7 +23,6 @@
#include <memory>
#include <toolkit/dllapi.h>
#include <com/sun/star/awt/XFont2.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/implbase.hxx>
diff --git a/include/tools/UnitConversion.hxx b/include/tools/UnitConversion.hxx
index 2585fec..028e5dc 100644
--- a/include/tools/UnitConversion.hxx
+++ b/include/tools/UnitConversion.hxx
@@ -10,6 +10,8 @@
#pragma once
#include <sal/types.h>
constexpr sal_Int64 convertTwipToMm100(sal_Int64 n)
{
return (n >= 0) ? (n * 127 + 36) / 72 : (n * 127 - 36) / 72;
diff --git a/include/tools/fract.hxx b/include/tools/fract.hxx
index ed1f5f0..7caf9c6 100644
--- a/include/tools/fract.hxx
+++ b/include/tools/fract.hxx
@@ -21,7 +21,6 @@
#include <sal/types.h>
#include <tools/toolsdllapi.h>
#include <memory>
#include <ostream>
#include <type_traits>
diff --git a/include/tools/gen.hxx b/include/tools/gen.hxx
index e069717..4f6927c 100644
--- a/include/tools/gen.hxx
+++ b/include/tools/gen.hxx
@@ -25,7 +25,6 @@
#include <algorithm>
#include <ostream>
#include <config_options.h>
#include <cassert>
class SvStream;
namespace rtl
diff --git a/include/tools/json_writer.hxx b/include/tools/json_writer.hxx
index 3b27a18..10e1a3a7 100644
--- a/include/tools/json_writer.hxx
+++ b/include/tools/json_writer.hxx
@@ -10,7 +10,6 @@
#include <tools/toolsdllapi.h>
#include <rtl/ustring.hxx>
#include <algorithm>
namespace rtl
{
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx
index 6112bc7..fcaa03b 100644
--- a/include/tools/mapunit.hxx
+++ b/include/tools/mapunit.hxx
@@ -20,9 +20,6 @@
#ifndef INCLUDED_TOOLS_MAPUNIT_HXX
#define INCLUDED_TOOLS_MAPUNIT_HXX
#include <sal/types.h>
#include <tools/UnitConversion.hxx>
enum class MapUnit
{
Map100thMM, Map10thMM, MapMM, MapCM,
diff --git a/include/ucbhelper/contentidentifier.hxx b/include/ucbhelper/contentidentifier.hxx
index 1ee01b5a..20f3b5e 100644
--- a/include/ucbhelper/contentidentifier.hxx
+++ b/include/ucbhelper/contentidentifier.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_UCBHELPER_CONTENTIDENTIFIER_HXX
#include <cppuhelper/implbase.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/ucb/XContentIdentifier.hpp>
#include <ucbhelper/ucbhelperdllapi.h>
#include <memory>
diff --git a/include/ucbhelper/propertyvalueset.hxx b/include/ucbhelper/propertyvalueset.hxx
index 2d23d2d..680aa0c 100644
--- a/include/ucbhelper/propertyvalueset.hxx
+++ b/include/ucbhelper/propertyvalueset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
#define INCLUDED_UCBHELPER_PROPERTYVALUESET_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/sdbc/XColumnLocate.hpp>
#include <com/sun/star/sdbc/XRow.hpp>
#include <com/sun/star/beans/Property.hpp>
diff --git a/include/ucbhelper/providerhelper.hxx b/include/ucbhelper/providerhelper.hxx
index 188235d..550da6c 100644
--- a/include/ucbhelper/providerhelper.hxx
+++ b/include/ucbhelper/providerhelper.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include <com/sun/star/ucb/XContentProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/implbase.hxx>
#include <rtl/ref.hxx>
diff --git a/include/ucbhelper/resultset.hxx b/include/ucbhelper/resultset.hxx
index 9bca51b..243d992 100644
--- a/include/ucbhelper/resultset.hxx
+++ b/include/ucbhelper/resultset.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_UCBHELPER_RESULTSET_HXX
#define INCLUDED_UCBHELPER_RESULTSET_HXX
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/ucb/XContentAccess.hpp>
diff --git a/include/ucbhelper/resultsethelper.hxx b/include/ucbhelper/resultsethelper.hxx
index 6163a14..ce5c122 100644
--- a/include/ucbhelper/resultsethelper.hxx
+++ b/include/ucbhelper/resultsethelper.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <osl/mutex.hxx>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ucb/XDynamicResultSet.hpp>
#include <com/sun/star/ucb/OpenCommandArgument2.hpp>
diff --git a/include/ucbhelper/resultsetmetadata.hxx b/include/ucbhelper/resultsetmetadata.hxx
index 8f8e28c..9c42dc1 100644
--- a/include/ucbhelper/resultsetmetadata.hxx
+++ b/include/ucbhelper/resultsetmetadata.hxx
@@ -24,7 +24,6 @@
#include <memory>
#include <com/sun/star/uno/Reference.h>
#include <com/sun/star/uno/Sequence.h>
#include <com/sun/star/lang/XTypeProvider.hpp>
#include <com/sun/star/sdbc/XResultSetMetaData.hpp>
#include <cppuhelper/implbase.hxx>
#include <ucbhelper/ucbhelperdllapi.h>
diff --git a/include/vbahelper/vbaaccesshelper.hxx b/include/vbahelper/vbaaccesshelper.hxx
index e00b25b..36f24d3a 100644
--- a/include/vbahelper/vbaaccesshelper.hxx
+++ b/include/vbahelper/vbaaccesshelper.hxx
@@ -31,7 +31,6 @@
#include <osl/diagnose.h>
//#define VBAHELPER_DLLIMPLEMENTATION
#include <rtl/ustring.hxx>
#include <sal/types.h>
#include <sfx2/objsh.hxx>
#include <sfx2/docfilt.hxx>
#include <sfx2/docfile.hxx>
diff --git a/include/vcl/BitmapTools.hxx b/include/vcl/BitmapTools.hxx
index 8c168b6..76598cb 100644
--- a/include/vcl/BitmapTools.hxx
+++ b/include/vcl/BitmapTools.hxx
@@ -13,12 +13,10 @@
#include <config_cairo_canvas.h>
#include <vcl/bitmapex.hxx>
#include <vcl/ImageTree.hxx>
#include <vcl/BitmapColor.hxx>
#if ENABLE_CAIRO_CANVAS
#include <vcl/cairo.hxx>
#endif
#include <basegfx/range/b2drectangle.hxx>
#include <o3tl/safeint.hxx>
#include <array>
#include <vcl/RawBitmap.hxx>
diff --git a/include/vcl/GraphicAttributes.hxx b/include/vcl/GraphicAttributes.hxx
index 0908a8f..08b716b 100644
--- a/include/vcl/GraphicAttributes.hxx
+++ b/include/vcl/GraphicAttributes.hxx
@@ -19,9 +19,7 @@
#pragma once
#include <memory>
#include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx>
#include <vcl/bitmap.hxx>
enum class GraphicDrawMode
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx b/include/vcl/NotebookBarAddonsMerger.hxx
index 325a6d3..c1fea53 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -28,7 +28,6 @@
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/uno/Sequence.h>
#include <vector>
#include <map>
class Menu;
diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx
index 5817f5c..a011e12 100644
--- a/include/vcl/QueueInfo.hxx
+++ b/include/vcl/QueueInfo.hxx
@@ -20,8 +20,6 @@
#ifndef INCLUDED_VCL_QUEUEINFO_HXX
#define INCLUDED_VCL_QUEUEINFO_HXX
#include <config_options.h>
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
diff --git a/include/vcl/RawBitmap.hxx b/include/vcl/RawBitmap.hxx
index aeb5dec..92e903b 100644
--- a/include/vcl/RawBitmap.hxx
+++ b/include/vcl/RawBitmap.hxx
@@ -9,6 +9,10 @@
#pragma once
#include <o3tl/safeint.hxx>
#include <vcl/BitmapColor.hxx>
#include <vcl/bitmapex.hxx>
namespace vcl::bitmap
{
/**
diff --git a/include/vcl/animate/AnimationBitmap.hxx b/include/vcl/animate/AnimationBitmap.hxx
index 5b438f8..6f5aa17 100644
--- a/include/vcl/animate/AnimationBitmap.hxx
+++ b/include/vcl/animate/AnimationBitmap.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
#define INCLUDED_VCL_ANIMATE_ANIMATIONBITMAP_HXX
#include <vcl/dllapi.h>
#include <vcl/bitmapex.hxx>
enum class Disposal
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 820a8ef..9f0f7b9 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_DOCKWIN_HXX
#define INCLUDED_VCL_DOCKWIN_HXX
#include <config_options.h>
#include <vcl/dllapi.h>
#include <o3tl/deleter.hxx>
#include <vcl/builder.hxx>
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index 7edc768..0ad6203 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -27,7 +27,6 @@
#include <rtl/ustrbuf.hxx>
#include <o3tl/deleter.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/menu.hxx>
#include <vcl/dndhelp.hxx>
diff --git a/include/vcl/field.hxx b/include/vcl/field.hxx
deleted file mode 100644
index b7cf238..0000000
--- a/include/vcl/field.hxx
+++ /dev/null
@@ -1,28 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* This file is part of the LibreOffice project.
*
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* This file incorporates work covered by the following license notice:
*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed
* with this work for additional information regarding copyright
* ownership. The ASF licenses this file to you under the Apache
* License, Version 2.0 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
#ifndef INCLUDED_VCL_FIELD_HXX
#define INCLUDED_VCL_FIELD_HXX
#include <config_options.h>
#include <memory>
#include <vcl/dllapi.h>
#endif // INCLUDED_VCL_FIELD_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/formatter.hxx b/include/vcl/formatter.hxx
index fce7f50..99d45fb 100644
--- a/include/vcl/formatter.hxx
+++ b/include/vcl/formatter.hxx
@@ -20,6 +20,8 @@
#pragma once
#include <config_options.h>
#include <i18nlangtag/lang.h>
#include <tools/link.hxx>
#include <vcl/settings.hxx>
#include <map>
#include <memory>
diff --git a/include/vcl/gfxlink.hxx b/include/vcl/gfxlink.hxx
index 0e11623..72352f69 100644
--- a/include/vcl/gfxlink.hxx
+++ b/include/vcl/gfxlink.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_GFXLINK_HXX
#define INCLUDED_VCL_GFXLINK_HXX
#include <rtl/ustring.hxx>
#include <tools/gen.hxx>
#include <vcl/dllapi.h>
#include <vcl/mapmod.hxx>
diff --git a/include/vcl/image.hxx b/include/vcl/image.hxx
index f01c174..a77eb89 100644
--- a/include/vcl/image.hxx
+++ b/include/vcl/image.hxx
@@ -23,7 +23,6 @@
#include <vcl/dllapi.h>
#include <tools/gen.hxx>
#include <vcl/bitmapex.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/outdev.hxx>
#include <memory>
diff --git a/include/vcl/imapobj.hxx b/include/vcl/imapobj.hxx
index 2310328..902b5f9 100644
--- a/include/vcl/imapobj.hxx
+++ b/include/vcl/imapobj.hxx
@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_IMAPOBJ_HXX
#define INCLUDED_VCL_IMAPOBJ_HXX
#include <vcl/dllapi.h>
#include <svl/macitem.hxx>
#include <rtl/strbuf.hxx>
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index facf885..3fcfd58 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -22,12 +22,7 @@
#include <vcl/vclptr.hxx>
#include <vcl/IContext.hxx>
#include <vcl/commandevent.hxx>
#include <tools/stream.hxx>
#include <vcl/cvtgrf.hxx>
#include <comphelper/base64.hxx>
#include <vcl/virdev.hxx>
#include <set>
#include <boost/property_tree/json_parser.hpp>
class ScrollBar;
class ScrollBar;
diff --git a/include/vcl/naturalsort.hxx b/include/vcl/naturalsort.hxx
index 852c847..1883bb3 100644
--- a/include/vcl/naturalsort.hxx
+++ b/include/vcl/naturalsort.hxx
@@ -10,6 +10,7 @@
#pragma once
#include <vcl/dllapi.h>
#include <rtl/ustring.hxx>
namespace vcl
{
diff --git a/include/vcl/scopedbitmapaccess.hxx b/include/vcl/scopedbitmapaccess.hxx
index f63bcc5..b0661809 100644
--- a/include/vcl/scopedbitmapaccess.hxx
+++ b/include/vcl/scopedbitmapaccess.hxx
@@ -20,6 +20,8 @@
#ifndef INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX
#define INCLUDED_VCL_SCOPEDBITMAPACCESS_HXX
#include <sal/types.h>
namespace vcl
{
diff --git a/include/vcl/specialchars.hxx b/include/vcl/specialchars.hxx
index d310a92..5a7fe8c 100644
--- a/include/vcl/specialchars.hxx
+++ b/include/vcl/specialchars.hxx
@@ -20,6 +20,9 @@
#ifndef INCLUDED_VCL_SPECIAL_CHARS_HXX
#define INCLUDED_VCL_SPECIAL_CHARS_HXX
#include <vcl/dllapi.h>
#include <rtl/ustring.hxx>
namespace vcl
{
class Font;
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index 422f8e2..7102633 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -32,7 +32,6 @@
#include <osl/thread.h>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/solar.h>
#include <vcl/dllapi.h>
#include <vcl/inputtypes.hxx>
#include <vcl/exceptiontypes.hxx>
diff --git a/include/vcl/sysdata.hxx b/include/vcl/sysdata.hxx
index 1be73fe..c4fae1a 100644
--- a/include/vcl/sysdata.hxx
+++ b/include/vcl/sysdata.hxx
@@ -22,10 +22,6 @@
#include <sal/types.h>
#include <vector>
#include <config_cairo_canvas.h>
#ifdef MACOSX
// predeclare the native classes to avoid header/include problems
typedef struct CGContext *CGContextRef;
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 32f07c1..f694c4d 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -26,7 +26,6 @@
#include <vcl/vclenum.hxx>
#include <vcl/window.hxx>
#include <vcl/windowstate.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <memory>
#include <vcl/NotebookBarAddonsMerger.hxx>
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 798b5ac37..4fe386d 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -26,7 +26,6 @@
#include <vcl/toolbox.hxx>
#include <vcl/EnumContext.hxx>
#include <vcl/NotebookbarContextControl.hxx>
#include <boost/property_tree/json_parser.hpp>
class ImplTabItem;
struct ImplTabCtrlData;
diff --git a/include/vcl/toolkit/field.hxx b/include/vcl/toolkit/field.hxx
index 705e734..714ff87 100644
--- a/include/vcl/toolkit/field.hxx
+++ b/include/vcl/toolkit/field.hxx
@@ -27,7 +27,6 @@
#include <tools/date.hxx>
#include <tools/fldunit.hxx>
#include <tools/time.hxx>
#include <tools/link.hxx>
#include <vcl/toolkit/combobox.hxx>
#include <vcl/toolkit/spinfld.hxx>
diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx
index 7afe3e2..5eca1f1 100644
--- a/include/vcl/toolkit/spinfld.hxx
+++ b/include/vcl/toolkit/spinfld.hxx
@@ -26,7 +26,6 @@
#include <vcl/dllapi.h>
#include <vcl/edit.hxx>
#include <vcl/timer.hxx>
#include <config_options.h>
class VCL_DLLPUBLIC SpinField : public Edit
{
diff --git a/include/vcl/treelistbox.hxx b/include/vcl/treelistbox.hxx
index ce45fab..b7b5a4d 100644
--- a/include/vcl/treelistbox.hxx
+++ b/include/vcl/treelistbox.hxx
@@ -27,7 +27,6 @@
#include <vector>
#include <vcl/ctrl.hxx>
#include <vcl/accel.hxx>
#include <vcl/mnemonicengine.hxx>
#include <vcl/quickselectionengine.hxx>
#include <vcl/image.hxx>
@@ -35,7 +34,6 @@
#include <tools/contnr.hxx>
#include <vcl/treelist.hxx>
#include <vcl/transfer.hxx>
#include <vcl/idle.hxx>
#include <vcl/menu.hxx>
#include <o3tl/typed_flags_set.hxx>
diff --git a/include/vcl/uitest/uiobject.hxx b/include/vcl/uitest/uiobject.hxx
index 36dd548..1797c91 100644
--- a/include/vcl/uitest/uiobject.hxx
+++ b/include/vcl/uitest/uiobject.hxx
@@ -16,6 +16,7 @@
#include <vcl/window.hxx>
#include <vcl/dllapi.h>
#include <vcl/treelistbox.hxx>
#include <set>
diff --git a/include/vcl/uitest/uitest.hxx b/include/vcl/uitest/uitest.hxx
index 4b9ca92..53bdded5 100644
--- a/include/vcl/uitest/uitest.hxx
+++ b/include/vcl/uitest/uitest.hxx
@@ -12,8 +12,6 @@
#include <rtl/ustring.hxx>
#include <vcl/dllapi.h>
#include <memory>
namespace com::sun::star::beans { struct PropertyValue; }
diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx
index 2daa234..ad24a61 100644
--- a/include/vcl/vclevent.hxx
+++ b/include/vcl/vclevent.hxx
@@ -23,8 +23,6 @@
#include <vcl/dllapi.h>
#include <vcl/vclptr.hxx>
#include <com/sun/star/uno/Reference.hxx>
class Menu;
namespace com::sun::star::accessibility {
diff --git a/include/vcl/viewdataentry.hxx b/include/vcl/viewdataentry.hxx
index 6b7413f..c81ab05 100644
--- a/include/vcl/viewdataentry.hxx
+++ b/include/vcl/viewdataentry.hxx
@@ -20,9 +20,7 @@
#ifndef INCLUDED_VCL_VIEWDATAENTRY_HXX
#define INCLUDED_VCL_VIEWDATAENTRY_HXX
#include <vcl/dllapi.h>
#include <tools/solar.h>
#include <tools/gen.hxx>
#include <vector>
diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index c45a0cc..8a79604 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -17,7 +17,6 @@
#include <tools/fldunit.hxx>
#include <tools/gen.hxx>
#include <tools/link.hxx>
#include <tools/time.hxx>
#include <vcl/dllapi.h>
#include <vcl/vclenum.hxx>
#include <vcl/font.hxx>
diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx
index 75da11f..8a57ece 100644
--- a/include/vcl/weldutils.hxx
+++ b/include/vcl/weldutils.hxx
@@ -14,7 +14,7 @@
#include <com/sun/star/uno/Reference.hxx>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/compbase.hxx>
#include <tools/link.hxx>
#include <tools/time.hxx>
#include <vcl/dllapi.h>
#include <vcl/formatter.hxx>
#include <vcl/weld.hxx>
diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx
index 3935512..dcf0f4e 100644
--- a/include/vcl/windowstate.hxx
+++ b/include/vcl/windowstate.hxx
@@ -22,6 +22,7 @@
#include <vcl/dllapi.h>
#include <vcl/vclenum.hxx>
#include <rtl/string.hxx>
class VCL_PLUGIN_PUBLIC WindowStateData
{
diff --git a/include/vcl/wizardmachine.hxx b/include/vcl/wizardmachine.hxx
index 365f875..a2ce936 100644
--- a/include/vcl/wizardmachine.hxx
+++ b/include/vcl/wizardmachine.hxx
@@ -22,7 +22,6 @@
#include <memory>
#include <vcl/dllapi.h>
#include <vcl/builderpage.hxx>
#include <vcl/idle.hxx>
namespace weld {
class Builder;
diff --git a/include/xmloff/XMLPageExport.hxx b/include/xmloff/XMLPageExport.hxx
index 73a60ef..4553c9b 100644
--- a/include/xmloff/XMLPageExport.hxx
+++ b/include/xmloff/XMLPageExport.hxx
@@ -22,7 +22,6 @@
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <rtl/ustring.hxx>
#include <vector>
#include <rtl/ref.hxx>
diff --git a/include/xmloff/xmlmetae.hxx b/include/xmloff/xmlmetae.hxx
index 2dc6ec2..220807f 100644
--- a/include/xmloff/xmlmetae.hxx
+++ b/include/xmloff/xmlmetae.hxx
@@ -21,7 +21,6 @@
#define INCLUDED_XMLOFF_XMLMETAE_HXX
#include <sal/config.h>
#include <xmloff/dllapi.h>
#include <sal/types.h>
#include <cppuhelper/implbase.hxx>
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index 1e9d2ea..8550129 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -56,6 +56,7 @@
#include <tools/gen.hxx>
#include <tools/globname.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/unoprnms.hxx>
#include <com/sun/star/awt/Size.hpp>
#include <com/sun/star/awt/XBitmap.hpp>
diff --git a/sc/source/core/data/patattr.cxx b/sc/source/core/data/patattr.cxx
index eba3bcd..bbb8471 100644
--- a/sc/source/core/data/patattr.cxx
+++ b/sc/source/core/data/patattr.cxx
@@ -49,6 +49,7 @@
#include <svl/zforlist.hxx>
#include <vcl/outdev.hxx>
#include <tools/fract.hxx>
#include <osl/diagnose.h>
#include <attrib.hxx>
#include <patattr.hxx>
diff --git a/sc/source/ui/styleui/styledlg.cxx b/sc/source/ui/styleui/styledlg.cxx
index dd965a9..544489b 100644
--- a/sc/source/ui/styleui/styledlg.cxx
+++ b/sc/source/ui/styleui/styledlg.cxx
@@ -24,6 +24,7 @@
#include <sfx2/sfxdlg.hxx>
#include <svl/style.hxx>
#include <svl/cjkoptions.hxx>
#include <osl/diagnose.h>
#include <styledlg.hxx>
#include <tabpages.hxx>
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index 9529128..4f38c1b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -49,6 +49,7 @@
#include <vcl/svapp.hxx>
#include <tools/json_writer.hxx>
#include <tools/multisel.hxx>
#include <tools/UnitConversion.hxx>
#include <toolkit/awt/vclxdevice.hxx>
#include <unotools/saveopt.hxx>
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index aae2bc1..9644497 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -54,6 +54,7 @@
#include <vcl/settings.hxx>
#include <sal/log.hxx>
#include <unotools/charclass.hxx>
#include <osl/diagnose.h>
#include <output.hxx>
#include <document.hxx>
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx
index 4cc1f84..6f790ea 100644
--- a/sd/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx
@@ -38,6 +38,7 @@
#include <svx/svdotable.hxx>
#include <svx/svdoutl.hxx>
#include <unotools/datetime.hxx>
#include <tools/UnitConversion.hxx>
#include <DrawDocShell.hxx>
#include <ViewShellBase.hxx>
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 2f1b959..84a5178 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -29,6 +29,7 @@
#include <tools/poly.hxx>
#include <tools/stream.hxx>
#include <tools/fontenum.hxx>
#include <tools/UnitConversion.hxx>
#include <sot/storage.hxx>
#include <vcl/graph.hxx>
#include <editeng/svxenum.hxx>
diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index a5d80a6..0f9975e 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -26,6 +26,7 @@
#include <rtl/ustring.hxx>
#include <rtl/strbuf.hxx>
#include <sal/log.hxx>
#include <tools/UnitConversion.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/drawing/XMasterPageTarget.hpp>
diff --git a/sd/source/filter/eppt/pptx-stylesheet.cxx b/sd/source/filter/eppt/pptx-stylesheet.cxx
index 460768e..6a015eb 100644
--- a/sd/source/filter/eppt/pptx-stylesheet.cxx
+++ b/sd/source/filter/eppt/pptx-stylesheet.cxx
@@ -21,6 +21,7 @@
#include "epptdef.hxx"
#include "text.hxx"
#include <tools/color.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/svxenum.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx
index ed9c0fe..2f2f668 100644
--- a/sd/source/ui/annotations/annotationmanager.cxx
+++ b/sd/source/ui/annotations/annotationmanager.cxx
@@ -40,6 +40,7 @@
#include <unotools/saveopt.hxx>
#include <tools/datetime.hxx>
#include <tools/UnitConversion.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/bindings.hxx>
diff --git a/sd/source/ui/dlg/dlgpage.cxx b/sd/source/ui/dlg/dlgpage.cxx
index 5cef8e3..0491572 100644
--- a/sd/source/ui/dlg/dlgpage.cxx
+++ b/sd/source/ui/dlg/dlgpage.cxx
@@ -30,6 +30,7 @@
#include <strings.hrc>
#include <svl/aeitem.hxx>
#include <svl/eitem.hxx>
#include <svx/flagsdef.hxx>
/**
diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index ad46050..463f0d2 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -122,6 +122,7 @@
#include <tools/debug.hxx>
#include <tools/diagnose_ex.h>
#include <tools/json_writer.hxx>
#include <tools/UnitConversion.hxx>
#define TWIPS_PER_PIXEL 15
diff --git a/sfx2/source/view/lokcharthelper.cxx b/sfx2/source/view/lokcharthelper.cxx
index 4d85245..715ee99 100644
--- a/sfx2/source/view/lokcharthelper.cxx
+++ b/sfx2/source/view/lokcharthelper.cxx
@@ -16,6 +16,7 @@
#include <toolkit/helper/vclunohelper.hxx>
#include <tools/fract.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/virdev.hxx>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx
index 08912f5..407627d 100644
--- a/svl/source/items/ptitem.cxx
+++ b/svl/source/items/ptitem.cxx
@@ -23,6 +23,7 @@
#include <com/sun/star/awt/Point.hpp>
#include <osl/diagnose.h>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <svl/poolitem.hxx>
#include <svl/memberid.h>
diff --git a/svx/inc/tbxcolorupdate.hxx b/svx/inc/tbxcolorupdate.hxx
index 9912ea2..fac1f9a 100644
--- a/svx/inc/tbxcolorupdate.hxx
+++ b/svx/inc/tbxcolorupdate.hxx
@@ -23,6 +23,7 @@
#include <tools/color.hxx>
#include <vcl/vclenum.hxx>
#include <vcl/vclptr.hxx>
#include <vcl/toolbox.hxx>
#include <svx/Palette.hxx>
#include <com/sun/star/drawing/LineStyle.hpp>
#include <com/sun/star/frame/FeatureStateEvent.hpp>
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 005f930..cae4072 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -29,6 +29,7 @@
#include <svx/dlgutil.hxx>
#include <sfx2/htmlmode.hxx>
#include <osl/diagnose.h>
#include <editeng/brushitem.hxx>
#include <editeng/lrspitem.hxx>
diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx
index eb2a0f7..bde481f 100644
--- a/svx/source/dialog/rulritem.cxx
+++ b/svx/source/dialog/rulritem.cxx
@@ -22,6 +22,7 @@
#include <svx/unomid.hxx>
#include <tools/debug.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <osl/diagnose.h>
#include <sal/log.hxx>
#include <com/sun/star/awt/Rectangle.hpp>
diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx
index c6274e4..588f38e6 100644
--- a/svx/source/items/algitem.cxx
+++ b/svx/source/items/algitem.cxx
@@ -20,6 +20,7 @@
#include <svx/strings.hrc>
#include <osl/diagnose.h>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <com/sun/star/table/CellOrientation.hpp>
#include <svx/algitem.hxx>
diff --git a/svx/source/items/grfitem.cxx b/svx/source/items/grfitem.cxx
index 1d75804..15625e9 100644
--- a/svx/source/items/grfitem.cxx
+++ b/svx/source/items/grfitem.cxx
@@ -21,6 +21,7 @@
#include <editeng/itemtype.hxx>
#include <com/sun/star/text/GraphicCrop.hpp>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
using namespace ::com::sun::star;
diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
index 2ce4960..975e7fd 100644
--- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx
+++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx
@@ -20,6 +20,7 @@
#include <com/sun/star/graphic/XPrimitiveFactory2D.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
#include <cppuhelper/basemutex.hxx>
#include <cppuhelper/compbase.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <svx/svdobj.hxx>
diff --git a/svx/source/sidebar/PanelFactory.cxx b/svx/source/sidebar/PanelFactory.cxx
index e37648b3..8f5c4d8 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -47,6 +47,7 @@
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/ui/XSidebar.hpp>
#include <com/sun/star/ui/XUIElementFactory.hpp>
#include <com/sun/star/uno/XComponentContext.hpp>
using namespace css;
using namespace css::uno;
diff --git a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
index 6cf416a..357f7ba 100644
--- a/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanelBase.cxx
@@ -20,6 +20,7 @@
#include <osl/diagnose.h>
#include <svx/sidebar/AreaPropertyPanelBase.hxx>
#include <svx/drawitem.hxx>
#include <svx/itemwin.hxx>
#include <svx/svxids.hrc>
#include <sfx2/objsh.hxx>
#include <svx/xfltrit.hxx>
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 070512c..2e5f0ee 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -25,6 +25,7 @@
#include <svx/xlntrit.hxx>
#include <svx/xlncapit.hxx>
#include <svx/xlinjoit.hxx>
#include <com/sun/star/lang/IllegalArgumentException.hpp>
using namespace css;
using namespace css::uno;
diff --git a/svx/source/svdraw/charthelper.cxx b/svx/source/svdraw/charthelper.cxx
index d582c57..0c54a98 100644
--- a/svx/source/svdraw/charthelper.cxx
+++ b/svx/source/svdraw/charthelper.cxx
@@ -18,6 +18,7 @@
*/
#include <svx/charthelper.hxx>
#include <osl/diagnose.h>
#include <com/sun/star/embed/XEmbeddedObject.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/util/XUpdatable2.hpp>
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index f456127..9e570c8 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -18,6 +18,7 @@
*/
#include <comphelper/lok.hxx>
#include <osl/diagnose.h>
#include <svx/sdrpaintwindow.hxx>
#include <sdr/overlay/overlaymanagerbuffered.hxx>
#include <svx/svdpntv.hxx>
diff --git a/svx/source/svdraw/svdpdf.cxx b/svx/source/svdraw/svdpdf.cxx
index 8591115..8a48e0a 100644
--- a/svx/source/svdraw/svdpdf.cxx
+++ b/svx/source/svdraw/svdpdf.cxx
@@ -26,6 +26,7 @@
#include <fpdf_edit.h>
#include <fpdf_text.h>
#include <tools/UnitConversion.hxx>
#include <vcl/graph.hxx>
#include <vcl/vectorgraphicdata.hxx>
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 6f9044f..79ba8a9 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -53,6 +53,7 @@
#include <cppuhelper/implbase.hxx>
#include <libxml/xmlwriter.h>
#include <rtl/ustrbuf.hxx>
#include <tools/UnitConversion.hxx>
#include <boost/property_tree/ptree.hpp>
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index c766b7c1..c9c3e71 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -72,6 +72,7 @@
#include <comphelper/lok.hxx>
#include <sfx2/viewsh.hxx>
#include <editeng/editview.hxx>
#include <tools/UnitConversion.hxx>
using ::editeng::SvxBorderLine;
using namespace sdr::table;
diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx
index af23686..37454ac 100644
--- a/svx/source/tbxctrls/fillctrl.cxx
+++ b/svx/source/tbxctrls/fillctrl.cxx
@@ -25,6 +25,7 @@
#include <vcl/event.hxx>
#include <vcl/settings.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/virdev.hxx>
#include <svx/svxids.hrc>
#include <tools/json_writer.hxx>
diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx
index 07cea3de..3d1c024 100644
--- a/svx/source/tbxctrls/itemwin.cxx
+++ b/svx/source/tbxctrls/itemwin.cxx
@@ -28,6 +28,7 @@
#include <vcl/event.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
#include <svx/dialmgr.hxx>
#include <svx/strings.hrc>
diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx
index 2eccbee..648b485 100644
--- a/svx/source/tbxctrls/linectrl.cxx
+++ b/svx/source/tbxctrls/linectrl.cxx
@@ -21,6 +21,7 @@
#include <vcl/settings.hxx>
#include <vcl/svapp.hxx>
#include <vcl/toolbox.hxx>
#include <vcl/virdev.hxx>
#include <sfx2/objsh.hxx>
#include <svtools/toolbarmenu.hxx>
diff --git a/svx/source/tbxctrls/linewidthctrl.cxx b/svx/source/tbxctrls/linewidthctrl.cxx
index 256793a..564a121 100644
--- a/svx/source/tbxctrls/linewidthctrl.cxx
+++ b/svx/source/tbxctrls/linewidthctrl.cxx
@@ -20,6 +20,7 @@
#include <vcl/toolbox.hxx>
#include <sfx2/app.hxx>
#include <sfx2/objsh.hxx>
#include <svl/itempool.hxx>
#include <svx/svxids.hrc>
#include <svx/xlnwtit.hxx>
#include <svx/linectrl.hxx>
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index bb78182..ade8b2d 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -37,6 +37,7 @@
#include <svtools/ctrltool.hxx>
#include <svtools/borderhelper.hxx>
#include <vcl/InterimItemWindow.hxx>
#include <sfx2/tbxctrl.hxx>
#include <sfx2/tplpitem.hxx>
#include <sfx2/sfxstatuslistener.hxx>
#include <toolkit/helper/vclunohelper.hxx>
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index e472d8f..9e244fb 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -34,6 +34,7 @@
#include <svl/itempool.hxx>
#include <editeng/memberids.h>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
#include <osl/diagnose.h>
#include <svx/unoapi.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index edb3774..e97482a 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -31,6 +31,7 @@
#include <oox/drawingml/drawingmltypes.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/UnitConversion.hxx>
class Test : public SwModelTestBase
{
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
index 26fab6d..23aa25f 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport10.cxx
@@ -53,6 +53,7 @@
#include <com/sun/star/text/XEndnotesSupplier.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <tools/UnitConversion.hxx>
#include <unotools/fltrcfg.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
index 7c215c5..f05f625 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport2.cxx
@@ -11,6 +11,8 @@
#include <string>
#include <tools/UnitConversion.hxx>
#include <com/sun/star/awt/XBitmap.hpp>
#include <com/sun/star/drawing/FillStyle.hpp>
#include <com/sun/star/drawing/LineStyle.hpp>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
index e405504..c592eb7 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport8.cxx
@@ -48,6 +48,7 @@
#include <com/sun/star/drawing/XShapes.hpp>
#include <com/sun/star/text/XTextFieldsSupplier.hpp>
#include <tools/UnitConversion.hxx>
#include <unotools/fltrcfg.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index c87e131..a62a303 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -39,6 +39,7 @@
#include <sfx2/docfile.hxx>
#include <sfx2/docfilt.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/UnitConversion.hxx>
#include <docsh.hxx>
#include <ftninfo.hxx>
diff --git a/sw/qa/extras/rtfexport/rtfexport.cxx b/sw/qa/extras/rtfexport/rtfexport.cxx
index 323ebee..b893cad 100644
--- a/sw/qa/extras/rtfexport/rtfexport.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport.cxx
@@ -40,6 +40,7 @@
#include <com/sun/star/text/XBookmarksSupplier.hpp>
#include <comphelper/sequenceashashmap.hxx>
#include <tools/UnitConversion.hxx>
using namespace css;
diff --git a/sw/qa/extras/rtfexport/rtfexport2.cxx b/sw/qa/extras/rtfexport/rtfexport2.cxx
index 7522614..9025bdc 100644
--- a/sw/qa/extras/rtfexport/rtfexport2.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport2.cxx
@@ -33,6 +33,7 @@
#include <com/sun/star/util/XNumberFormatsSupplier.hpp>
#include <rtl/ustring.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/outdev.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
diff --git a/sw/qa/extras/rtfexport/rtfexport3.cxx b/sw/qa/extras/rtfexport/rtfexport3.cxx
index a04e1ba..442a508 100644
--- a/sw/qa/extras/rtfexport/rtfexport3.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport3.cxx
@@ -19,6 +19,7 @@
#include <com/sun/star/style/TabStop.hpp>
#include <comphelper/sequenceashashmap.hxx>
#include <tools/UnitConversion.hxx>
using namespace css;
diff --git a/sw/qa/extras/rtfexport/rtfexport5.cxx b/sw/qa/extras/rtfexport/rtfexport5.cxx
index b430d61..db0771f5 100644
--- a/sw/qa/extras/rtfexport/rtfexport5.cxx
+++ b/sw/qa/extras/rtfexport/rtfexport5.cxx
@@ -35,6 +35,7 @@
#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
#include <rtl/ustring.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/sw/qa/extras/rtfimport/rtfimport.cxx b/sw/qa/extras/rtfimport/rtfimport.cxx
index a0dc995..c3fc3df 100644
--- a/sw/qa/extras/rtfimport/rtfimport.cxx
+++ b/sw/qa/extras/rtfimport/rtfimport.cxx
@@ -49,6 +49,7 @@
#include <com/sun/star/beans/XPropertyState.hpp>
#include <o3tl/cppunittraitshelper.hxx>
#include <tools/UnitConversion.hxx>
#include <rtl/ustring.hxx>
#include <vcl/settings.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/sw/qa/extras/unowriter/unowriter.cxx b/sw/qa/extras/unowriter/unowriter.cxx
index 859c8bf..73255ce 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -34,6 +34,7 @@
#include <com/sun/star/text/XPageCursor.hpp>
#include <comphelper/propertyvalue.hxx>
#include <tools/UnitConversion.hxx>
#include <toolkit/helper/vclunohelper.hxx>
#include <vcl/graphicfilter.hxx>
#include <comphelper/sequenceashashmap.hxx>
diff --git a/sw/qa/extras/ww8export/ww8export.cxx b/sw/qa/extras/ww8export/ww8export.cxx
index fecb25b..a8e774e 100644
--- a/sw/qa/extras/ww8export/ww8export.cxx
+++ b/sw/qa/extras/ww8export/ww8export.cxx
@@ -38,6 +38,7 @@
#include <sfx2/bindings.hxx>
#include <sfx2/request.hxx>
#include <comphelper/processfactory.hxx>
#include <tools/UnitConversion.hxx>
#include <cmdid.h>
#include <envimg.hxx>
diff --git a/sw/source/core/doc/textboxhelper.cxx b/sw/source/core/doc/textboxhelper.cxx
index 66ba6a7..4806b52 100644
--- a/sw/source/core/doc/textboxhelper.cxx
+++ b/sw/source/core/doc/textboxhelper.cxx
@@ -35,6 +35,7 @@
#include <svl/itemiter.hxx>
#include <comphelper/sequenceashashmap.hxx>
#include <sal/log.hxx>
#include <tools/UnitConversion.hxx>
#include <com/sun/star/document/XActionLockable.hpp>
#include <com/sun/star/lang/IndexOutOfBoundsException.hpp>
diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index 2495dea..33bfd4e 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -21,6 +21,7 @@
#include <tools/helpers.hxx>
#include <tools/urlobj.hxx>
#include <tools/fract.hxx>
#include <tools/UnitConversion.hxx>
#include <svl/fstathelper.hxx>
#include <vcl/imap.hxx>
#include <sfx2/docfile.hxx>
diff --git a/sw/source/core/inc/rootfrm.hxx b/sw/source/core/inc/rootfrm.hxx
index d5cafbe..a1d2622 100644
--- a/sw/source/core/inc/rootfrm.hxx
+++ b/sw/source/core/inc/rootfrm.hxx
@@ -24,6 +24,7 @@
#include <doc.hxx>
#include <IDocumentTimerAccess.hxx>
#include <o3tl/typed_flags_set.hxx>
#include <tools/UnitConversion.hxx>
#include <set>
#include <vector>
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index 06f68ab..f35ec6e 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -27,6 +27,7 @@
#include <com/sun/star/text/XFlatParagraph.hpp>
#include <com/sun/star/text/XFlatParagraphIterator.hpp>
#include <svl/listener.hxx>
#include <tools/solar.h>
#include "unotextmarkup.hxx"
#include <set>
diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index e12a718..959a5a7 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -26,6 +26,7 @@
#include <charfmt.hxx>
#include <libxml/xmlwriter.h>
#include <osl/diagnose.h>
#include <tools/UnitConversion.hxx>
using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 1c1e230..39dd6ba 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -33,6 +33,7 @@
#include <svx/sdtaitm.hxx>
#include <svx/xflclit.hxx>
#include <tools/globname.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/memberids.h>
#include <swtypes.hxx>
#include <cmdid.h>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index dd83c74..d74cf65 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -34,6 +34,7 @@
#include <cppuhelper/interfacecontainer.h>
#include <comphelper/interfacecontainer2.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/svapp.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <editeng/memberids.h>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 0fbf86e..817b50f 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -50,6 +50,7 @@
#include <com/sun/star/style/VerticalAlignment.hpp>
#include <o3tl/any.hxx>
#include <o3tl/enumarray.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/font.hxx>
#include <editeng/flstitem.hxx>
#include <vcl/metric.hxx>
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index c15123a..b7eb530 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -21,6 +21,7 @@
#include <comphelper/documentinfo.hxx>
#include <comphelper/string.hxx>
#include <vcl/svapp.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/unohelp.hxx>
#include <svtools/htmlkywd.hxx>
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6581f93..b2ad206 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -94,6 +94,7 @@
#include <svl/grabbagitem.hxx>
#include <sfx2/sfxbasemodel.hxx>
#include <tools/datetimeutils.hxx>
#include <tools/UnitConversion.hxx>
#include <svl/whiter.hxx>
#include <rtl/tencinfo.h>
#include <sal/log.hxx>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 22e468d..aec4322 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -28,6 +28,7 @@
#include <sal/log.hxx>
#include <sot/exchange.hxx>
#include <svtools/rtfkeywd.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/fontitem.hxx>
#include <editeng/tstpitem.hxx>
#include <editeng/adjustitem.hxx>
diff --git a/sw/source/filter/ww8/writerhelper.cxx b/sw/source/filter/ww8/writerhelper.cxx
index 26027a2..f999656 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -31,6 +31,7 @@
#include <svl/itemiter.hxx>
#include <svx/svdobj.hxx>
#include <svx/svdoole2.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/formatbreakitem.hxx>
#include <ndtxt.hxx>
#include <ndnotxt.hxx>
diff --git a/sw/source/filter/ww8/wrtww8gr.cxx b/sw/source/filter/ww8/wrtww8gr.cxx
index 3f94e4e..3645b51 100644
--- a/sw/source/filter/ww8/wrtww8gr.cxx
+++ b/sw/source/filter/ww8/wrtww8gr.cxx
@@ -25,6 +25,7 @@
#include <vcl/graphicfilter.hxx>
#include <vcl/gdimtf.hxx>
#include <svl/itemiter.hxx>
#include <tools/UnitConversion.hxx>
#include <svtools/embedhlp.hxx>
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 8b5bcdc..cf0c7e6 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -60,6 +60,7 @@
#include <svl/urihelper.hxx>
#include <sfx2/frmdescr.hxx>
#include <tools/globname.hxx>
#include <tools/UnitConversion.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/ui/dbui/mmaddressblockpage.hxx b/sw/source/ui/dbui/mmaddressblockpage.hxx
index d55b0cf..d646f9c 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.hxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.hxx
@@ -25,6 +25,7 @@
#include <sfx2/basedlgs.hxx>
#include <vcl/textfilter.hxx>
#include <svl/lstner.hxx>
#include <vcl/idle.hxx>
#include <o3tl/typed_flags_set.hxx>
class SwMailMergeWizard;
diff --git a/sw/source/ui/index/cntex.cxx b/sw/source/ui/index/cntex.cxx
index 3b853f8..1353cbe 100644
--- a/sw/source/ui/index/cntex.cxx
+++ b/sw/source/ui/index/cntex.cxx
@@ -26,6 +26,7 @@
#include <com/sun/star/beans/PropertyValues.hpp>
#include <com/sun/star/ucb/XCommandEnvironment.hpp>
#include <comphelper/string.hxx>
#include <tools/UnitConversion.hxx>
#include <wrtsh.hxx>
#include <view.hxx>
#include <cnttab.hxx>
diff --git a/sw/source/ui/vba/vbainformationhelper.cxx b/sw/source/ui/vba/vbainformationhelper.cxx
index 8dc2297..9cda14b 100644
--- a/sw/source/ui/vba/vbainformationhelper.cxx
+++ b/sw/source/ui/vba/vbainformationhelper.cxx
@@ -19,6 +19,7 @@
#include "vbainformationhelper.hxx"
#include <com/sun/star/text/XPageCursor.hpp>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <tools/UnitConversion.hxx>
#include "wordvbahelper.hxx"
#include <docsh.hxx>
#include <doc.hxx>
diff --git a/sw/source/uibase/app/appopt.cxx b/sw/source/uibase/app/appopt.cxx
index 47e0ef4..263017f 100644
--- a/sw/source/uibase/app/appopt.cxx
+++ b/sw/source/uibase/app/appopt.cxx
@@ -33,6 +33,7 @@
#include <editeng/tstpitem.hxx>
#include <svx/optgrid.hxx>
#include <svx/dialogs.hrc>
#include <tools/UnitConversion.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <i18nlangtag/languagetag.hxx>
#include <fontcfg.hxx>
diff --git a/sw/source/uibase/app/docshini.cxx b/sw/source/uibase/app/docshini.cxx
index eb24521..ec1f316 100644
--- a/sw/source/uibase/app/docshini.cxx
+++ b/sw/source/uibase/app/docshini.cxx
@@ -31,6 +31,7 @@
#include <sfx2/printer.hxx>
#include <svl/asiancfg.hxx>
#include <svl/intitem.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/adjustitem.hxx>
#include <editeng/autokernitem.hxx>
#include <com/sun/star/document/UpdateDocMode.hpp>
diff --git a/sw/source/uibase/config/fontcfg.cxx b/sw/source/uibase/config/fontcfg.cxx
index 9c81ea8..3792fdb 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -20,6 +20,7 @@
#include <fontcfg.hxx>
#include <i18nlangtag/mslangid.hxx>
#include <osl/diagnose.h>
#include <tools/UnitConversion.hxx>
#include <vcl/outdev.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/lingucfg.hxx>
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 949aeff..2ed9abc 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -28,6 +28,7 @@
#include <tools/mapunit.hxx>
#include <tools/globname.hxx>
#include <tools/UnitConversion.hxx>
#include <itabenum.hxx>
#include <modcfg.hxx>
#include <caption.hxx>
diff --git a/sw/source/uibase/config/usrpref.cxx b/sw/source/uibase/config/usrpref.cxx
index e537b98..22ca1fd 100644
--- a/sw/source/uibase/config/usrpref.cxx
+++ b/sw/source/uibase/config/usrpref.cxx
@@ -22,6 +22,7 @@
#include <cstring>
#include <osl/diagnose.h>
#include <o3tl/any.hxx>
#include <tools/UnitConversion.hxx>
#include <unotools/configmgr.hxx>
#include <unotools/syslocale.hxx>
diff --git a/sw/source/uibase/envelp/envimg.cxx b/sw/source/uibase/envelp/envimg.cxx
index 50cf3e9..e81e368 100644
--- a/sw/source/uibase/envelp/envimg.cxx
+++ b/sw/source/uibase/envelp/envimg.cxx
@@ -22,6 +22,7 @@
#include <editeng/paperinf.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <rtl/ustrbuf.hxx>
#include <tools/UnitConversion.hxx>
#include <unotools/useroptions.hxx>
#include <swmodule.hxx>
#include <swtypes.hxx>
diff --git a/sw/source/uibase/envelp/labelcfg.cxx b/sw/source/uibase/envelp/labelcfg.cxx
index 59c252b..590cf55 100644
--- a/sw/source/uibase/envelp/labelcfg.cxx
+++ b/sw/source/uibase/envelp/labelcfg.cxx
@@ -23,6 +23,7 @@
#include <swtypes.hxx>
#include <labelcfg.hxx>
#include <rtl/bootstrap.hxx>
#include <tools/UnitConversion.hxx>
#include <unotools/configpaths.hxx>
#include <xmlreader/xmlreader.hxx>
#include <comphelper/sequence.hxx>
diff --git a/sw/source/uibase/envelp/labimg.cxx b/sw/source/uibase/envelp/labimg.cxx
index 03a38a8..8050e84 100644
--- a/sw/source/uibase/envelp/labimg.cxx
+++ b/sw/source/uibase/envelp/labimg.cxx
@@ -21,6 +21,7 @@
#include <o3tl/any.hxx>
#include <osl/diagnose.h>
#include <tools/UnitConversion.hxx>
#include <com/sun/star/uno/Sequence.hxx>
#include <unotools/useroptions.hxx>
#include <swmodule.hxx>
diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx
index 1628cf2..5274a5f 100644
--- a/sw/source/uibase/inc/swuicnttab.hxx
+++ b/sw/source/uibase/inc/swuicnttab.hxx
@@ -21,6 +21,7 @@
#include <sfx2/tabdlg.hxx>
#include <svx/langbox.hxx>
#include <vcl/idle.hxx>
#include <vcl/weld.hxx>
#include <vcl/customweld.hxx>
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index effe189..80ef575 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -17,6 +17,7 @@
#include <view.hxx>
#include <cmdid.h>
#include <sfx2/request.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/commandevent.hxx>
#include <vcl/event.hxx>
#include <vcl/window.hxx>
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index df942d4..f792b94 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -20,6 +20,7 @@
#include <cmdid.h>
#include <hintids.hxx>
#include <tools/urlobj.hxx>
#include <tools/UnitConversion.hxx>
#include <svl/stritem.hxx>
#include <svl/whiter.hxx>
#include <svl/urihelper.hxx>
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index 0d722ea..2899138 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -99,6 +99,7 @@
#include <sfx2/lokhelper.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
#include <svtools/embedhlp.hxx>
#include <tools/UnitConversion.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/uiview/viewtab.cxx b/sw/source/uibase/uiview/viewtab.cxx
index 33dc8c2..d62f7f8 100644
--- a/sw/source/uibase/uiview/viewtab.cxx
+++ b/sw/source/uibase/uiview/viewtab.cxx
@@ -25,6 +25,7 @@
#include <svx/xflhtit.hxx>
#include <svx/xbtmpit.hxx>
#include <svx/xfillit0.hxx>
#include <tools/UnitConversion.hxx>
#include <editeng/tstpitem.hxx>
#include <sfx2/request.hxx>
#include <sfx2/viewfrm.hxx>
diff --git a/sw/source/uibase/uno/unomod.cxx b/sw/source/uibase/uno/unomod.cxx
index 0888e44..c0c5f74 100644
--- a/sw/source/uibase/uno/unomod.cxx
+++ b/sw/source/uibase/uno/unomod.cxx
@@ -26,6 +26,7 @@
#include <rtl/ustrbuf.hxx>
#include <svl/itemprop.hxx>
#include <tools/urlobj.hxx>
#include <tools/UnitConversion.hxx>
#include <vcl/svapp.hxx>
#include <unomod.hxx>
diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx
index 464d419..017a239 100644
--- a/sw/source/uibase/uno/unotxvw.cxx
+++ b/sw/source/uibase/uno/unotxvw.cxx
@@ -70,6 +70,7 @@
#include <comphelper/servicehelper.hxx>
#include <cppuhelper/supportsservice.hxx>
#include <cppuhelper/typeprovider.hxx>
#include <tools/UnitConversion.hxx>
using namespace ::com::sun::star;
using namespace ::com::sun::star::uno;
diff --git a/sw/source/uibase/utlui/uiitems.cxx b/sw/source/uibase/utlui/uiitems.cxx
index e667358..fbb098e 100644
--- a/sw/source/uibase/utlui/uiitems.cxx
+++ b/sw/source/uibase/utlui/uiitems.cxx
@@ -18,6 +18,7 @@
*/
#include <editeng/itemtype.hxx>
#include <tools/UnitConversion.hxx>
#include <unosett.hxx>
#include <swtypes.hxx>
diff --git a/vcl/jsdialog/jsdialogbuilder.cxx b/vcl/jsdialog/jsdialogbuilder.cxx
index 25645de..9321487 100644
--- a/vcl/jsdialog/jsdialogbuilder.cxx
+++ b/vcl/jsdialog/jsdialogbuilder.cxx
@@ -21,6 +21,7 @@
#include <memory>
#include <vcl/toolbox.hxx>
#include <vcl/vclmedit.hxx>
#include <boost/property_tree/json_parser.hpp>
JSDialogNotifyIdle::JSDialogNotifyIdle(VclPtr<vcl::Window> aWindow)
: Idle("JSDialog notify")
diff --git a/vcl/source/filter/ipdf/pdfread.cxx b/vcl/source/filter/ipdf/pdfread.cxx
index ccb12f4..5282a01 100644
--- a/vcl/source/filter/ipdf/pdfread.cxx
+++ b/vcl/source/filter/ipdf/pdfread.cxx
@@ -15,6 +15,7 @@
#include <fpdfview.h>
#include <fpdf_edit.h>
#include <fpdf_save.h>
#include <tools/UnitConversion.hxx>
#endif
#include <vcl/graph.hxx>
diff --git a/vcl/source/graphic/VectorGraphicSearch.cxx b/vcl/source/graphic/VectorGraphicSearch.cxx
index 529e8c8..dfa747b 100644
--- a/vcl/source/graphic/VectorGraphicSearch.cxx
+++ b/vcl/source/graphic/VectorGraphicSearch.cxx
@@ -15,6 +15,7 @@
#if HAVE_FEATURE_PDFIUM
#include <vcl/filter/PDFiumLibrary.hxx>
#include <tools/UnitConversion.hxx>
#include <sal/config.h>
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index f09563f..f7e4a8b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -8,9 +8,12 @@
*/
#include <com/sun/star/accessibility/AccessibleRole.hpp>
#include <comphelper/base64.hxx>
#include <o3tl/enumarray.hxx>
#include <o3tl/enumrange.hxx>
#include <tools/stream.hxx>
#include <vcl/toolkit/button.hxx>
#include <vcl/cvtgrf.hxx>
#include <vcl/decoview.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/layout.hxx>
@@ -19,6 +22,7 @@
#include <vcl/split.hxx>
#include <vcl/svapp.hxx>
#include <vcl/settings.hxx>
#include <vcl/virdev.hxx>
#include <bitmaps.hlst>
#include <messagedialog.hxx>
#include <svdata.hxx>
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 9baac30..26e975b 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -26,6 +26,7 @@
#include <rtl/ustrbuf.hxx>
#include <tools/color.hxx>
#include <tools/mapunit.hxx>
#include <tools/UnitConversion.hxx>
using namespace com::sun::star;
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 4495520..5735542 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -40,6 +40,7 @@
#include <rtl/ustring.hxx>
#include <sal/log.hxx>
#include <tools/diagnose_ex.h>
#include <tools/UnitConversion.hxx>
#include <comphelper/sequence.hxx>
#include <comphelper/propertyvalue.hxx>
#include <comphelper/string.hxx>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index 1ecde8a..473e423 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -47,6 +47,7 @@
#include <basegfx/matrix/b2dhommatrix.hxx>
#include <svx/unoapi.hxx>
#include <svx/svdobj.hxx>
#include <tools/UnitConversion.hxx>
#include <dmapper/GraphicZOrderHelper.hxx>
#include "rtfdocumentimpl.hxx"
diff --git a/xmlsecurity/source/component/documentdigitalsignatures.cxx b/xmlsecurity/source/component/documentdigitalsignatures.cxx
index 68e1aa7..f69bbb4 100644
--- a/xmlsecurity/source/component/documentdigitalsignatures.cxx
+++ b/xmlsecurity/source/component/documentdigitalsignatures.cxx
@@ -43,6 +43,7 @@
#include <vcl/weld.hxx>
#include <vcl/svapp.hxx>
#include <tools/date.hxx>
#include <tools/time.hxx>
#include <unotools/securityoptions.hxx>
#include <com/sun/star/security/CertificateValidity.hpp>
#include <com/sun/star/security/CertificateKind.hpp>
