diff options
30 files changed, 44 insertions, 40 deletions
diff --git a/editeng/source/items/frmitems.cxx b/editeng/source/items/frmitems.cxx index 961f9ccffb51..01759a632ce8 100644 --- a/editeng/source/items/frmitems.cxx +++ b/editeng/source/items/frmitems.cxx @@ -47,6 +47,7 @@ #include <com/sun/star/graphic/XGraphic.hpp> #include <osl/diagnose.h> +#include <sal/log.hxx> #include <i18nutil/unicode.hxx> #include <unotools/ucbstreamhelper.hxx> #include <limits.h> diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx index 0b31f60e04ad..9ab4f5754d84 100644 --- a/include/vcl/ITiledRenderable.hxx +++ b/include/vcl/ITiledRenderable.hxx @@ -12,13 +12,19 @@ #define INCLUDED_VCL_ITILEDRENDERABLE_HXX #include <tools/gen.hxx> -#include <vcl/commandevent.hxx> -#include <vcl/event.hxx> -#include <vcl/vclevent.hxx> +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> #include <vcl/ptrstyle.hxx> +#include <vcl/vclptr.hxx> #include <map> -namespace com { namespace sun { namespace star { namespace beans { struct PropertyValue; } } } } +namespace com::sun::star::beans { struct PropertyValue; } +namespace com::sun::star::datatransfer { namespace clipboard { class XClipboard; } } +namespace com::sun::star::uno { template <class interface_type> class Reference; } +namespace com::sun::star::uno { template <typename > class Sequence; } +namespace vcl { class Window; } + +class VirtualDevice; namespace vcl { diff --git a/include/vcl/calendar.hxx b/include/vcl/calendar.hxx index 338392453aec..aef21d674100 100644 --- a/include/vcl/calendar.hxx +++ b/include/vcl/calendar.hxx @@ -24,7 +24,6 @@ #include <unotools/calendarwrapper.hxx> #include <vcl/ctrl.hxx> -#include <vcl/field.hxx> #include <memory> #include <set> @@ -33,10 +32,6 @@ class TrackingEvent; class KeyEvent; class HelpEvent; class DataChangedEvent; -class FloatingWindow; -class PushButton; -class ImplCFieldFloatWin; -class Button; /************************************************************************* diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx index d15e7d8e31c7..97b2616883b2 100644 --- a/include/vcl/filter/PngImageReader.hxx +++ b/include/vcl/filter/PngImageReader.hxx @@ -8,14 +8,21 @@ * */ -#include <vcl/dllapi.h> -#include <com/sun/star/task/XStatusIndicator.hpp> -#include <tools/stream.hxx> -#include <vcl/bitmapex.hxx> - #ifndef INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX #define INCLUDED_VCL_FILTER_PNGIMAGEREADER_HXX +#include <vcl/dllapi.h> + +#include <com/sun/star/uno/Reference.hxx> + +namespace com::sun::star::task +{ +class XStatusIndicator; +} + +class BitmapEx; +class SvStream; + namespace vcl { class VCL_DLLPUBLIC PngImageReader diff --git a/include/vcl/opengl/OpenGLContext.hxx b/include/vcl/opengl/OpenGLContext.hxx index 3dc5b4e2bff9..7e7842041dd6 100644 --- a/include/vcl/opengl/OpenGLContext.hxx +++ b/include/vcl/opengl/OpenGLContext.hxx @@ -10,13 +10,10 @@ #ifndef INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX #define INCLUDED_VCL_OPENGL_OPENGLCONTEXT_HXX -#include <string.h> - #include <epoxy/gl.h> #include <vcl/dllapi.h> #include <vcl/syschild.hxx> -#include <rtl/crc.h> #include <rtl/ref.hxx> #include <memory> diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx index 9bc8b5c9bf2d..f39661461d99 100644 --- a/include/vcl/task.hxx +++ b/include/vcl/task.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_TASK_HXX #include <vcl/dllapi.h> -#include <sal/log.hxx> struct ImplSchedulerData; diff --git a/include/vcl/toolkit/group.hxx b/include/vcl/toolkit/group.hxx index 5d8ce8944813..5a71c2527b2e 100644 --- a/include/vcl/toolkit/group.hxx +++ b/include/vcl/toolkit/group.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_GROUP_HXX #define INCLUDED_VCL_GROUP_HXX -#include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/ctrl.hxx> diff --git a/include/vcl/toolkit/morebtn.hxx b/include/vcl/toolkit/morebtn.hxx index 4243a1438045..09c6bd6be98c 100644 --- a/include/vcl/toolkit/morebtn.hxx +++ b/include/vcl/toolkit/morebtn.hxx @@ -20,9 +20,7 @@ #ifndef INCLUDED_VCL_MOREBTN_HXX #define INCLUDED_VCL_MOREBTN_HXX -#include <tools/solar.h> #include <vcl/dllapi.h> -#include <vcl/mapmod.hxx> #include <vcl/button.hxx> #include <memory> diff --git a/include/vcl/toolkit/unowrap.hxx b/include/vcl/toolkit/unowrap.hxx index 2146f27d3e19..29c7f3ea794e 100644 --- a/include/vcl/toolkit/unowrap.hxx +++ b/include/vcl/toolkit/unowrap.hxx @@ -22,16 +22,10 @@ #include <com/sun/star/uno/Reference.h> #include <vcl/dllapi.h> +#include <vcl/vclptr.hxx> -class XWindowPeer; -class XToolkit; -class EventList; namespace vcl { class Window; } class OutputDevice; -class MouseEvent; -class CommandEvent; -class KeyEvent; -namespace tools { class Rectangle; } class Menu; namespace com { @@ -43,9 +37,6 @@ namespace awt { class XWindow; class XWindowPeer; } -namespace lang { - class XMultiServiceFactory; -} } } } namespace com { diff --git a/include/vcl/vcllayout.hxx b/include/vcl/vcllayout.hxx index 0c32b71d5197..c1d2db0bf152 100644 --- a/include/vcl/vcllayout.hxx +++ b/include/vcl/vcllayout.hxx @@ -20,8 +20,6 @@ #ifndef INCLUDED_VCL_VCLLAYOUT_HXX #define INCLUDED_VCL_VCLLAYOUT_HXX -#include <memory> - #include <basegfx/polygon/b2dpolypolygon.hxx> #include <tools/gen.hxx> #include <vcl/devicecoordinate.hxx> @@ -33,11 +31,6 @@ class SalGraphics; struct GlyphItem; class SalLayoutGlyphs; -namespace vcl -{ - class TextLayoutCache; -} - // all positions/widths are in font units // one exception: drawposition is in pixel units diff --git a/include/vcl/waitobj.hxx b/include/vcl/waitobj.hxx index 15f4bdd29738..a136a73b455a 100644 --- a/include/vcl/waitobj.hxx +++ b/include/vcl/waitobj.hxx @@ -22,11 +22,12 @@ #include <vcl/dllapi.h> #include <vcl/window.hxx> -#include <vcl/weld.hxx> #include <stack> #include <vector> +namespace weld { class Window; } + class VCL_DLLPUBLIC WaitObject { private: diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index fd5100860cb3..c6e8e863be3c 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -25,7 +25,6 @@ #include <vcl/dllapi.h> #include <o3tl/cow_wrapper.hxx> -class Color; class Gradient; class BitmapEx; class ImplWallpaper; diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx index 6b32a27438e2..22bd91c4edeb 100644 --- a/sc/source/filter/excel/xestream.cxx +++ b/sc/source/filter/excel/xestream.cxx @@ -31,6 +31,7 @@ #include <sot/storage.hxx> #include <tools/urlobj.hxx> #include <vcl/svapp.hxx> +#include <vcl/settings.hxx> #include <docuno.hxx> #include <xestream.hxx> diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 4308592d8d98..01aab1f45958 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -48,6 +48,7 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> #include <vcl/help.hxx> +#include <vcl/commandevent.hxx> #include <vcl/cursor.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index 72a467845402..3267602f8927 100644 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -36,6 +36,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/event.hxx> #include <editeng/scriptspaceitem.hxx> +#include <vcl/commandevent.hxx> #include <vcl/cursor.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx index 4b5903a7bf2e..03ea8a98f709 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeList.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeList.cxx @@ -14,6 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> #include <vcl/treelistentry.hxx> #include <pivot.hxx> #include <scabstdlg.hxx> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx index 187965ba78d0..1fd8aad531f0 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListData.cxx @@ -14,6 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> #include <vcl/treelistentry.hxx> #include <pivot.hxx> #include <scabstdlg.hxx> diff --git a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx index 3e6d9d294607..82cfc0ec9bd7 100644 --- a/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx +++ b/sc/source/ui/dbgui/PivotLayoutTreeListLabel.cxx @@ -14,6 +14,7 @@ #include <PivotLayoutDialog.hxx> #include <vcl/builderfactory.hxx> +#include <vcl/event.hxx> #include <vcl/treelistentry.hxx> #include <pivot.hxx> diff --git a/sc/source/ui/drawfunc/fupoor.cxx b/sc/source/ui/drawfunc/fupoor.cxx index 75b450240f1c..37fcbe86be8b 100644 --- a/sc/source/ui/drawfunc/fupoor.cxx +++ b/sc/source/ui/drawfunc/fupoor.cxx @@ -27,6 +27,7 @@ #include <drawview.hxx> #include <detfunc.hxx> #include <document.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/sc/source/ui/vba/vbaeventshelper.cxx b/sc/source/ui/vba/vbaeventshelper.cxx index 61b9bbc26cee..aa660ae320e1 100644 --- a/sc/source/ui/vba/vbaeventshelper.cxx +++ b/sc/source/ui/vba/vbaeventshelper.cxx @@ -36,6 +36,7 @@ #include <cppuhelper/implbase.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <unotools/eventcfg.hxx> +#include <vcl/event.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vbahelper/vbaaccesshelper.hxx> diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx index 2feae6d48f4a..11cbc50c2831 100644 --- a/sc/source/ui/view/hdrcont.cxx +++ b/sc/source/ui/view/hdrcont.cxx @@ -18,6 +18,7 @@ */ #include <sfx2/dispatch.hxx> +#include <vcl/commandevent.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <tools/poly.hxx> diff --git a/sc/source/ui/view/preview.cxx b/sc/source/ui/view/preview.cxx index fe01ce5ad169..905ccf43612b 100644 --- a/sc/source/ui/view/preview.cxx +++ b/sc/source/ui/view/preview.cxx @@ -30,6 +30,7 @@ #include <svtools/accessibilityoptions.hxx> #include <svl/itemset.hxx> #include <tools/multisel.hxx> +#include <vcl/commandevent.hxx> #include <vcl/waitobj.hxx> #include <vcl/settings.hxx> #include <o3tl/deleter.hxx> diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index 66887ce09624..3a548f589d2c 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -34,6 +34,7 @@ #include <sfx2/request.hxx> #include <svl/stritem.hxx> #include <svl/whiter.hxx> +#include <vcl/commandevent.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <vcl/svapp.hxx> diff --git a/sc/source/ui/view/tabcont.cxx b/sc/source/ui/view/tabcont.cxx index 5e0d005d513f..e4e42e947dcc 100644 --- a/sc/source/ui/view/tabcont.cxx +++ b/sc/source/ui/view/tabcont.cxx @@ -21,6 +21,7 @@ #include <sfx2/dispatch.hxx> #include <sfx2/docfile.hxx> #include <tools/urlobj.hxx> +#include <vcl/commandevent.hxx> #include <vcl/svapp.hxx> #include <tabcont.hxx> #include <tabvwsh.hxx> diff --git a/sc/source/ui/view/tabview.cxx b/sc/source/ui/view/tabview.cxx index d207c7cf1275..1014de5bdfb4 100644 --- a/sc/source/ui/view/tabview.cxx +++ b/sc/source/ui/view/tabview.cxx @@ -22,6 +22,7 @@ #include <scitems.hxx> #include <sfx2/viewfrm.hxx> #include <sfx2/bindings.hxx> +#include <vcl/commandevent.hxx> #include <vcl/help.hxx> #include <vcl/settings.hxx> #include <sal/log.hxx> diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx b/sfx2/source/doc/SfxRedactionHelper.cxx index a117bc14123b..84340d2c6a3f 100644 --- a/sfx2/source/doc/SfxRedactionHelper.cxx +++ b/sfx2/source/doc/SfxRedactionHelper.cxx @@ -26,6 +26,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/graph.hxx> +#include <sal/log.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/toolkit/source/helper/formpdfexport.cxx b/toolkit/source/helper/formpdfexport.cxx index 8b4a69b93861..6668de2abc03 100644 --- a/toolkit/source/helper/formpdfexport.cxx +++ b/toolkit/source/helper/formpdfexport.cxx @@ -23,6 +23,7 @@ #include <tools/diagnose_ex.h> #include <tools/lineend.hxx> #include <unordered_map> +#include <sal/log.hxx> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp> diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx index fdb61f976cff..c304ee9d3fca 100644 --- a/vcl/qa/cppunit/png/PngFilterTest.cxx +++ b/vcl/qa/cppunit/png/PngFilterTest.cxx @@ -18,6 +18,7 @@ */ #include <test/bootstrapfixture.hxx> +#include <tools/stream.hxx> #include <vcl/filter/PngImageReader.hxx> #include <vcl/bitmapaccess.hxx> #include <vcl/alpha.hxx> diff --git a/vcl/source/filter/png/PngImageReader.cxx b/vcl/source/filter/png/PngImageReader.cxx index be506874b667..e4024d80a598 100644 --- a/vcl/source/filter/png/PngImageReader.cxx +++ b/vcl/source/filter/png/PngImageReader.cxx @@ -10,6 +10,7 @@ #include <vcl/filter/PngImageReader.hxx> #include <png.h> +#include <tools/stream.hxx> #include <vcl/bitmapaccess.hxx> #include <bitmapwriteaccess.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 0fb993367317..b72b0abea42b 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -31,6 +31,7 @@ #include <vcl/floatwin.hxx> #include <vcl/cursor.hxx> #include <vcl/sysdata.hxx> +#include <vcl/event.hxx> #include <sal/types.h> |