basctl/source/basicide/baside2.cxx | 1 basctl/source/dlged/dlged.cxx | 1 canvas/source/opengl/ogl_spritedevicehelper.cxx | 1 chart2/source/controller/dialogs/DataBrowser.cxx | 1 chart2/source/controller/main/ChartController.cxx | 1 dbaccess/source/ui/browser/brwview.cxx | 1 dbaccess/source/ui/browser/unodatbr.cxx | 1 dbaccess/source/ui/control/RelationControl.cxx | 1 dbaccess/source/ui/querydesign/querycontainerwindow.cxx | 1 extensions/source/bibliography/bibbeam.cxx | 1 extensions/source/propctrlr/propcontroller.cxx | 1 extensions/source/propctrlr/propertyhandler.cxx | 1 extensions/source/propctrlr/standardcontrol.cxx | 1 filter/source/pdf/pdfdecomposer.cxx | 1 forms/source/richtext/richtextcontrol.cxx | 1 include/IwyuFilter_include.yaml | 52 ++++----------- include/toolkit/awt/vclxwindow.hxx | 2 include/toolkit/awt/vclxwindows.hxx | 5 + include/toolkit/controls/unocontrol.hxx | 2 include/toolkit/controls/unocontrolbase.hxx | 7 -- include/toolkit/controls/unocontrolcontainermodel.hxx | 1 include/toolkit/controls/unocontrolmodel.hxx | 2 include/toolkit/controls/unocontrols.hxx | 1 include/toolkit/helper/vclunohelper.hxx | 25 +++---- sd/source/ui/presenter/PresenterHelper.cxx | 1 sfx2/source/control/dispatch.cxx | 1 sfx2/source/doc/sfxbasemodel.cxx | 1 sfx2/source/view/classificationcontroller.cxx | 1 sfx2/source/view/ipclient.cxx | 1 sfx2/source/view/lokstarmathhelper.cxx | 1 svtools/source/filter/DocumentToGraphicRenderer.cxx | 1 svtools/source/misc/embedhlp.cxx | 1 svx/source/dialog/srchdlg.cxx | 1 svx/source/fmcomp/gridcell.cxx | 1 svx/source/form/fmshimp.cxx | 1 svx/source/form/fmview.cxx | 1 svx/source/form/fmvwimp.cxx | 1 svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx | 1 svx/source/tbxctrls/tbcontrl.cxx | 1 toolkit/inc/controls/tkscrollbar.hxx | 1 toolkit/source/awt/vclxcontainer.cxx | 1 toolkit/source/awt/vclxwindow.cxx | 1 toolkit/source/awt/vclxwindows.cxx | 1 toolkit/source/controls/animatedimages.cxx | 1 toolkit/source/controls/controlmodelcontainerbase.cxx | 1 toolkit/source/controls/grid/gridcontrol.cxx | 1 toolkit/source/controls/tkspinbutton.cxx | 1 toolkit/source/controls/tree/treecontrol.cxx | 1 toolkit/source/controls/unocontrolbase.cxx | 3 toolkit/source/controls/unocontrolmodel.cxx | 1 toolkit/source/helper/vclunohelper.cxx | 2 51 files changed, 87 insertions(+), 55 deletions(-)
New commits: commit 94d987edc257cc697637042ad778667fcb172ea1 Author: Gabor Kelemen <[email protected]> AuthorDate: Tue Jan 27 23:43:10 2026 +0100 Commit: Gabor Kelemen <[email protected]> CommitDate: Sat Feb 7 00:41:15 2026 +0100 tdf#146619 Use more forward declarations in include/toolkit Change-Id: I46b4f8c398662b2826f7e4bf90f43750e3569667 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/198240 Reviewed-by: Gabor Kelemen <[email protected]> Tested-by: Jenkins diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index 20469dd7faba..3b2e32d404ec 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -60,6 +60,7 @@ #include <svl/whiter.hxx> #include <svx/svxids.hrc> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <unotools/securityoptions.hxx> #include <utility> #include <vcl/locktoplevels.hxx> diff --git a/basctl/source/dlged/dlged.cxx b/basctl/source/dlged/dlged.cxx index 55a363e4a9af..6488f27dde00 100644 --- a/basctl/source/dlged/dlged.cxx +++ b/basctl/source/dlged/dlged.cxx @@ -42,6 +42,7 @@ #include <tools/debug.hxx> #include <svx/sdrpaintwindow.hxx> #include <svx/svdpagv.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/print.hxx> #include <vcl/svapp.hxx> diff --git a/canvas/source/opengl/ogl_spritedevicehelper.cxx b/canvas/source/opengl/ogl_spritedevicehelper.cxx index 79656594f46e..ea88e7dedf52 100644 --- a/canvas/source/opengl/ogl_spritedevicehelper.cxx +++ b/canvas/source/opengl/ogl_spritedevicehelper.cxx @@ -17,6 +17,7 @@ #include <com/sun/star/rendering/XIntegerBitmapColorSpace.hpp> #include <com/sun/star/uno/Reference.hxx> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/mapunit.hxx> #include <vcl/canvastools.hxx> #include <vcl/opengl/OpenGLHelper.hxx> #include <vcl/syschild.hxx> diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 2b85da33c7cf..c733e5b70236 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -34,6 +34,7 @@ #include <ChartModel.hxx> #include <ChartType.hxx> +#include <tools/mapunit.hxx> #include <vcl/weld/Builder.hxx> #include <vcl/weld/weld.hxx> #include <vcl/settings.hxx> diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index c86cf338cdc8..52f40ad1aa6b 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -52,6 +52,7 @@ #include <BaseCoordinateSystem.hxx> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/frame/XController2.hpp> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/frame/LayoutManagerEvents.hpp> diff --git a/dbaccess/source/ui/browser/brwview.cxx b/dbaccess/source/ui/browser/brwview.cxx index 92b265657366..31dc228c6177 100644 --- a/dbaccess/source/ui/browser/brwview.cxx +++ b/dbaccess/source/ui/browser/brwview.cxx @@ -19,6 +19,7 @@ #include <brwview.hxx> #include <sbagrid.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/types.hxx> #include <vcl/split.hxx> diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index b9181f25c2aa..2ab0b34bc02b 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -84,6 +84,7 @@ #include <comphelper/diagnose_ex.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> +#include <tools/mapunit.hxx> #include <tools/multisel.hxx> #include <tools/urlobj.hxx> #include <unotools/confignode.hxx> diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx index c836dbe5e48b..daf471e93b9c 100644 --- a/dbaccess/source/ui/control/RelationControl.cxx +++ b/dbaccess/source/ui/control/RelationControl.cxx @@ -22,6 +22,7 @@ #include <svtools/editbrowsebox.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/diagnose_ex.hxx> +#include <tools/mapunit.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <TableConnectionData.hxx> #include <TableConnection.hxx> diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx index b755dc886aef..3b0800e430bb 100644 --- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx +++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx @@ -19,6 +19,7 @@ #include <querycontainerwindow.hxx> #include <QueryDesignView.hxx> +#include <tools/mapunit.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <JoinController.hxx> diff --git a/extensions/source/bibliography/bibbeam.cxx b/extensions/source/bibliography/bibbeam.cxx index e6694f557910..bc03624d8912 100644 --- a/extensions/source/bibliography/bibbeam.cxx +++ b/extensions/source/bibliography/bibbeam.cxx @@ -17,6 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/processfactory.hxx> #include <com/sun/star/awt/PosSize.hpp> diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 561a569a4d3e..7c76b076ab36 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -37,6 +37,7 @@ #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/util/VetoException.hpp> #include <tools/debug.hxx> +#include <tools/fldunit.hxx> #include <comphelper/diagnose_ex.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <vcl/svapp.hxx> diff --git a/extensions/source/propctrlr/propertyhandler.cxx b/extensions/source/propctrlr/propertyhandler.cxx index ed3d51c59740..ac43e59d7c78 100644 --- a/extensions/source/propctrlr/propertyhandler.cxx +++ b/extensions/source/propctrlr/propertyhandler.cxx @@ -30,6 +30,7 @@ #include <cppuhelper/supportsservice.hxx> #include <tools/debug.hxx> +#include <tools/fldunit.hxx> #include <unotools/confignode.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/syslocale.hxx> diff --git a/extensions/source/propctrlr/standardcontrol.cxx b/extensions/source/propctrlr/standardcontrol.cxx index b996c29301c6..379b484cb9ca 100644 --- a/extensions/source/propctrlr/standardcontrol.cxx +++ b/extensions/source/propctrlr/standardcontrol.cxx @@ -37,6 +37,7 @@ #include <svx/svxids.hrc> #include <tools/datetime.hxx> +#include <tools/fldunit.hxx> #include <unotools/datetime.hxx> #include <o3tl/string_view.hxx> diff --git a/filter/source/pdf/pdfdecomposer.cxx b/filter/source/pdf/pdfdecomposer.cxx index a2af31a9b50e..5720603fcec0 100644 --- a/filter/source/pdf/pdfdecomposer.cxx +++ b/filter/source/pdf/pdfdecomposer.cxx @@ -14,6 +14,7 @@ #include <cppuhelper/supportsservice.hxx> #include <drawinglayer/primitive2d/bitmapprimitive2d.hxx> #include <drawinglayer/primitive2d/Primitive2DContainer.hxx> +#include <tools/mapunit.hxx> #include <vcl/bitmap.hxx> #include <vcl/pdfread.hxx> #include <vcl/svapp.hxx> diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx index 28bae22e97a7..fe1218d7092b 100644 --- a/forms/source/richtext/richtextcontrol.cxx +++ b/forms/source/richtext/richtextcontrol.cxx @@ -31,6 +31,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <comphelper/diagnose_ex.hxx> #include <sal/log.hxx> #include <vcl/rendercontext/SystemTextColorFlags.hxx> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index 3627bd2b997e..df81f1804a4e 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -391,6 +391,13 @@ excludelist: - com/sun/star/frame/XTerminateListener.hpp - com/sun/star/datatransfer/dnd/XDragGestureListener.hpp - com/sun/star/datatransfer/dnd/XDropTargetListener.hpp + include/toolkit/awt/vclxfont.hxx: + # base class has to be a complete type + - com/sun/star/awt/XFont2.hpp + include/toolkit/awt/vclxdevice.hxx: + # base class has to be a complete type + - com/sun/star/awt/XDevice.hpp + - com/sun/star/awt/XUnitConversion.hpp include/vcl/weld/customweld.hxx: # FIXME some compilers (GCC, MSVC) fail to build with fw declaring this, while Clang does not - comphelper/OAccessible.hxx @@ -400,32 +407,18 @@ excludelist: include/vcl/vectorgraphicdata.hxx: # TODO Needed on Android NDK 27 for some reason - com/sun/star/graphic/XPrimitive2D.hpp - include/toolkit/awt/vclxwindow.hxx: - # base class has to be a complete type - - com/sun/star/awt/XWindow2.hpp - - com/sun/star/awt/XVclWindowPeer.hpp - - com/sun/star/awt/XLayoutConstrains.hpp - - com/sun/star/awt/XView.hpp - - com/sun/star/beans/XPropertySetInfo.hpp - - com/sun/star/awt/XDockableWindow.hpp - - com/sun/star/awt/XStyleSettingsSupplier.hpp include/toolkit/awt/vclxwindows.hxx: # base class has to be a complete type - - com/sun/star/awt/XListBox.hpp - - com/sun/star/awt/XToggleButton.hpp - - com/sun/star/awt/XComboBox.hpp - - com/sun/star/awt/XItemListListener.hpp - include/toolkit/controls/unocontrol.hxx: - # base class has to be a complete type - - com/sun/star/awt/XControl.hpp - - com/sun/star/awt/XWindow2.hpp - - com/sun/star/awt/XView.hpp - - com/sun/star/beans/XPropertiesChangeListener.hpp - - com/sun/star/lang/XServiceInfo.hpp - - com/sun/star/awt/XUnitConversion.hpp - - com/sun/star/awt/XStyleSettingsSupplier.hpp - - com/sun/star/accessibility/XAccessible.hpp - - com/sun/star/util/XModeChangeBroadcaster.hpp + - com/sun/star/awt/XTextArea.hpp + - com/sun/star/awt/XTextComponent.hpp + - com/sun/star/awt/XNumericField.hpp + - com/sun/star/awt/XScrollBar.hpp + - com/sun/star/awt/XTextEditField.hpp + - com/sun/star/awt/XSpinField.hpp + - com/sun/star/awt/XFixedHyperlink.hpp + - com/sun/star/awt/XFixedText.hpp + - com/sun/star/awt/XRadioButton.hpp + - com/sun/star/awt/XCheckBox.hpp include/toolkit/controls/unocontrolmodel.hxx: # base class has to be a complete type - com/sun/star/awt/XControlModel.hpp @@ -434,17 +427,6 @@ excludelist: - com/sun/star/beans/XPropertyState.hpp - com/sun/star/io/XPersistObject.hpp - com/sun/star/util/XCloneable.hpp - include/toolkit/controls/unocontrols.hxx: - # base class has to be a complete type - - com/sun/star/awt/XTextComponent.hpp - - com/sun/star/awt/XTextListener.hpp - - com/sun/star/awt/XTextLayoutConstrains.hpp - - com/sun/star/awt/XButton.hpp - - com/sun/star/awt/XToggleButton.hpp - - com/sun/star/awt/XRadioButton.hpp - - com/sun/star/awt/XCheckBox.hpp - - com/sun/star/awt/XListBox.hpp - - com/sun/star/awt/XItemList.hpp include/toolkit/helper/macros.hxx: # Needed for macros - comphelper/diagnose_ex.hxx diff --git a/include/toolkit/awt/vclxwindow.hxx b/include/toolkit/awt/vclxwindow.hxx index c53e27eebe87..ae2e7f5f6067 100644 --- a/include/toolkit/awt/vclxwindow.hxx +++ b/include/toolkit/awt/vclxwindow.hxx @@ -33,7 +33,6 @@ #include <cppuhelper/implbase.hxx> -#include <tools/gen.hxx> #include <tools/link.hxx> #include <memory> @@ -45,6 +44,7 @@ namespace com::sun::star::awt { class XTopWindowListener; } namespace com::sun::star::awt { class XVclContainerListener; } namespace vcl { class Window; } +class Size; class VclWindowEvent; diff --git a/include/toolkit/awt/vclxwindows.hxx b/include/toolkit/awt/vclxwindows.hxx index 814fa7670baf..9150aca178c6 100644 --- a/include/toolkit/awt/vclxwindows.hxx +++ b/include/toolkit/awt/vclxwindows.hxx @@ -40,13 +40,16 @@ #include <com/sun/star/awt/XItemListListener.hpp> #include <cppuhelper/implbase.hxx> -#include <svl/numuno.hxx> #include <toolkit/awt/vclxwindow.hxx> #include <toolkit/helper/listenermultiplexer.hxx> #include <tools/lineend.hxx> #include <vcl/image.hxx> +class SvNumberFormatsSupplierObj; + +namespace com::sun::star::util { class XNumberFormatsSupplier; } + // class VCLXGraphicControl // deriving from VCLXWindow, drawing the graphic which exists as "Graphic" at the model diff --git a/include/toolkit/controls/unocontrol.hxx b/include/toolkit/controls/unocontrol.hxx index a51c69b9abba..b406a728ff83 100644 --- a/include/toolkit/controls/unocontrol.hxx +++ b/include/toolkit/controls/unocontrol.hxx @@ -35,9 +35,9 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase9.hxx> #include <com/sun/star/util/XModeChangeBroadcaster.hpp> -#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <memory> +namespace com::sun::star::awt { class XVclWindowPeer; } struct UnoControlComponentInfos { diff --git a/include/toolkit/controls/unocontrolbase.hxx b/include/toolkit/controls/unocontrolbase.hxx index d8d14ab2c3c1..743002650d38 100644 --- a/include/toolkit/controls/unocontrolbase.hxx +++ b/include/toolkit/controls/unocontrolbase.hxx @@ -19,12 +19,11 @@ #pragma once -#include <com/sun/star/awt/Size.hpp> -#include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/Time.hpp> - #include <toolkit/controls/unocontrol.hxx> +namespace com::sun::star::awt { struct Size; } +namespace com::sun::star::util { struct Date; } +namespace com::sun::star::util { struct Time; } diff --git a/include/toolkit/controls/unocontrolcontainermodel.hxx b/include/toolkit/controls/unocontrolcontainermodel.hxx index e682e39ed789..e661fc0390a8 100644 --- a/include/toolkit/controls/unocontrolcontainermodel.hxx +++ b/include/toolkit/controls/unocontrolcontainermodel.hxx @@ -21,6 +21,7 @@ #include <toolkit/dllapi.h> #include <toolkit/controls/unocontrolmodel.hxx> +#include <rtl/ref.hxx> class TOOLKIT_DLLPUBLIC UnoControlContainerModel final : public UnoControlModel { diff --git a/include/toolkit/controls/unocontrolmodel.hxx b/include/toolkit/controls/unocontrolmodel.hxx index dcdbadff88e2..8e93be549241 100644 --- a/include/toolkit/controls/unocontrolmodel.hxx +++ b/include/toolkit/controls/unocontrolmodel.hxx @@ -34,11 +34,11 @@ #include <comphelper/propshlp.hxx> #include <cppuhelper/implbase6.hxx> #include <comphelper/uno3.hxx> -#include <rtl/ref.hxx> #include <vector> #include <map> +namespace rtl { template <class reference_type> class Reference; } namespace com::sun::star::uno { class XComponentContext; } typedef std::map<sal_uInt16, css::uno::Any> ImplPropertyTable; diff --git a/include/toolkit/controls/unocontrols.hxx b/include/toolkit/controls/unocontrols.hxx index cece6f457f44..f5e67bfda541 100644 --- a/include/toolkit/controls/unocontrols.hxx +++ b/include/toolkit/controls/unocontrols.hxx @@ -50,6 +50,7 @@ #include <cppuhelper/implbase1.hxx> #include <comphelper/interfacecontainer4.hxx> #include <comphelper/uno3.hxx> +#include <rtl/ref.hxx> #include <tools/gen.hxx> #include <memory> diff --git a/include/toolkit/helper/vclunohelper.hxx b/include/toolkit/helper/vclunohelper.hxx index 889f4f6fb604..7d3bf051814a 100644 --- a/include/toolkit/helper/vclunohelper.hxx +++ b/include/toolkit/helper/vclunohelper.hxx @@ -20,24 +20,14 @@ #pragma once #include <toolkit/dllapi.h> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/awt/MouseEvent.hpp> -#include <com/sun/star/awt/Rectangle.hpp> - -#include <vcl/bitmap.hxx> -#include <vcl/font.hxx> -#include <vcl/region.hxx> -#include <tools/mapunit.hxx> -#include <tools/fldunit.hxx> -#include <tools/poly.hxx> -#include <toolkit/controls/unocontrolcontainer.hxx> -#include <rtl/ref.hxx> +namespace rtl { template <class reference_type> class Reference; } namespace com::sun::star::uno { template <typename > class Sequence; } namespace com::sun::star::uno { class XInterface; + template <class interface_type> class Reference; } namespace com::sun::star::awt { @@ -51,19 +41,30 @@ namespace com::sun::star::awt { class XToolkit; class XFont; class XControlContainer; + struct MouseEvent; struct SimpleFontMetric; struct FontDescriptor; struct Rectangle; struct KeyEvent; } +namespace vcl { + class Font; + class Region; + class Window; +} +namespace tools { class Polygon; } +enum class FieldUnit : sal_uInt16; +enum class MapUnit : sal_uInt8; enum class PointerStyle; +class Bitmap; class FontMetric; class OutputDevice; class MouseEvent; class KeyEvent; +class UnoControlContainer; class TOOLKIT_DLLPUBLIC VCLUnoHelper { diff --git a/sd/source/ui/presenter/PresenterHelper.cxx b/sd/source/ui/presenter/PresenterHelper.cxx index 0bb7b66765e9..609993b2255d 100644 --- a/sd/source/ui/presenter/PresenterHelper.cxx +++ b/sd/source/ui/presenter/PresenterHelper.cxx @@ -28,6 +28,7 @@ #include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <toolkit/helper/vclunohelper.hxx> +#include <tools/mapunit.hxx> #include <vcl/window.hxx> #include <vcl/wrkwin.hxx> diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index b0dd805f047c..9b253b9930c9 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -65,6 +65,7 @@ #include <toolkit/awt/vclxmenu.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <vcl/idle.hxx> #include <vcl/menu.hxx> diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 818bb88b3c72..6e4c8b2ab5f0 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -83,6 +83,7 @@ #include <svl/grabbagitem.hxx> #include <tools/urlobj.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <comphelper/diagnose_ex.hxx> #include <tools/svborder.hxx> #include <unotools/tempfile.hxx> diff --git a/sfx2/source/view/classificationcontroller.cxx b/sfx2/source/view/classificationcontroller.cxx index 73f70dd47a1e..219d733ceda3 100644 --- a/sfx2/source/view/classificationcontroller.cxx +++ b/sfx2/source/view/classificationcontroller.cxx @@ -21,6 +21,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/strings.hrc> #include <sfx2/sfxresid.hxx> +#include <tools/mapunit.hxx> #include <vcl/event.hxx> #include <vcl/toolbox.hxx> #include <vcl/svapp.hxx> diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index c2b5174f1dd3..3219293ba982 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -60,6 +60,7 @@ #include <comphelper/diagnose_ex.hxx> #include <tools/fract.hxx> #include <tools/gen.hxx> +#include <tools/mapunit.hxx> #include <svtools/soerr.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> diff --git a/sfx2/source/view/lokstarmathhelper.cxx b/sfx2/source/view/lokstarmathhelper.cxx index 78f27b9d7732..9ef0f9311665 100644 --- a/sfx2/source/view/lokstarmathhelper.cxx +++ b/sfx2/source/view/lokstarmathhelper.cxx @@ -18,6 +18,7 @@ #include <comphelper/lok.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <tools/UnitConversion.hxx> #include <vcl/layout.hxx> #include <vcl/virdev.hxx> diff --git a/svtools/source/filter/DocumentToGraphicRenderer.cxx b/svtools/source/filter/DocumentToGraphicRenderer.cxx index cceb3aa63764..6a4ecbe71c92 100644 --- a/svtools/source/filter/DocumentToGraphicRenderer.cxx +++ b/svtools/source/filter/DocumentToGraphicRenderer.cxx @@ -27,6 +27,7 @@ #include <vcl/rendercontext/AntialiasingFlags.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <com/sun/star/awt/XDevice.hpp> #include <com/sun/star/awt/XToolkit.hpp> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 3054e3c38809..0cda25c72cdf 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -41,6 +41,7 @@ #include <com/sun/star/chart2/XChartTypeContainer.hpp> #include <com/sun/star/chart2/XChartType.hpp> #include <tools/globname.hxx> +#include <tools/mapunit.hxx> #include <tools/stream.hxx> #include <comphelper/classids.hxx> #include <com/sun/star/util/CloseVetoException.hpp> diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 4e971bd1498a..abc7d9674b96 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -63,6 +63,7 @@ #include "srchctrl.hxx" #include <svx/dialmgr.hxx> #include <editeng/brushitem.hxx> +#include <tools/mapunit.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> #include <vcl/toolbox.hxx> diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 57acee3a0a0c..6f91e9173d3e 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -61,6 +61,7 @@ #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <tools/fract.hxx> +#include <tools/mapunit.hxx> #include <comphelper/diagnose_ex.hxx> #include <vcl/rendercontext/SystemTextColorFlags.hxx> #include <vcl/settings.hxx> diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index d38f93a5b983..299d04494e2b 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -89,6 +89,7 @@ #include <sfx2/objsh.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/viewsh.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/debug.hxx> #include <comphelper/diagnose_ex.hxx> diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index 1b5b1414dc3e..8d604e3d2732 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -42,6 +42,7 @@ #include <svx/dataaccessdescriptor.hxx> #include <comphelper/namedvaluecollection.hxx> #include <o3tl/deleter.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/awt/XControl.hpp> diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 3dfd8449c07c..400e8db3ca53 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -42,6 +42,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> #include <svx/xmlexchg.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index bf169229496a..cead7a68621d 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -51,6 +51,7 @@ #include <comphelper/processfactory.hxx> #include <comphelper/flagguard.hxx> #include <cppuhelper/implbase.hxx> +#include <toolkit/controls/unocontrolcontainer.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/diagnose_ex.hxx> #include <tools/debug.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 3754abd940c3..a8d5cf6eae31 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -24,6 +24,7 @@ #include <comphelper/propertyvalue.hxx> #include <comphelper/OAccessible.hxx> #include <tools/color.hxx> +#include <tools/fldunit.hxx> #include <svl/numformat.hxx> #include <svl/poolitem.hxx> #include <svl/itemset.hxx> diff --git a/toolkit/inc/controls/tkscrollbar.hxx b/toolkit/inc/controls/tkscrollbar.hxx index c7948de072e5..adf46d3f4f7b 100644 --- a/toolkit/inc/controls/tkscrollbar.hxx +++ b/toolkit/inc/controls/tkscrollbar.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <rtl/ref.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <com/sun/star/awt/XScrollBar.hpp> diff --git a/toolkit/source/awt/vclxcontainer.cxx b/toolkit/source/awt/vclxcontainer.cxx index e7be48ed2894..0dc9256788af 100644 --- a/toolkit/source/awt/vclxcontainer.cxx +++ b/toolkit/source/awt/vclxcontainer.cxx @@ -25,6 +25,7 @@ #include <vcl/window.hxx> #include <vcl/tabpage.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <helper/scrollabledialog.hxx> #include <helper/property.hxx> diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index f042253e13ae..bd83ac5bccb4 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -47,6 +47,7 @@ #include <tools/color.hxx> #include <tools/fract.hxx> #include <tools/debug.hxx> +#include <tools/mapunit.hxx> #include <vcl/event.hxx> #include <vcl/dockwin.hxx> #include <vcl/pdfextoutdevdata.hxx> diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 468aeb88ffca..44ae9aa68697 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -65,6 +65,7 @@ #include <helper/tkresmgr.hxx> #include "vclxwindows_internal.hxx" #include <svl/numformat.hxx> +#include <svl/numuno.hxx> using ::com::sun::star::uno::Any; using ::com::sun::star::uno::Reference; diff --git a/toolkit/source/controls/animatedimages.cxx b/toolkit/source/controls/animatedimages.cxx index 25e35accf3db..c88b23684d79 100644 --- a/toolkit/source/controls/animatedimages.cxx +++ b/toolkit/source/controls/animatedimages.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/util/XModifyListener.hpp> #include <o3tl/safeint.hxx> +#include <rtl/ref.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> diff --git a/toolkit/source/controls/controlmodelcontainerbase.cxx b/toolkit/source/controls/controlmodelcontainerbase.cxx index 733c72dfbb3e..41d6b00a9885 100644 --- a/toolkit/source/controls/controlmodelcontainerbase.cxx +++ b/toolkit/source/controls/controlmodelcontainerbase.cxx @@ -32,6 +32,7 @@ #include <controls/tabpagemodel.hxx> #include <controls/stdtabcontroller.hxx> #include <com/sun/star/awt/PosSize.hpp> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/resource/XStringResourceResolver.hpp> #include <com/sun/star/lang/XInitialization.hpp> #include <cppuhelper/queryinterface.hxx> diff --git a/toolkit/source/controls/grid/gridcontrol.cxx b/toolkit/source/controls/grid/gridcontrol.cxx index 71859cc5d35d..b11fa10b88a1 100644 --- a/toolkit/source/controls/grid/gridcontrol.cxx +++ b/toolkit/source/controls/grid/gridcontrol.cxx @@ -32,6 +32,7 @@ #include <com/sun/star/awt/grid/DefaultGridColumnModel.hpp> #include <helper/property.hxx> #include <comphelper/diagnose_ex.hxx> +#include <rtl/ref.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/helper/listenermultiplexer.hxx> diff --git a/toolkit/source/controls/tkspinbutton.cxx b/toolkit/source/controls/tkspinbutton.cxx index a4ace04773db..566226a49963 100644 --- a/toolkit/source/controls/tkspinbutton.cxx +++ b/toolkit/source/controls/tkspinbutton.cxx @@ -24,6 +24,7 @@ #include <comphelper/uno3.hxx> #include <cppuhelper/implbase2.hxx> +#include <rtl/ref.hxx> #include <toolkit/controls/unocontrolmodel.hxx> #include <toolkit/controls/unocontrolbase.hxx> #include <helper/property.hxx> diff --git a/toolkit/source/controls/tree/treecontrol.cxx b/toolkit/source/controls/tree/treecontrol.cxx index 815292098f29..aa8f28ed2310 100644 --- a/toolkit/source/controls/tree/treecontrol.cxx +++ b/toolkit/source/controls/tree/treecontrol.cxx @@ -27,6 +27,7 @@ #include <toolkit/controls/unocontrolbase.hxx> #include <helper/property.hxx> #include <osl/diagnose.h> +#include <rtl/ref.hxx> #include <cppuhelper/implbase1.hxx> #include <helper/unopropertyarrayhelper.hxx> diff --git a/toolkit/source/controls/unocontrolbase.cxx b/toolkit/source/controls/unocontrolbase.cxx index 134e7b181b38..62e3d9b84219 100644 --- a/toolkit/source/controls/unocontrolbase.cxx +++ b/toolkit/source/controls/unocontrolbase.cxx @@ -19,8 +19,11 @@ #include <com/sun/star/awt/XLayoutConstrains.hpp> #include <com/sun/star/awt/XTextLayoutConstrains.hpp> +#include <com/sun/star/awt/XVclWindowPeer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XMultiPropertySet.hpp> +#include <com/sun/star/util/Date.hpp> +#include <com/sun/star/util/Time.hpp> #include <toolkit/controls/unocontrolbase.hxx> #include <helper/property.hxx> diff --git a/toolkit/source/controls/unocontrolmodel.cxx b/toolkit/source/controls/unocontrolmodel.cxx index 3b18a4287ee1..d6fdfd77ceac 100644 --- a/toolkit/source/controls/unocontrolmodel.cxx +++ b/toolkit/source/controls/unocontrolmodel.cxx @@ -38,6 +38,7 @@ #include <tools/debug.hxx> #include <tools/long.hxx> #include <helper/property.hxx> +#include <rtl/ref.hxx> #include <toolkit/helper/emptyfontdescriptor.hxx> #include <unotools/localedatawrapper.hxx> #include <unotools/configmgr.hxx> diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index aab3836b0e89..73943eadf7c8 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <tools/fldunit.hxx> +#include <tools/mapunit.hxx> #include <tools/stream.hxx> #include <vcl/dibtools.hxx> #include <vcl/event.hxx>
