diff options
| author | Gabor Kelemen <kelemeng@ubuntu.com> | 2021-12-31 16:52:16 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2022-01-13 08:26:15 +0100 |
| commit | 840b4eb2f3443ff883016e6a8a8ae49e9cbd9e4e (patch) | |
| tree | a6de1d9baaa9f3e9532714e8105f73160fb1a555 | |
| parent | 8d2bf9b679dec223a78e1fd8f3684f76c5802bae (diff) | |
Recheck modules [a-c]* with IWYU
See tdf#42949 for motivation
Change-Id: I74a3c3a67c3639376e2251c3eb917fa4139dfbd0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127808
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
191 files changed, 106 insertions, 268 deletions
diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 151e77dcfd30..43e52384a536 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -24,6 +24,7 @@ #include <vcl/textdata.hxx> #include <vcl/texteng.hxx> #include <vcl/textview.hxx> +#include <vcl/window.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/accessibility/AccessibleScrollType.hpp> #include <com/sun/star/accessibility/XAccessible.hpp> diff --git a/accessibility/inc/strings.hxx b/accessibility/inc/strings.hxx index baa6f9ec0d1c..85dcf7eb9279 100644 --- a/accessibility/inc/strings.hxx +++ b/accessibility/inc/strings.hxx @@ -9,6 +9,8 @@ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral RID_STR_ACC_ACTION_CLICK = u"press"; inline constexpr OUStringLiteral RID_STR_ACC_ACTION_TOGGLEPOPUP = u"togglePopup"; inline constexpr OUStringLiteral RID_STR_ACC_ACTION_SELECT = u"select"; diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 1e5e7608c3bb..97fcebb04a2b 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -21,7 +21,6 @@ #include <toolkit/awt/vclxwindow.hxx> #include <vcl/vclevent.hxx> -#include <vcl/window.hxx> using namespace ::com::sun::star; diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 28991e818d4a..641c1bdc4b3f 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -19,7 +19,6 @@ #include <standard/vclxaccessibledropdownlistbox.hxx> #include <toolkit/awt/vclxwindow.hxx> -#include <vcl/window.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 25319aa912ea..4b5ed9377442 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -19,7 +19,6 @@ #include <standard/vclxaccessiblelistbox.hxx> #include <toolkit/awt/vclxwindow.hxx> -#include <vcl/window.hxx> using namespace ::com::sun::star; using namespace ::com::sun::star::lang; diff --git a/avmedia/inc/helpids.h b/avmedia/inc/helpids.h index 1bdf9cc56614..1f9a4c305e1d 100644 --- a/avmedia/inc/helpids.h +++ b/avmedia/inc/helpids.h @@ -19,6 +19,8 @@ #pragma once +#include <rtl/string.hxx> + inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PLAY = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"; inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_PAUSE = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"; inline constexpr OStringLiteral HID_AVMEDIA_TOOLBOXITEM_STOP = "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_STOP"; diff --git a/avmedia/source/viewer/mediawindow_impl.cxx b/avmedia/source/viewer/mediawindow_impl.cxx index fcc06488e913..1ff4c46bd65a 100644 --- a/avmedia/source/viewer/mediawindow_impl.cxx +++ b/avmedia/source/viewer/mediawindow_impl.cxx @@ -33,7 +33,6 @@ #include <tools/urlobj.hxx> #include <unotools/securityoptions.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/svapp.hxx> #include <vcl/sysdata.hxx> #include <vcl/commandevent.hxx> #include <vcl/event.hxx> diff --git a/basctl/IwyuFilter_basctl.yaml b/basctl/IwyuFilter_basctl.yaml index a4275b943e48..f72d7e7b7ee2 100644 --- a/basctl/IwyuFilter_basctl.yaml +++ b/basctl/IwyuFilter_basctl.yaml @@ -1,6 +1,11 @@ --- assumeFilename: basctl/source/basicide/baside2b.cxx excludelist: + basctl/sdi/basslots.hrc: + # Needed for basctl/sdi/basslots.sdi + - svx/svxids.hrc + - svx/unomid.hxx + - editeng/memberids.h basctl/source/basicide/basidesh.cxx: # Needed for TypedWhichId defines is basslots.hxx - sfx2/dinfdlg.hxx diff --git a/basctl/inc/strings.hxx b/basctl/inc/strings.hxx index 335eecb0bf00..597092e8c3e2 100644 --- a/basctl/inc/strings.hxx +++ b/basctl/inc/strings.hxx @@ -9,6 +9,8 @@ #pragma once +#include <rtl/ustring.hxx> + // Dialog Controls --------------------------------------------------------------- inline constexpr OUStringLiteral RID_STR_CLASS_CONTROL = u"Control"; diff --git a/basctl/source/basicide/baside2.cxx b/basctl/source/basicide/baside2.cxx index c7f99e8b8e03..52769276bacb 100644 --- a/basctl/source/basicide/baside2.cxx +++ b/basctl/source/basicide/baside2.cxx @@ -38,7 +38,7 @@ #include <com/sun/star/script/ModuleType.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/FilePicker.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <comphelper/SetFlagContextHelper.hxx> #include <comphelper/string.hxx> diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx index 91ac35a4bbc0..6e20187055c9 100644 --- a/basctl/source/basicide/baside3.cxx +++ b/basctl/source/basicide/baside3.cxx @@ -39,7 +39,7 @@ #include <com/sun/star/ucb/SimpleFileAccess.hpp> #include <com/sun/star/ui/dialogs/ExtendedFilePickerElementIds.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/FilePicker.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/XFilePickerControlAccess.hpp> #include <comphelper/processfactory.hxx> #include <sfx2/dispatch.hxx> diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 7786ab408de4..2515cace9800 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/io/Pipe.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/script/DocumentScriptLibraryContainer.hpp> #include <com/sun/star/script/DocumentDialogLibraryContainer.hpp> @@ -65,7 +65,6 @@ #include <cppuhelper/implbase.hxx> #include <cassert> -#include <string_view> namespace basctl { diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx index 63be9953a290..7dadebcc9ebb 100644 --- a/basctl/source/basicide/moduldlg.hxx +++ b/basctl/source/basicide/moduldlg.hxx @@ -24,7 +24,6 @@ #include <string_view> #include <bastype2.hxx> -#include <tools/solar.h> #include <vcl/weld.hxx> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx index 511575a4b9ee..ffb726b21bfc 100644 --- a/basctl/source/inc/dlgeddef.hxx +++ b/basctl/source/inc/dlgeddef.hxx @@ -19,7 +19,7 @@ #pragma once -#include <svx/svdobjkind.hxx> +#include <rtl/ustring.hxx> namespace basctl { diff --git a/basctl/source/inc/docsignature.hxx b/basctl/source/inc/docsignature.hxx index 94e7db2224dd..9dd66da678b8 100644 --- a/basctl/source/inc/docsignature.hxx +++ b/basctl/source/inc/docsignature.hxx @@ -20,7 +20,6 @@ #include <sfx2/signaturestate.hxx> #include <vcl/weld.hxx> -#include <memory> class SfxObjectShell; diff --git a/basegfx/source/range/b2drangeclipper.cxx b/basegfx/source/range/b2drangeclipper.cxx index d371011f0361..401ff20caa1d 100644 --- a/basegfx/source/range/b2drangeclipper.cxx +++ b/basegfx/source/range/b2drangeclipper.cxx @@ -19,7 +19,6 @@ #include <osl/diagnose.h> -#include <basegfx/tuple/b2dtuple.hxx> #include <basegfx/range/b2drange.hxx> #include <basegfx/range/b2drangeclipper.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> diff --git a/basic/IwyuFilter_basic.yaml b/basic/IwyuFilter_basic.yaml index b3a926c37315..ca2bb51a38fd 100644 --- a/basic/IwyuFilter_basic.yaml +++ b/basic/IwyuFilter_basic.yaml @@ -4,9 +4,15 @@ excludelist: basic/source/runtime/dllmgr.hxx: # Needed on WIN - memory + basic/source/sbx/sbxconv.hxx: + # math::round is used + - rtl/math.hxx basic/qa/cppunit/test_compiler_checks.cxx: # Keep for system-cppunit; see also commit 456d61ec526e250fd1af894e109d5914ac9c9e6e - unotest/bootstrapfixturebase.hxx + basic/source/comp/exprnode.cxx: + # math::round is used + - rtl/math.hxx basic/source/runtime/methods.cxx: # Needed on WIN - o3tl/char16_t2wchar_t.hxx diff --git a/basic/inc/basic.hrc b/basic/inc/basic.hrc index 3208737a2564..79b940a38a1e 100644 --- a/basic/inc/basic.hrc +++ b/basic/inc/basic.hrc @@ -19,6 +19,12 @@ #pragma once +#include <basic/sberrors.hxx> +#include <unotools/resmgr.hxx> +#include <vcl/errcode.hxx> + +#include <utility> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) std::pair<TranslateId, ErrCode> const RID_BASIC_START[] = diff --git a/basic/inc/sbxfac.hxx b/basic/inc/sbxfac.hxx index ab0736f3006e..bbdbcb018f0b 100644 --- a/basic/inc/sbxfac.hxx +++ b/basic/inc/sbxfac.hxx @@ -19,11 +19,9 @@ #pragma once +#include <basic/sbxcore.hxx> #include <rtl/ustring.hxx> -class SbxBase; -class SbxObject; - class SbxFactory { public: diff --git a/basic/qa/cppunit/test_global_array.cxx b/basic/qa/cppunit/test_global_array.cxx index 0b83d5efddee..5317e8701858 100644 --- a/basic/qa/cppunit/test_global_array.cxx +++ b/basic/qa/cppunit/test_global_array.cxx @@ -10,10 +10,7 @@ #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> #include <basic/basrdll.hxx> -#include <cppunit/TestSuite.h> -#include <cppunit/plugin/TestPlugIn.h> #include <cppunit/extensions/HelperMacros.h> -#include <iostream> namespace { diff --git a/basic/qa/cppunit/test_global_as_new.cxx b/basic/qa/cppunit/test_global_as_new.cxx index db64a974cb0f..ea5b6fcc527c 100644 --- a/basic/qa/cppunit/test_global_as_new.cxx +++ b/basic/qa/cppunit/test_global_as_new.cxx @@ -10,10 +10,7 @@ #include <basic/sbstar.hxx> #include <basic/sbmeth.hxx> #include <basic/basrdll.hxx> -#include <cppunit/TestSuite.h> -#include <cppunit/plugin/TestPlugIn.h> #include <cppunit/extensions/HelperMacros.h> -#include <iostream> namespace { diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index 362ea2d42898..97e217ca8ba5 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <o3tl/any.hxx> -#include <osl/mutex.hxx> #include <vcl/svapp.hxx> #include <vcl/errcode.hxx> #include <svl/hint.hxx> diff --git a/basic/source/comp/buffer.cxx b/basic/source/comp/buffer.cxx index 07d1d85e53ee..ff6b5173f3fd 100644 --- a/basic/source/comp/buffer.cxx +++ b/basic/source/comp/buffer.cxx @@ -18,6 +18,7 @@ */ #include <buffer.hxx> +#include <basic/sberrors.hxx> namespace { diff --git a/basic/source/comp/codegen.cxx b/basic/source/comp/codegen.cxx index 3442202a8ba1..e2f675a369de 100644 --- a/basic/source/comp/codegen.cxx +++ b/basic/source/comp/codegen.cxx @@ -29,7 +29,6 @@ #include <cstddef> #include <limits> #include <algorithm> -#include <string_view> #include <osl/diagnose.h> #include <rtl/ustrbuf.hxx> #include <com/sun/star/script/ModuleType.hpp> diff --git a/basic/source/inc/buffer.hxx b/basic/source/inc/buffer.hxx index 3115a01a6c98..e56d60b6c615 100644 --- a/basic/source/inc/buffer.hxx +++ b/basic/source/inc/buffer.hxx @@ -19,9 +19,9 @@ #pragma once -#include <basic/sberrors.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> +#include <vcl/errcode.hxx> #include <vector> // Stores all numbers big endian diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 11c5febe0a04..5635c91144e0 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -51,7 +51,6 @@ #include <rtl/ref.hxx> #include <comphelper/interfacecontainer3.hxx> #include <xmlscript/xmllib_imexp.hxx> -#include <comphelper/interfacecontainer3.hxx> class BasicManager; diff --git a/basic/source/runtime/inputbox.cxx b/basic/source/runtime/inputbox.cxx index 36d604298bad..2e154d0e0027 100644 --- a/basic/source/runtime/inputbox.cxx +++ b/basic/source/runtime/inputbox.cxx @@ -19,9 +19,9 @@ #include <basic/sberrors.hxx> #include <tools/lineend.hxx> +#include <vcl/outdev.hxx> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/window.hxx> #include <rtlproto.hxx> #include <memory> diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx index 43ee1c4d6856..705905acfce7 100644 --- a/basic/source/runtime/iosys.cxx +++ b/basic/source/runtime/iosys.cxx @@ -20,7 +20,6 @@ #include <string.h> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> -#include <vcl/window.hxx> #include <osl/file.hxx> #include <runtime.hxx> diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx index 7e9a1adcccd7..2361466ea5e3 100644 --- a/basic/source/runtime/methods.cxx +++ b/basic/source/runtime/methods.cxx @@ -24,7 +24,6 @@ #include <basic/sbuno.hxx> #include <osl/process.h> #include <vcl/dibtools.hxx> -#include <vcl/window.hxx> #include <vcl/svapp.hxx> #include <vcl/settings.hxx> #include <vcl/sound.hxx> @@ -68,7 +67,6 @@ #include <o3tl/char16_t2wchar_t.hxx> // include search util -#include <com/sun/star/util/SearchFlags.hpp> #include <com/sun/star/util/SearchAlgorithms2.hpp> #include <i18nutil/searchopt.hxx> #include <unotools/textsearch.hxx> @@ -109,8 +107,6 @@ using namespace com::sun::star::uno; #include <unistd.h> #endif -#include <com/sun/star/i18n/XCharacterClassification.hpp> -#include <vcl/unohelp.hxx> #include <vcl/TypeSerializer.hxx> #if HAVE_FEATURE_SCRIPTING diff --git a/basic/source/runtime/methods1.cxx b/basic/source/runtime/methods1.cxx index e1f68b950262..16104540ba96 100644 --- a/basic/source/runtime/methods1.cxx +++ b/basic/source/runtime/methods1.cxx @@ -24,7 +24,6 @@ #include <cstddef> -#include <stdlib.h> #include <rtl/math.hxx> #include <vcl/svapp.hxx> #include <vcl/mapmod.hxx> diff --git a/basic/source/runtime/props.cxx b/basic/source/runtime/props.cxx index f3d84a0127b5..aa0a9e1c9d85 100644 --- a/basic/source/runtime/props.cxx +++ b/basic/source/runtime/props.cxx @@ -21,7 +21,6 @@ #include <runtime.hxx> #include <rtlproto.hxx> #include <errobject.hxx> -#include <basegfx/numeric/ftools.hxx> // Properties and methods lay the return value down at Get (bWrite = sal_False) diff --git a/basic/source/sbx/sbxdbl.cxx b/basic/source/sbx/sbxdbl.cxx index 84b5403c3f10..aca18b3197e3 100644 --- a/basic/source/sbx/sbxdbl.cxx +++ b/basic/source/sbx/sbxdbl.cxx @@ -19,7 +19,6 @@ #include <config_features.h> -#include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> #include "sbxconv.hxx" #include <rtlproto.hxx> diff --git a/basic/source/sbx/sbxint.cxx b/basic/source/sbx/sbxint.cxx index f702c6b1fb3a..432aaf9b9cad 100644 --- a/basic/source/sbx/sbxint.cxx +++ b/basic/source/sbx/sbxint.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/float_int_conversion.hxx> #include <o3tl/safeint.hxx> #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> diff --git a/basic/source/sbx/sbxlng.cxx b/basic/source/sbx/sbxlng.cxx index 1bc4e4e6669c..7011a13b0da8 100644 --- a/basic/source/sbx/sbxlng.cxx +++ b/basic/source/sbx/sbxlng.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxsng.cxx b/basic/source/sbx/sbxsng.cxx index bdcc4b139f36..2353968d2fde 100644 --- a/basic/source/sbx/sbxsng.cxx +++ b/basic/source/sbx/sbxsng.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxuint.cxx b/basic/source/sbx/sbxuint.cxx index 6299612b500f..1a8013c1cc4b 100644 --- a/basic/source/sbx/sbxuint.cxx +++ b/basic/source/sbx/sbxuint.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxulng.cxx b/basic/source/sbx/sbxulng.cxx index a0db33f80abd..a14f3b028712 100644 --- a/basic/source/sbx/sbxulng.cxx +++ b/basic/source/sbx/sbxulng.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <o3tl/float_int_conversion.hxx> #include <vcl/errcode.hxx> #include <basic/sberrors.hxx> #include "sbxconv.hxx" diff --git a/basic/source/sbx/sbxvar.cxx b/basic/source/sbx/sbxvar.cxx index d2c9802c413b..8fb11bf9f2a2 100644 --- a/basic/source/sbx/sbxvar.cxx +++ b/basic/source/sbx/sbxvar.cxx @@ -28,7 +28,6 @@ #include "sbxconv.hxx" #include <rtlproto.hxx> #include <sbunoobj.hxx> -#include <rtl/character.hxx> #include <rtl/ustrbuf.hxx> #include <sal/log.hxx> diff --git a/canvas/IwyuFilter_canvas.yaml b/canvas/IwyuFilter_canvas.yaml index 0ec833918e92..74419ea56103 100644 --- a/canvas/IwyuFilter_canvas.yaml +++ b/canvas/IwyuFilter_canvas.yaml @@ -17,6 +17,9 @@ excludelist: - com/sun/star/awt/XTopWindow.hpp # Complete type needed for return type - basegfx/range/b2irange.hxx + canvas/source/opengl/ogl_canvascustomsprite.cxx: + # Complete type needed for B2DPolyPolygon return type + - basegfx/polygon/b2dpolypolygon.hxx canvas/source/cairo/cairo_spritecanvashelper.cxx: # Needed for boost/polymorphic_cast.hpp - boost/cast.hpp diff --git a/canvas/qa/cppunit/canvastest.cxx b/canvas/qa/cppunit/canvastest.cxx index 5414a757d3c3..7927f07c0723 100644 --- a/canvas/qa/cppunit/canvastest.cxx +++ b/canvas/qa/cppunit/canvastest.cxx @@ -16,9 +16,7 @@ #include <vcl/graphicfilter.hxx> #include <tools/stream.hxx> -#include <com/sun/star/rendering/XBitmap.hpp> #include <com/sun/star/rendering/XCanvas.hpp> -#include <com/sun/star/rendering/XBitmapCanvas.hpp> #include <com/sun/star/rendering/CompositeOperation.hpp> #include <com/sun/star/rendering/PathCapType.hpp> #include <com/sun/star/rendering/PathJoinType.hpp> diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index 5b727905673a..622213deeeb1 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -26,7 +26,6 @@ #include <tools/diagnose_ex.h> #include <vcl/sysdata.hxx> #include <vcl/skia/SkiaHelper.hxx> -#include <vcl/window.hxx> #include <cppuhelper/supportsservice.hxx> #include "cairo_canvas.hxx" diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index fd116745e7a8..4a0236f6bf4b 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -21,7 +21,6 @@ #include <sal/log.hxx> #include <math.h> -#include <memory> #include <com/sun/star/rendering/TextDirection.hpp> #include <canvas/canvastools.hxx> diff --git a/canvas/source/directx/dx_textlayout_drawhelper.cxx b/canvas/source/directx/dx_textlayout_drawhelper.cxx index cd50cb4878ed..20ff8bd441c9 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.cxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.cxx @@ -21,6 +21,7 @@ #include <memory> +#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/utils/canvastools.hxx> #include <com/sun/star/rendering/FontRequest.hpp> diff --git a/canvas/source/directx/dx_textlayout_drawhelper.hxx b/canvas/source/directx/dx_textlayout_drawhelper.hxx index d5820451fb53..0db8fca69762 100644 --- a/canvas/source/directx/dx_textlayout_drawhelper.hxx +++ b/canvas/source/directx/dx_textlayout_drawhelper.hxx @@ -26,8 +26,9 @@ #include <com/sun/star/rendering/XCanvasFont.hpp> #include <com/sun/star/geometry/Matrix2D.hpp> #include <com/sun/star/rendering/XGraphicDevice.hpp> +#include <com/sun/star/rendering/ViewState.hpp> +#include <com/sun/star/rendering/RenderState.hpp> -#include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/vector/b2isize.hxx> namespace com::sun::star::rendering { class XCanvasFont; } diff --git a/canvas/source/directx/dx_vcltools.hxx b/canvas/source/directx/dx_vcltools.hxx index a54ec3b90bd3..433afa618eb7 100644 --- a/canvas/source/directx/dx_vcltools.hxx +++ b/canvas/source/directx/dx_vcltools.hxx @@ -20,8 +20,9 @@ #pragma once #include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/util/TriState.hpp> +#include <com/sun/star/rendering/XBitmap.hpp> #include <memory> +#include <vector> namespace Gdiplus { class Graphics; } diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index 6cb27699864c..3323b8675a15 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -36,7 +36,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <o3tl/functional.hxx> -#include <config_features.h> #include <vcl/skia/SkiaHelper.hxx> #include <unotools/configmgr.hxx> diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index 2ad0a61fc9fd..e9ebf85b3b3a 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -25,7 +25,6 @@ #include <sal/log.hxx> #include <tools/diagnose_ex.h> #include <vcl/outdev.hxx> -#include <vcl/window.hxx> #include "outdevholder.hxx" diff --git a/canvas/source/vcl/outdevholder.hxx b/canvas/source/vcl/outdevholder.hxx index 78f3badf8bb6..9679687c4329 100644 --- a/canvas/source/vcl/outdevholder.hxx +++ b/canvas/source/vcl/outdevholder.hxx @@ -19,7 +19,6 @@ #pragma once -#include <com/sun/star/uno/Reference.hxx> #include <vcl/outdev.hxx> #include "outdevprovider.hxx" diff --git a/canvas/source/vcl/spritehelper.cxx b/canvas/source/vcl/spritehelper.cxx index 01ed44b9be98..8e8d88ac30af 100644 --- a/canvas/source/vcl/spritehelper.cxx +++ b/canvas/source/vcl/spritehelper.cxx @@ -31,13 +31,9 @@ #include <vcl/bitmapex.hxx> #include <vcl/canvastools.hxx> #include <vcl/outdev.hxx> -#include <vcl/BitmapMonochromeFilter.hxx> -#include <vcl/skia/SkiaHelper.hxx> #include <canvas/canvastools.hxx> -#include <config_features.h> -#include "impltools.hxx" #include "spritehelper.hxx" using namespace ::com::sun::star; diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index efc772228390..48c291f31c4e 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -21,7 +21,6 @@ #include <sal/config.h> #include <tools/diagnose_ex.h> -#include <tools/long.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/numeric/ftools.hxx> #include <basegfx/utils/canvastools.hxx> diff --git a/chart2/IwyuFilter_chart2.yaml b/chart2/IwyuFilter_chart2.yaml index 7d037d908820..158680ac2512 100644 --- a/chart2/IwyuFilter_chart2.yaml +++ b/chart2/IwyuFilter_chart2.yaml @@ -690,6 +690,9 @@ excludelist: chart2/source/controller/main/ChartModelClone.hxx: # Needed for implicit dtor - com/sun/star/uno/Any.hxx + chart2/source/controller/main/ChartController.cxx: + # Needed for implicit dtor + - com/sun/star/awt/XWindowPeer.hpp chart2/source/controller/main/ChartFrameloader.hxx: # base class has to be a complete type - com/sun/star/frame/XSynchronousFrameLoader.hpp diff --git a/chart2/inc/chart.hrc b/chart2/inc/chart.hrc index a43ce2a78993..b1e0024fb7cc 100644 --- a/chart2/inc/chart.hrc +++ b/chart2/inc/chart.hrc @@ -9,6 +9,8 @@ #pragma once +#include <unotools/resmgr.hxx> + #define NC_(Context, String) TranslateId(Context, reinterpret_cast<char const *>(u8##String)) const TranslateId CHART_TYPE[] = diff --git a/chart2/inc/unonames.hxx b/chart2/inc/unonames.hxx index 32db759716a3..12b35914a6f5 100644 --- a/chart2/inc/unonames.hxx +++ b/chart2/inc/unonames.hxx @@ -9,6 +9,8 @@ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral CHART_UNONAME_SORT_BY_XVALUES = u"SortByXValues"; inline constexpr OUStringLiteral CHART_UNONAME_SPLINE_TYPE = u"SplineType"; inline constexpr OUStringLiteral CHART_UNONAME_SPLINE_ORDER = u"SplineOrder"; diff --git a/chart2/qa/extras/chart2dump/chart2dump.cxx b/chart2/qa/extras/chart2dump/chart2dump.cxx index 4d40c9cc3f8b..bae904d4faf3 100644 --- a/chart2/qa/extras/chart2dump/chart2dump.cxx +++ b/chart2/qa/extras/chart2dump/chart2dump.cxx @@ -17,7 +17,6 @@ #include <com/sun/star/drawing/FillStyle.hpp> #include <editeng/unoprnms.hxx> -#include <test/xmltesttools.hxx> #include <rtl/ustring.hxx> #include <rtl/ustrbuf.hxx> diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx index 78529b9423c9..a5c2e20cc58c 100644 --- a/chart2/qa/extras/chart2export.cxx +++ b/chart2/qa/extras/chart2export.cxx @@ -11,9 +11,6 @@ #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> -#include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> -#include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp> -#include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/MovingAverageType.hpp> #include <com/sun/star/lang/XServiceName.hpp> #include <com/sun/star/text/XTextDocument.hpp> @@ -22,10 +19,6 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <libxml/xpathInternals.h> - -#include <algorithm> - using uno::Reference; using beans::XPropertySet; diff --git a/chart2/qa/extras/chart2export2.cxx b/chart2/qa/extras/chart2export2.cxx index 588cbe1d84f2..1fa862291459 100644 --- a/chart2/qa/extras/chart2export2.cxx +++ b/chart2/qa/extras/chart2export2.cxx @@ -9,24 +9,14 @@ #include "charttest.hxx" -#include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> #include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart2/MovingAverageType.hpp> -#include <com/sun/star/lang/XServiceName.hpp> -#include <com/sun/star/text/XTextDocument.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> +#include <com/sun/star/text/XText.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <libxml/xpathInternals.h> - -#include <algorithm> - using uno::Reference; using beans::XPropertySet; diff --git a/chart2/qa/extras/chart2geometry.cxx b/chart2/qa/extras/chart2geometry.cxx index bcfa0d7276af..f460ac467621 100644 --- a/chart2/qa/extras/chart2geometry.cxx +++ b/chart2/qa/extras/chart2geometry.cxx @@ -15,14 +15,9 @@ #include <com/sun/star/chart2/XDataSeries.hpp> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/packages/zip/ZipFileAccess.hpp> -#include <unotools/ucbstreamhelper.hxx> #include <unotools/saveopt.hxx> -#include <libxml/xpathInternals.h> - -#include <algorithm> #include <string_view> using uno::Reference; diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index e908cfc57a71..0b4f6d89303e 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -12,7 +12,6 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> #include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp> -#include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> #include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> @@ -29,9 +28,7 @@ #include <com/sun/star/chart2/Symbol.hpp> #include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/chart/XDateCategories.hpp> #include <com/sun/star/text/XTextRange.hpp> -#include <com/sun/star/util/NumberFormatter.hpp> #include <iterator> #include <com/sun/star/util/Color.hpp> diff --git a/chart2/qa/extras/chart2import2.cxx b/chart2/qa/extras/chart2import2.cxx index 0693a1e64184..f84254c30c2a 100644 --- a/chart2/qa/extras/chart2import2.cxx +++ b/chart2/qa/extras/chart2import2.cxx @@ -8,33 +8,16 @@ */ #include "charttest.hxx" -#include <com/sun/star/chart2/CurveStyle.hpp> #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/chart2/XDataPointCustomLabelField.hpp> #include <com/sun/star/chart2/DataPointCustomLabelFieldType.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> -#include <com/sun/star/chart/ErrorBarStyle.hpp> -#include <com/sun/star/chart2/XRegressionCurveContainer.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> #include <com/sun/star/chart/XChartDocument.hpp> #include <com/sun/star/chart2/XInternalDataProvider.hpp> -#include <com/sun/star/chart/XChartDataArray.hpp> -#include <com/sun/star/drawing/FillStyle.hpp> -#include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/chart/XAxisXSupplier.hpp> -#include <com/sun/star/chart/XAxisYSupplier.hpp> -#include <com/sun/star/chart/MissingValueTreatment.hpp> -#include <com/sun/star/chart2/TickmarkStyle.hpp> -#include <com/sun/star/chart2/SymbolStyle.hpp> -#include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/chart2/data/XTextualDataSequence.hpp> #include <com/sun/star/chart/DataLabelPlacement.hpp> -#include <com/sun/star/text/XTextRange.hpp> -#include <iterator> - -#include <com/sun/star/util/Color.hpp> -#include <com/sun/star/awt/Gradient.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> +#include <com/sun/star/text/XText.hpp> class Chart2ImportTest2 : public ChartTest { diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index 7de1b376b3ef..712ef0613c26 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/chart2/RelativePosition.hpp> #include <com/sun/star/chart2/XTitle.hpp> #include <com/sun/star/chart2/XChartDocument.hpp> -#include <com/sun/star/frame/XModel.hpp> #include <CharacterProperties.hxx> #include <LinePropertiesHelper.hxx> diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index e48875d7c7a2..d27f05350732 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -31,7 +31,6 @@ #include <vcl/GraphicLoader.hxx> #include <vcl/graph.hxx> -#include <vcl/outdev.hxx> #include <tools/diagnose_ex.h> using namespace ::com::sun::star; diff --git a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx index 94d0e9034619..5751cc15b69b 100644 --- a/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx +++ b/chart2/source/controller/dialogs/dlg_ObjectProperties.cxx @@ -47,7 +47,6 @@ #include <com/sun/star/chart2/AxisType.hpp> #include <com/sun/star/chart2/XAxis.hpp> #include <svl/intitem.hxx> -#include <svl/languageoptions.hxx> #include <svl/ctloptions.hxx> #include <svx/svxids.hrc> diff --git a/chart2/source/controller/dialogs/res_Trendline.cxx b/chart2/source/controller/dialogs/res_Trendline.cxx index baa75ef7cb4f..ca1fe7bcfb83 100644 --- a/chart2/source/controller/dialogs/res_Trendline.cxx +++ b/chart2/source/controller/dialogs/res_Trendline.cxx @@ -26,7 +26,6 @@ #include <svl/intitem.hxx> #include <svl/numformat.hxx> #include <svl/stritem.hxx> -#include <svl/zforlist.hxx> #include <vcl/formatter.hxx> #include <vcl/weld.hxx> diff --git a/chart2/source/controller/dialogs/tp_AxisLabel.cxx b/chart2/source/controller/dialogs/tp_AxisLabel.cxx index 9871bfa4187a..1ee392238141 100644 --- a/chart2/source/controller/dialogs/tp_AxisLabel.cxx +++ b/chart2/source/controller/dialogs/tp_AxisLabel.cxx @@ -24,7 +24,6 @@ #include <svx/chrtitem.hxx> #include <svx/sdangitm.hxx> -#include <svl/intitem.hxx> #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> diff --git a/chart2/source/controller/dialogs/tp_PolarOptions.cxx b/chart2/source/controller/dialogs/tp_PolarOptions.cxx index 59422b3a613e..ed4172d68110 100644 --- a/chart2/source/controller/dialogs/tp_PolarOptions.cxx +++ b/chart2/source/controller/dialogs/tp_PolarOptions.cxx @@ -21,7 +21,6 @@ #include <chartview/ChartSfxItemIds.hxx> #include <svl/eitem.hxx> -#include <svl/intitem.hxx> #include <svx/sdangitm.hxx> #include <officecfg/Office/Compatibility.hxx> diff --git a/chart2/source/controller/dialogs/tp_TitleRotation.cxx b/chart2/source/controller/dialogs/tp_TitleRotation.cxx index 8ff1c926d091..ed99a9a39501 100644 --- a/chart2/source/controller/dialogs/tp_TitleRotation.cxx +++ b/chart2/source/controller/dialogs/tp_TitleRotation.cxx @@ -24,7 +24,6 @@ #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> -#include <svl/intitem.hxx> #include <svx/sdangitm.hxx> namespace chart diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index afa919b1e3ec..3918a296e638 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx @@ -22,6 +22,7 @@ #include <ConfigurationAccess.hxx> #include <unotools/lingucfg.hxx> +#include <editeng/eeitem.hxx> #include <editeng/langitem.hxx> #include <svl/intitem.hxx> #include <svl/itempool.hxx> @@ -31,10 +32,11 @@ #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svxids.hrc> -#include <svx/unoshape.hxx> #include <editeng/fhgtitem.hxx> +#include <osl/diagnose.h> #include <com/sun/star/frame/XModel.hpp> +#include <com/sun/star/drawing/XShape.hpp> #include <sfx2/objsh.hxx> #include <svx/helperhittest3d.hxx> diff --git a/chart2/source/controller/inc/helpids.h b/chart2/source/controller/inc/helpids.h index fe502262339a..69a23771c8dd 100644 --- a/chart2/source/controller/inc/helpids.h +++ b/chart2/source/controller/inc/helpids.h @@ -19,6 +19,8 @@ #pragma once +#include <rtl/string.hxx> + inline constexpr OStringLiteral HID_SCH_WIN_DOCUMENT = "CHART2_HID_SCH_WIN_DOCUMENT"; inline constexpr OStringLiteral HID_SCH_ERROR_BARS_FROM_DATA = "CHART2_SCH_ERROR_BARS_FROM_DATA"; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 990120a97a04..85f2768a33d6 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -50,7 +50,6 @@ #include <svx/sdangitm.hxx> #include <tools/diagnose_ex.h> #include <vcl/graph.hxx> -#include <oox/helper/containerhelper.hxx> #include <rtl/math.hxx> #include <svx/tabline.hxx> diff --git a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx index 0792df7b624e..3c1387009afd 100644 --- a/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx +++ b/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx @@ -18,6 +18,7 @@ */ #pragma once +#include <svl/whichranges.hxx> #include <svx/svxids.hrc> #include <svx/xdef.hxx> #include <svx/svddef.hxx> diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 95fa5147433f..605eb07b4692 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -23,7 +23,6 @@ #include <GraphicPropertyItemConverter.hxx> #include <CharacterPropertyItemConverter.hxx> #include <MultipleItemConverter.hxx> -#include <svl/intitem.hxx> #include <svx/sdangitm.hxx> #include <rtl/math.hxx> diff --git a/chart2/source/controller/main/ChartController_Tools.cxx b/chart2/source/controller/main/ChartController_Tools.cxx index d88d9c424da5..7f86b0aaa799 100644 --- a/chart2/source/controller/main/ChartController_Tools.cxx +++ b/chart2/source/controller/main/ChartController_Tools.cxx @@ -44,7 +44,6 @@ #include <com/sun/star/chart2/DataPointLabel.hpp> #include <com/sun/star/beans/XPropertyState.hpp> #include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/text/XTextRange.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/chart/ErrorBarStyle.hpp> @@ -71,7 +70,6 @@ #include <svx/unopage.hxx> #include <svx/unoshape.hxx> #include <svx/xgrad.hxx> -#include <svx/xflgrit.hxx> #include <PropertyHelper.hxx> #include <LibreOfficeKit/LibreOfficeKitEnums.h> diff --git a/chart2/source/controller/main/ObjectHierarchy.cxx b/chart2/source/controller/main/ObjectHierarchy.cxx index 7ed950e05ebc..a287c0f608ef 100644 --- a/chart2/source/controller/main/ObjectHierarchy.cxx +++ b/chart2/source/controller/main/ObjectHierarchy.cxx @@ -34,7 +34,6 @@ #include <algorithm> #include <iterator> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/chart2/XTitled.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 924e4d9a6690..acdcb78ce045 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -24,7 +24,6 @@ #include <dlg_ShapeFont.hxx> #include <dlg_ShapeParagraph.hxx> #include <chartview/DrawModelWrapper.hxx> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/frame/CommandGroup.hpp> #include <com/sun/star/frame/XStorable.hpp> diff --git a/chart2/source/inc/NumberFormatterWrapper.hxx b/chart2/source/inc/NumberFormatterWrapper.hxx index b9db9fc1943e..c3412fc9c91c 100644 --- a/chart2/source/inc/NumberFormatterWrapper.hxx +++ b/chart2/source/inc/NumberFormatterWrapper.hxx @@ -20,7 +20,6 @@ #include "charttoolsdllapi.hxx" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> -#include <tools/solar.h> #include <tools/date.hxx> class SvNumberFormatter; diff --git a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx index 6e25a84520d9..58d8a9ff2e4d 100644 --- a/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx +++ b/chart2/source/inc/chartview/DataPointSymbolSupplier.hxx @@ -20,7 +20,6 @@ #pragma once #include <chartview/chartviewdllapi.hxx> -#include <com/sun/star/uno/Reference.h> #include <rtl/ref.hxx> #include <svx/unoshape.hxx> diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx index 367af08ea8c2..0c06c2d3ea57 100644 --- a/chart2/source/inc/servicenames_charttypes.hxx +++ b/chart2/source/inc/servicenames_charttypes.hxx @@ -18,6 +18,8 @@ */ #pragma once +#include <rtl/ustring.hxx> + inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_AREA = u"com.sun.star.chart2.AreaChartType"; inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_BAR diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 6cc27d10f127..0f061c66121b 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -22,7 +22,6 @@ #include <officecfg/Office/Common.hxx> #include <svtools/sfxecode.hxx> -#include <unotools/saveopt.hxx> #include <comphelper/genericpropertyset.hxx> #include <comphelper/propertysetinfo.hxx> #include <comphelper/documentconstants.hxx> diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index e5e518b63818..4c67110264ed 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -55,7 +55,6 @@ #include <com/sun/star/chart2/XChartTypeTemplate.hpp> #include <sal/log.hxx> -#include <svl/zforlist.hxx> #include <tools/diagnose_ex.h> #include <libxml/xmlwriter.h> diff --git a/chart2/source/tools/NumberFormatterWrapper.cxx b/chart2/source/tools/NumberFormatterWrapper.cxx index f5bef49d19de..d6e704d145d6 100644 --- a/chart2/source/tools/NumberFormatterWrapper.cxx +++ b/chart2/source/tools/NumberFormatterWrapper.cxx @@ -20,7 +20,6 @@ #include <NumberFormatterWrapper.hxx> #include <svl/numformat.hxx> #include <svl/numuno.hxx> -#include <svl/zforlist.hxx> #include <tools/color.hxx> #include <com/sun/star/util/Date.hpp> #include <osl/diagnose.h> diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index cb48610c359b..bcf92741f4b5 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/style/XStyle.hpp> #include <algorithm> -#include <vector> #include <memory> using namespace ::com::sun::star; diff --git a/chart2/source/view/charttypes/BarChart.cxx b/chart2/source/view/charttypes/BarChart.cxx index 06e041e800df..8ac955266e9c 100644 --- a/chart2/source/view/charttypes/BarChart.cxx +++ b/chart2/source/view/charttypes/BarChart.cxx @@ -28,7 +28,6 @@ #include <Clipping.hxx> #include <DateHelper.hxx> #include <svx/scene3d.hxx> -#include <svx/unoshape.hxx> #include <comphelper/scopeguard.hxx> #include <com/sun/star/chart/DataLabelPlacement.hpp> diff --git a/chart2/source/view/charttypes/BubbleChart.cxx b/chart2/source/view/charttypes/BubbleChart.cxx index 9505e091e8b8..fc7fcdd2597b 100644 --- a/chart2/source/view/charttypes/BubbleChart.cxx +++ b/chart2/source/view/charttypes/BubbleChart.cxx @@ -26,8 +26,6 @@ #include <com/sun/star/chart/DataLabelPlacement.hpp> #include <sal/log.hxx> #include <osl/diagnose.h> -#include <com/sun/star/drawing/XShapes.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <limits> diff --git a/chart2/source/view/charttypes/CandleStickChart.cxx b/chart2/source/view/charttypes/CandleStickChart.cxx index 2b636d3d83c3..44fcd600bd49 100644 --- a/chart2/source/view/charttypes/CandleStickChart.cxx +++ b/chart2/source/view/charttypes/CandleStickChart.cxx @@ -25,7 +25,6 @@ #include "BarPositionHelper.hxx" #include <DateHelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/drawing/XShape.hpp> #include <tools/diagnose_ex.h> #include <osl/diagnose.h> diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 3cff976ac66f..76bb2d11f56a 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -71,8 +71,6 @@ #include <com/sun/star/util/XCloneable.hpp> #include <com/sun/star/chart2/XCoordinateSystemContainer.hpp> -#include <com/sun/star/drawing/XShapes.hpp> - #include <unotools/localedatawrapper.hxx> #include <comphelper/sequence.hxx> #include <vcl/svapp.hxx> diff --git a/chart2/source/view/diagram/VDiagram.cxx b/chart2/source/view/diagram/VDiagram.cxx index 284950f38203..8deea35e2d48 100644 --- a/chart2/source/view/diagram/VDiagram.cxx +++ b/chart2/source/view/diagram/VDiagram.cxx @@ -29,8 +29,6 @@ #include <ThreeDHelper.hxx> #include <defines.hxx> #include <editeng/unoprnms.hxx> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <svx/unoshape.hxx> #include <svx/scene3d.hxx> #include <svx/e3dsceneupdater.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/view/inc/LegendEntryProvider.hxx b/chart2/source/view/inc/LegendEntryProvider.hxx index e695a7af86c9..e0133771cd27 100644 --- a/chart2/source/view/inc/LegendEntryProvider.hxx +++ b/chart2/source/view/inc/LegendEntryProvider.hxx @@ -19,6 +19,7 @@ #pragma once #include <com/sun/star/chart2/LegendPosition.hpp> +#include <com/sun/star/chart2/XFormattedString2.hpp> #include <com/sun/star/awt/Size.hpp> #include <com/sun/star/uno/Reference.h> #include <com/sun/star/uno/Sequence.h> @@ -28,7 +29,6 @@ namespace chart { class ChartModel; } namespace com::sun::star::beans { class XPropertySet; } -namespace com::sun::star::chart2 { class XFormattedString2; } namespace com::sun::star::drawing { class XShape; } namespace com::sun::star::drawing { class XShapes; } namespace com::sun::star::lang { class XMultiServiceFactory; } diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index bb377c76167d..73695507fd48 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include <com/sun/star/uno/Reference.h> #include <rtl/ustring.hxx> #include <svx/unoshape.hxx> #include <vector> diff --git a/chart2/source/view/inc/VDiagram.hxx b/chart2/source/view/inc/VDiagram.hxx index b508cdba88e0..7d8dd3069479 100644 --- a/chart2/source/view/inc/VDiagram.hxx +++ b/chart2/source/view/inc/VDiagram.hxx @@ -18,7 +18,6 @@ */ #pragma once -#include <com/sun/star/drawing/XShapes.hpp> #include <basegfx/range/b2irectangle.hxx> #include <com/sun/star/drawing/Direction3D.hpp> #include <com/sun/star/awt/Size.hpp> diff --git a/chart2/source/view/main/ChartItemPool.cxx b/chart2/source/view/main/ChartItemPool.cxx index fef1b1f8f2d0..37e78c116b76 100644 --- a/chart2/source/view/main/ChartItemPool.cxx +++ b/chart2/source/view/main/ChartItemPool.cxx @@ -21,7 +21,6 @@ #include <chartview/ChartSfxItemIds.hxx> #include <svx/chrtitem.hxx> #include <svx/sdangitm.hxx> -#include <svx/svdobj.hxx> #include <svx/svdpool.hxx> #include <svx/svx3ditems.hxx> #include <svl/intitem.hxx> diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index f1a3e32e760e..de9ffcc9d204 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -49,6 +49,7 @@ #include <defines.hxx> #include <unonames.hxx> #include <editeng/frmdiritem.hxx> +#include <editeng/eeitem.hxx> #include <tools/globname.hxx> #include <comphelper/fileformat.h> #include <comphelper/propertyvalue.hxx> @@ -59,7 +60,6 @@ #include <unotools/streamwrap.hxx> #include <svx/svdpage.hxx> #include <svx/unopage.hxx> -#include <svx/unoshape.hxx> #include <vcl/svapp.hxx> #include <osl/mutex.hxx> #include <svx/unofill.hxx> @@ -81,7 +81,6 @@ #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp> #include <com/sun/star/drawing/GraphicExportFilter.hpp> -#include <com/sun/star/drawing/XShapeGroup.hpp> #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/io/XSeekable.hpp> #include <com/sun/star/lang/IndexOutOfBoundsException.hpp> @@ -93,7 +92,6 @@ #include <com/sun/star/text/XTextEmbeddedObjectsSupplier.hpp> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <svl/itempool.hxx> -#include <svl/languageoptions.hxx> #include <svl/ctloptions.hxx> #include <comphelper/classids.hxx> #include <servicenames_charttypes.hxx> diff --git a/chart2/source/view/main/DrawModelWrapper.cxx b/chart2/source/view/main/DrawModelWrapper.cxx index f5d7e7e5ba81..aa7a002c967a 100644 --- a/chart2/source/view/main/DrawModelWrapper.cxx +++ b/chart2/source/view/main/DrawModelWrapper.cxx @@ -23,9 +23,6 @@ #include <ObjectIdentifier.hxx> #include <svx/unomodel.hxx> #include <svl/itempool.hxx> -#include <svl/eitem.hxx> -#include <editeng/eeitem.hxx> -#include <svx/svx3ditems.hxx> #include <svx/objfac3d.hxx> #include <svx/svdpage.hxx> #include <svx/xtable.hxx> @@ -36,8 +33,6 @@ #include <libxml/xmlwriter.h> #include <osl/diagnose.h> -#include <com/sun/star/container/XChild.hpp> - namespace com::sun::star::linguistic2 { class XHyphenator; } namespace com::sun::star::linguistic2 { class XSpellChecker1; } diff --git a/chart2/source/view/main/PlottingPositionHelper.cxx b/chart2/source/view/main/PlottingPositionHelper.cxx index 0a63747b0ecb..d4ed69579826 100644 --- a/chart2/source/view/main/PlottingPositionHelper.cxx +++ b/chart2/source/view/main/PlottingPositionHelper.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/chart/TimeUnit.hpp> #include <com/sun/star/chart2/AxisType.hpp> -#include <com/sun/star/drawing/DoubleSequence.hpp> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/drawing/XShapes.hpp> diff --git a/chart2/source/view/main/PropertyMapper.cxx b/chart2/source/view/main/PropertyMapper.cxx index 3003ca9ccfe9..d7c1dd8f1c99 100644 --- a/chart2/source/view/main/PropertyMapper.cxx +++ b/chart2/source/view/main/PropertyMapper.cxx @@ -30,7 +30,6 @@ #include <com/sun/star/drawing/LineStyle.hpp> #include <com/sun/star/drawing/RectanglePoint.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <comphelper/sequence.hxx> #include <tools/diagnose_ex.h> #include <svx/unoshape.hxx> #include <svx/svdopath.hxx> diff --git a/chart2/source/view/main/ShapeFactory.cxx b/chart2/source/view/main/ShapeFactory.cxx index 65edbda37094..c44988d58774 100644 --- a/chart2/source/view/main/ShapeFactory.cxx +++ b/chart2/source/view/main/ShapeFactory.cxx @@ -26,7 +26,6 @@ #include <PropertyMapper.hxx> #include <VLineProperties.hxx> #include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/beans/XMultiPropertySet.hpp> #include <com/sun/star/chart2/XFormattedString.hpp> #include <com/sun/star/drawing/CircleKind.hpp> #include <com/sun/star/drawing/DoubleSequence.hpp> @@ -39,13 +38,11 @@ #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/TextureProjectionMode.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> -#include <com/sun/star/drawing/XDrawPage.hpp> #include <com/sun/star/drawing/XShapes2.hpp> #include <com/sun/star/graphic/XGraphic.hpp> #include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> -#include <com/sun/star/text/XText.hpp> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Any.hxx> @@ -54,7 +51,6 @@ #include <basegfx/point/b2dpoint.hxx> #include <basegfx/matrix/b3dhommatrix.hxx> -#include <svx/unoprov.hxx> #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> #include <tools/diagnose_ex.h> diff --git a/chart2/source/view/main/VButton.cxx b/chart2/source/view/main/VButton.cxx index c2aebd913b88..dc8e22c4961d 100644 --- a/chart2/source/view/main/VButton.cxx +++ b/chart2/source/view/main/VButton.cxx @@ -12,14 +12,10 @@ #include <ShapeFactory.hxx> #include <com/sun/star/drawing/FillStyle.hpp> #include <com/sun/star/drawing/LineStyle.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/style/ParagraphAdjust.hpp> #include <com/sun/star/drawing/TextVerticalAdjust.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> - -#include <memory> #include <CommonConverters.hxx> #include <editeng/unoprnms.hxx> diff --git a/chart2/source/view/main/VLegend.cxx b/chart2/source/view/main/VLegend.cxx index 6acfbb14d4ce..1dfe3653e4d1 100644 --- a/chart2/source/view/main/VLegend.cxx +++ b/chart2/source/view/main/VLegend.cxx @@ -31,7 +31,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/drawing/TextHorizontalAdjust.hpp> #include <com/sun/star/drawing/LineJoint.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/chart/ChartLegendExpansion.hpp> #include <com/sun/star/chart2/LegendPosition.hpp> #include <com/sun/star/chart2/RelativePosition.hpp> @@ -40,7 +39,6 @@ #include <com/sun/star/chart2/data/XPivotTableDataProvider.hpp> #include <com/sun/star/chart2/data/PivotTableFieldEntry.hpp> #include <rtl/math.hxx> -#include <svl/languageoptions.hxx> #include <svl/ctloptions.hxx> #include <tools/diagnose_ex.h> #include <tools/UnitConversion.hxx> diff --git a/chart2/source/view/main/VLegendSymbolFactory.cxx b/chart2/source/view/main/VLegendSymbolFactory.cxx index f4bec2397d89..451e32e45409 100644 --- a/chart2/source/view/main/VLegendSymbolFactory.cxx +++ b/chart2/source/view/main/VLegendSymbolFactory.cxx @@ -22,9 +22,7 @@ #include <ShapeFactory.hxx> #include <com/sun/star/drawing/Position3D.hpp> #include <com/sun/star/chart2/Symbol.hpp> -#include <com/sun/star/drawing/XShapes.hpp> #include <com/sun/star/drawing/Direction3D.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> #include <tools/diagnose_ex.h> #include <sal/log.hxx> diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index be8065725636..4c66d03ffd08 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -20,8 +20,6 @@ #include <comphelper/accimplaccess.hxx> #include <comphelper/servicehelper.hxx> -#include <string.h> - namespace comphelper { diff --git a/comphelper/source/misc/asyncnotification.cxx b/comphelper/source/misc/asyncnotification.cxx index 81552d9750cf..cb8a2f251164 100644 --- a/comphelper/source/misc/asyncnotification.cxx +++ b/comphelper/source/misc/asyncnotification.cxx @@ -21,7 +21,6 @@ #include <comphelper/scopeguard.hxx> #include <mutex> #include <condition_variable> -#include <osl/mutex.hxx> #include <cassert> #include <stdexcept> diff --git a/comphelper/source/misc/backupfilehelper.cxx b/comphelper/source/misc/backupfilehelper.cxx index b27453558bba..22bd5c5a851f 100644 --- a/comphelper/source/misc/backupfilehelper.cxx +++ b/comphelper/source/misc/backupfilehelper.cxx @@ -41,7 +41,6 @@ #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/TempFile.hpp> #include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/xml/sax/XDocumentHandler.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/exc_hlp.hxx> diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index 28d655223062..a24572c6c865 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -19,7 +19,6 @@ #include <cppuhelper/supportsservice.hxx> -#include <comphelper/interfacecontainer2.hxx> #include <com/sun/star/util/CloseVetoException.hpp> #include <com/sun/star/util/XCloseBroadcaster.hpp> diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index c5420b6ff931..7391c5d7d365 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -28,7 +28,6 @@ #include <cppuhelper/weakref.hxx> #include <cppuhelper/implbase.hxx> #include <rtl/ref.hxx> -#include <memory> #include <mutex> namespace com::sun::star::embed { class XActionsApproval; } diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 45037f862bd7..b11bf4e83582 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -10,7 +10,6 @@ #include <comphelper/lok.hxx> #include <i18nlangtag/languagetag.hxx> #include <sal/log.hxx> -#include <algorithm> #include <iostream> diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index ad6e308d2819..39c61a4e53a3 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <cppuhelper/supportsservice.hxx> -#include <rtl/ref.hxx> #include "officerestartmanager.hxx" using namespace ::com::sun::star; diff --git a/comphelper/source/misc/traceevent.cxx b/comphelper/source/misc/traceevent.cxx index 8b1a9c09427a..ab71853e1292 100644 --- a/comphelper/source/misc/traceevent.cxx +++ b/comphelper/source/misc/traceevent.cxx @@ -11,7 +11,6 @@ #include <atomic> #include <iostream> -#include <string_view> #include <comphelper/profilezone.hxx> #include <comphelper/sequence.hxx> diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index de6b284c5f68..fb0359a748f7 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -28,7 +28,6 @@ *************************************************************************/ #include <osl/file.hxx> -#include <rtl/ref.hxx> #include <com/sun/star/util/theMacroExpander.hpp> #include <comphelper/fileurl.hxx> diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 8e86cb2d5c0f..f3546831f408 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -19,7 +19,6 @@ #pragma once -#include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index f21afe3951cd..049827d7e45f 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -20,7 +20,6 @@ #include <comphelper/propertysetinfo.hxx> #include <comphelper/sequence.hxx> -#include <vector> using namespace ::comphelper; diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index 25596f17473c..5d10029a5024 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/seqstream.hxx> diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 84900014aad4..d70377d70f48 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -19,7 +19,6 @@ #include <sal/config.h> -#include <osl/mutex.hxx> #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <comphelper/seqstream.hxx> diff --git a/configmgr/IwyuFilter_configmgr.yaml b/configmgr/IwyuFilter_configmgr.yaml index 3a54ce434a21..5cb79e6ae069 100644 --- a/configmgr/IwyuFilter_configmgr.yaml +++ b/configmgr/IwyuFilter_configmgr.yaml @@ -24,6 +24,7 @@ excludelist: # Actually used - vector - com/sun/star/uno/XInterface.hpp + - com/sun/star/uno/Sequence.hxx configmgr/source/configurationprovider.cxx: # Actually used - com/sun/star/uno/XInterface.hpp diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 95c5de4ed47a..30e75eb9e8b7 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -57,7 +57,6 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/RuntimeException.hpp> diff --git a/connectivity/IwyuFilter_connectivity.yaml b/connectivity/IwyuFilter_connectivity.yaml index 8ce2a6d004bf..976f124f1447 100644 --- a/connectivity/IwyuFilter_connectivity.yaml +++ b/connectivity/IwyuFilter_connectivity.yaml @@ -39,6 +39,9 @@ excludelist: - com/sun/star/form/XDatabaseParameterListener.hpp - com/sun/star/sdbc/XParameters.hpp - com/sun/star/task/XInteractionHandler.hpp + connectivity/source/commontools/DriversConfig.cxx: + # Needed for ENABLE_FUZZERS + - o3tl/string_view.hxx connectivity/source/cpool/ZPoolCollection.cxx: # Actually used - com/sun/star/beans/PropertyValue.hpp @@ -71,5 +74,8 @@ excludelist: connectivity/source/drivers/odbc/OTools.cxx: # OSL_BIGENDIAN is being checked - osl/endian.h + connectivity/source/drivers/postgresql/pq_connection.cxx: + # Needed for using deleter_from_fn + - pq_tools.hxx connectivity/source/drivers/writer/WDatabaseMetaData.cxx: - com/sun/star/text/XTextDocument.hpp diff --git a/connectivity/inc/strings.hxx b/connectivity/inc/strings.hxx index ffd28ac63706..ef00d11de45f 100644 --- a/connectivity/inc/strings.hxx +++ b/connectivity/inc/strings.hxx @@ -9,6 +9,8 @@ #pragma once +#include <rtl/ustring.hxx> + // = log messages for the JDBC driver #define STR_LOG_DRIVER_CONNECTING_URL "jdbcBridge: connecting to URL '$1$'" diff --git a/connectivity/source/commontools/dbconversion.cxx b/connectivity/source/commontools/dbconversion.cxx index fe26e3341d9f..d1cfd7ac7f6e 100644 --- a/connectivity/source/commontools/dbconversion.cxx +++ b/connectivity/source/commontools/dbconversion.cxx @@ -18,13 +18,11 @@ */ #include <connectivity/dbconversion.hxx> -#include <osl/diagnose.h> #include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/Time.hpp> #include <com/sun/star/util/DateTime.hpp> #include <rtl/character.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> #include <unotools/datetime.hxx> diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 0d4394ca6963..ce6f3a6a03ba 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -58,7 +58,6 @@ #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #include <com/sun/star/task/InteractionHandler.hpp> -#include <com/sun/star/task/XInteractionRequest.hpp> #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> #include <com/sun/star/util/NumberFormat.hpp> #include <com/sun/star/util/NumberFormatsSupplier.hpp> diff --git a/connectivity/source/commontools/sqlerror.cxx b/connectivity/source/commontools/sqlerror.cxx index 82525dc44f4a..28565fb46884 100644 --- a/connectivity/source/commontools/sqlerror.cxx +++ b/connectivity/source/commontools/sqlerror.cxx @@ -25,7 +25,6 @@ #include <com/sun/star/sdb/ErrorCondition.hpp> #include <cppuhelper/exc_hlp.hxx> -#include <rtl/ustrbuf.hxx> #include <unotools/resmgr.hxx> #include <osl/diagnose.h> diff --git a/connectivity/source/drivers/file/fcode.cxx b/connectivity/source/drivers/file/fcode.cxx index 14fb8f41d6f8..d41d3e6077aa 100644 --- a/connectivity/source/drivers/file/fcode.cxx +++ b/connectivity/source/drivers/file/fcode.cxx @@ -20,7 +20,7 @@ #include <file/fcode.hxx> #include <osl/diagnose.h> #include <sal/log.hxx> -#include <connectivity/sqlparse.hxx> +#include <connectivity/sqlnode.hxx> #include <sqlbison.hxx> #include <com/sun/star/sdb/SQLFilterOperator.hpp> diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index e725b1870865..5a1646a20c70 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -22,9 +22,6 @@ #include <connectivity/sqlparse.hxx> #include <file/fanalyzer.hxx> #include <com/sun/star/sdbc/XColumnLocate.hpp> -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/Time.hpp> #include <connectivity/dbexception.hxx> #include <connectivity/dbconversion.hxx> #include <com/sun/star/sdb/SQLFilterOperator.hpp> diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx index 707020b39bbf..dde050edee3a 100644 --- a/connectivity/source/drivers/firebird/Clob.cxx +++ b/connectivity/source/drivers/firebird/Clob.cxx @@ -9,8 +9,6 @@ #include <sal/config.h> -#include <string_view> - #include "Clob.hxx" #include "Blob.hxx" diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index d2245f88653f..64a8495bfc3c 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -22,7 +22,6 @@ #include "Clob.hxx" #include "Connection.hxx" #include "DatabaseMetaData.hxx" -#include "Driver.hxx" #include "PreparedStatement.hxx" #include "Statement.hxx" #include "Util.hxx" @@ -48,7 +47,6 @@ #include <comphelper/storagehelper.hxx> #include <cppuhelper/exc_hlp.hxx> #include <unotools/tempfile.hxx> -#include <unotools/localfilehelper.hxx> #include <osl/file.hxx> #include <rtl/strbuf.hxx> diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index c9dc6155d0e0..3a1b80292adc 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -31,7 +31,6 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> #include <sal/log.hxx> -#include <unotools/localfilehelper.hxx> using namespace com::sun::star; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index 04e65b9c5e95..c665581f8c32 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -20,8 +20,6 @@ #include <sal/config.h> #include <cmath> -#include <string_view> - #include "Connection.hxx" #include "PreparedStatement.hxx" #include "ResultSet.hxx" diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index 234fd134562f..1c03f73e154d 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "Driver.hxx" #include "StatementCommonBase.hxx" #include "Util.hxx" diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx index ebd6f2309cc8..8337949b3d80 100644 --- a/connectivity/source/drivers/firebird/Tables.cxx +++ b/connectivity/source/drivers/firebird/Tables.cxx @@ -10,7 +10,6 @@ #include "Table.hxx" #include "Tables.hxx" #include "Catalog.hxx" -#include "Util.hxx" #include <TConnection.hxx> diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index f4676c8712c6..4c8c446dfeaa 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -27,7 +27,6 @@ #include <o3tl/safeint.hxx> #include <rtl/math.hxx> #include <sal/log.hxx> -#include <tools/solar.h> #include <tools/urlobj.hxx> #include <cppuhelper/queryinterface.hxx> #include <comphelper/numbers.hxx> diff --git a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 46866df04b33..e352f78fbe5a 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx @@ -24,7 +24,6 @@ #include <com/sun/star/embed/XStorage.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <hsqldb/HStorageMap.hxx> -#include <osl/diagnose.h> #include <tools/diagnose_ex.h> using namespace ::com::sun::star::container; diff --git a/connectivity/source/drivers/jdbc/Object.cxx b/connectivity/source/drivers/jdbc/Object.cxx index b2dd83168e5e..f05eced9df9a 100644 --- a/connectivity/source/drivers/jdbc/Object.cxx +++ b/connectivity/source/drivers/jdbc/Object.cxx @@ -29,8 +29,6 @@ #include <comphelper/logging.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <memory> - using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index b18d4778e2da..dc2bfa34f5fd 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -19,10 +19,8 @@ #pragma once -#include <map> #include <connectivity/CommonTools.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/sdbc/XWarningsSupplier.hpp> #include <com/sun/star/sdbc/XConnection.hpp> #include <com/sun/star/sdbcx/XTablesSupplier.hpp> diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index 5c55fa60d54b..b54b844c9b20 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -30,6 +30,7 @@ #include <com/sun/star/sdbc/ColumnSearch.hpp> #include <com/sun/star/sdbc/ColumnValue.hpp> #include <com/sun/star/sdbc/ResultSetType.hpp> +#include <com/sun/star/sdbc/SQLException.hpp> #include <com/sun/star/sdbc/TransactionIsolation.hpp> #include <rtl/ref.hxx> diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index f75391dedb46..d18f5e9827f4 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/sdbc/XDriver.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <cppuhelper/compbase.hxx> diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index d0ed7298f92b..e08d92cfceb6 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -23,6 +23,7 @@ #include "MacabRecords.hxx" #include "MacabAddressBook.hxx" #include "macabutilities.hxx" +#include <connectivity/dbexception.hxx> #include <strings.hrc> using namespace connectivity::macab; diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index a7afdf4a094a..b82088154cb9 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -23,7 +23,6 @@ #include <connectivity/CommonTools.hxx> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase.hxx> -#include <connectivity/dbexception.hxx> #include <rtl/ref.hxx> namespace connectivity::macab diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 6b0c53c234ad..700a895c0a38 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -24,6 +24,7 @@ #include <connectivity/sqliterator.hxx> #include <connectivity/sqlparse.hxx> #include <com/sun/star/sdbc/XStatement.hpp> +#include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/util/XCancellable.hpp> #include <cppuhelper/compbase.hxx> #include <cppuhelper/implbase.hxx> diff --git a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx index 3d0ac9ce8411..88d7f7cf05dc 100644 --- a/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx +++ b/connectivity/source/drivers/mysqlc/mysqlc_resultsetmetadata.cxx @@ -21,7 +21,6 @@ #include "mysqlc_general.hxx" #include <com/sun/star/sdbc/XRow.hpp> -#include <rtl/ustrbuf.hxx> using namespace connectivity::mysqlc; using namespace com::sun::star::uno; diff --git a/connectivity/source/drivers/postgresql/pq_driver.hxx b/connectivity/source/drivers/postgresql/pq_driver.hxx index c35a117f7816..31d407f36965 100644 --- a/connectivity/source/drivers/postgresql/pq_driver.hxx +++ b/connectivity/source/drivers/postgresql/pq_driver.hxx @@ -36,7 +36,6 @@ #pragma once -#include <osl/mutex.hxx> #include <sal/macros.h> #include <cppuhelper/compbase.hxx> #include <cppuhelper/basemutex.hxx> diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx index 344c27175850..d7a73289b077 100644 --- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx +++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx @@ -40,7 +40,6 @@ #include "pq_statics.hxx" #include "pq_statement.hxx" -#include <o3tl/deleter.hxx> #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> diff --git a/connectivity/source/drivers/postgresql/pq_statics.cxx b/connectivity/source/drivers/postgresql/pq_statics.cxx index f08cbda863e2..3ae01b8b267c 100644 --- a/connectivity/source/drivers/postgresql/pq_statics.cxx +++ b/connectivity/source/drivers/postgresql/pq_statics.cxx @@ -35,7 +35,6 @@ ************************************************************************/ #include "pq_statics.hxx" -#include "pq_updateableresultset.hxx" #include <com/sun/star/sdbc/DataType.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> diff --git a/connectivity/source/drivers/postgresql/pq_xbase.cxx b/connectivity/source/drivers/postgresql/pq_xbase.cxx index 1fec4130a9db..5dbe6e98b5ab 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.cxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.cxx @@ -37,6 +37,7 @@ #include <cppuhelper/supportsservice.hxx> #include <comphelper/sequence.hxx> +#include "pq_statics.hxx" #include "pq_tools.hxx" #include "pq_xbase.hxx" diff --git a/connectivity/source/drivers/postgresql/pq_xbase.hxx b/connectivity/source/drivers/postgresql/pq_xbase.hxx index 80e553325c93..3cd16bc70ee2 100644 --- a/connectivity/source/drivers/postgresql/pq_xbase.hxx +++ b/connectivity/source/drivers/postgresql/pq_xbase.hxx @@ -36,7 +36,6 @@ #pragma once #include <cppuhelper/propshlp.hxx> -#include <cppuhelper/component.hxx> #include <cppuhelper/compbase.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> diff --git a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx index 33e57a1a5445..b19d95c3c994 100644 --- a/connectivity/source/drivers/postgresql/pq_xcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xcolumn.cxx @@ -38,6 +38,7 @@ #include <rtl/ref.hxx> +#include "pq_statics.hxx" #include "pq_xcolumn.hxx" using com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx index 1e17fef28db5..fd9d432bfad3 100644 --- a/connectivity/source/drivers/postgresql/pq_xcontainer.hxx +++ b/connectivity/source/drivers/postgresql/pq_xcontainer.hxx @@ -53,8 +53,6 @@ #include <unordered_map> -#include "pq_statics.hxx" - namespace pq_sdbc_driver { diff --git a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx index 58cae851f441..fe72059bc15a 100644 --- a/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xindexcolumn.cxx @@ -38,6 +38,7 @@ #include <rtl/ref.hxx> +#include "pq_statics.hxx" #include "pq_xindexcolumn.hxx" using com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx index 10c3dbb474cd..30eef179716c 100644 --- a/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx +++ b/connectivity/source/drivers/postgresql/pq_xkeycolumn.cxx @@ -38,6 +38,7 @@ #include <rtl/ref.hxx> +#include "pq_statics.hxx" #include "pq_xkeycolumn.hxx" using com::sun::star::uno::Reference; diff --git a/connectivity/source/drivers/postgresql/pq_xtable.hxx b/connectivity/source/drivers/postgresql/pq_xtable.hxx index dc1577612db8..7c8ca73f566b 100644 --- a/connectivity/source/drivers/postgresql/pq_xtable.hxx +++ b/connectivity/source/drivers/postgresql/pq_xtable.hxx @@ -36,19 +36,14 @@ #pragma once -#include <cppuhelper/component.hxx> -#include <cppuhelper/propshlp.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/sdbcx/XIndexesSupplier.hpp> #include <com/sun/star/sdbcx/XKeysSupplier.hpp> #include <com/sun/star/sdbcx/XRename.hpp> #include <com/sun/star/sdbcx/XAlterTable.hpp> -#include <com/sun/star/container/XNamed.hpp> #include "pq_xbase.hxx" +#include "pq_xcolumns.hxx" namespace pq_sdbc_driver { diff --git a/connectivity/source/drivers/postgresql/pq_xuser.hxx b/connectivity/source/drivers/postgresql/pq_xuser.hxx index 8072cae415bb..702787a67496 100644 --- a/connectivity/source/drivers/postgresql/pq_xuser.hxx +++ b/connectivity/source/drivers/postgresql/pq_xuser.hxx @@ -36,11 +36,6 @@ #pragma once -#include <cppuhelper/component.hxx> -#include <cppuhelper/propshlp.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XUser.hpp> #include "pq_xbase.hxx" diff --git a/connectivity/source/drivers/postgresql/pq_xview.hxx b/connectivity/source/drivers/postgresql/pq_xview.hxx index 055fd921864f..f68b5535a8d7 100644 --- a/connectivity/source/drivers/postgresql/pq_xview.hxx +++ b/connectivity/source/drivers/postgresql/pq_xview.hxx @@ -36,13 +36,7 @@ #pragma once -#include <cppuhelper/component.hxx> -#include <cppuhelper/propshlp.hxx> - -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XRename.hpp> -#include <com/sun/star/container/XNamed.hpp> #include "pq_xbase.hxx" diff --git a/cppcanvas/source/inc/implrenderer.hxx b/cppcanvas/source/inc/implrenderer.hxx index 1df9ac93207f..4e39cea723dc 100644 --- a/cppcanvas/source/inc/implrenderer.hxx +++ b/cppcanvas/source/inc/implrenderer.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <sal/types.h> +#include <o3tl/span.hxx> #include <tools/stream.hxx> #include <vcl/metaactiontypes.hxx> #include <cppcanvas/renderer.hxx> diff --git a/cppcanvas/source/mtfrenderer/textaction.hxx b/cppcanvas/source/mtfrenderer/textaction.hxx index 279f810f8efb..f59ed4115c76 100644 --- a/cppcanvas/source/mtfrenderer/textaction.hxx +++ b/cppcanvas/source/mtfrenderer/textaction.hxx @@ -22,6 +22,7 @@ #include <action.hxx> #include <cppcanvas/canvas.hxx> #include <cppcanvas/renderer.hxx> +#include <o3tl/span.hxx> class VirtualDevice; class Point; diff --git a/cppcanvas/source/wrapper/implbitmapcanvas.cxx b/cppcanvas/source/wrapper/implbitmapcanvas.cxx index bb34f8e5aa3c..883ebb005a99 100644 --- a/cppcanvas/source/wrapper/implbitmapcanvas.cxx +++ b/cppcanvas/source/wrapper/implbitmapcanvas.cxx @@ -18,8 +18,6 @@ */ -#include <com/sun/star/rendering/XCanvas.hpp> - #include <basegfx/utils/canvastools.hxx> #include <osl/diagnose.h> diff --git a/cppu/qa/cppumaker/test_cppumaker.cxx b/cppu/qa/cppumaker/test_cppumaker.cxx index 78097e26e854..e1c3a414d4b3 100644 --- a/cppu/qa/cppumaker/test_cppumaker.cxx +++ b/cppu/qa/cppumaker/test_cppumaker.cxx @@ -360,7 +360,6 @@ #include <cppunit/TestFixture.h> #include <cppunit/extensions/HelperMacros.h> #include <cppunit/plugin/TestPlugIn.h> -#include <o3tl/cppunittraitshelper.hxx> #include <rtl/ustring.hxx> #include <cstddef> diff --git a/cppu/qa/test_any.cxx b/cppu/qa/test_any.cxx index 4cf9d181984f..69ab2a04723c 100644 --- a/cppu/qa/test_any.cxx +++ b/cppu/qa/test_any.cxx @@ -45,7 +45,6 @@ #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Type.hxx> -#include <o3tl/cppunittraitshelper.hxx> #include <osl/interlck.h> #include <rtl/ustring.hxx> diff --git a/cppu/source/typelib/typelib.cxx b/cppu/source/typelib/typelib.cxx index 36b815492e3b..d659171f1722 100644 --- a/cppu/source/typelib/typelib.cxx +++ b/cppu/source/typelib/typelib.cxx @@ -25,7 +25,6 @@ #include <set> #include <utility> #include <vector> -#include <memory> #include <stdlib.h> #include <string.h> diff --git a/cppu/source/typelib/typelib.hxx b/cppu/source/typelib/typelib.hxx index 4d2e9cb7e6dc..b62e763deeaa 100644 --- a/cppu/source/typelib/typelib.hxx +++ b/cppu/source/typelib/typelib.hxx @@ -19,6 +19,11 @@ #pragma once +#include <rtl/ustring.h> +#include <sal/types.h> +#include <typelib/typeclass.h> +#include <typelib/typedescription.h> + extern "C" sal_Int32 typelib_typedescription_getAlignedUnoSize( const typelib_TypeDescription * pTypeDescription, sal_Int32 nOffset, diff --git a/cppuhelper/source/typemanager.cxx b/cppuhelper/source/typemanager.cxx index d6bf844a74ee..7d22994a1767 100644 --- a/cppuhelper/source/typemanager.cxx +++ b/cppuhelper/source/typemanager.cxx @@ -47,7 +47,6 @@ #include <cppuhelper/implbase.hxx> #include <cppuhelper/supportsservice.hxx> #include <osl/file.hxx> -#include <osl/mutex.hxx> #include <rtl/ref.hxx> #include <rtl/ustring.hxx> #include <sal/log.hxx> diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx index 5af582002432..9998e7cdb7c4 100644 --- a/cpputools/source/sp2bv/sp2bv.cxx +++ b/cpputools/source/sp2bv/sp2bv.cxx @@ -17,11 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ #include <stdio.h> -#include <stdlib.h> #include <string.h> #include <osl/thread.h> #include <osl/file.h> -#include <rtl/ustring.hxx> #include <rtl/ustrbuf.h> static bool hasOption(char const * szOption, int argc, char** argv); diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx index 38f1249ba71e..b9dca78b67ce 100644 --- a/cpputools/source/unoexe/unoexe.cxx +++ b/cpputools/source/unoexe/unoexe.cxx @@ -28,9 +28,6 @@ #include <osl/conditn.hxx> #include <rtl/process.h> -#include <rtl/string.h> -#include <rtl/strbuf.hxx> -#include <rtl/ustrbuf.hxx> #include <rtl/ref.hxx> #include <cppuhelper/bootstrap.hxx> diff --git a/cui/IwyuFilter_cui.yaml b/cui/IwyuFilter_cui.yaml index 69ecc5b3d9de..739afefd4ee7 100644 --- a/cui/IwyuFilter_cui.yaml +++ b/cui/IwyuFilter_cui.yaml @@ -20,6 +20,9 @@ excludelist: # Actually used - com/sun/star/graphic/XGraphic.hpp - com/sun/star/security/XCertificate.hpp + cui/source/factory/dlgfact.cxx: + # Needed on WIN + - fileextcheckdlg.hxx cui/source/dialogs/thesdlg.cxx: # Actually used - com/sun/star/linguistic2/XMeaning.hpp @@ -36,3 +39,6 @@ excludelist: cui/source/customize/cfg.cxx: # Actually used - com/sun/star/ui/dialogs/XFilePicker3.hpp + cui/source/dialogs/AdditionsDialog.cxx: + # Actually needed for orcus::json::parse_error + - orcus/json_parser.hpp diff --git a/cui/inc/treeopt.hrc b/cui/inc/treeopt.hrc index c7ee66d7e8d0..a3033143983b 100644 --- a/cui/inc/treeopt.hrc +++ b/cui/inc/treeopt.hrc @@ -23,6 +23,7 @@ #include <sfx2/pageids.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> +#include <unotools/resmgr.hxx> #include <utility> diff --git a/cui/inc/twolines.hrc b/cui/inc/twolines.hrc index c0e46d70144e..659efa838cd7 100644 --- a/cui/inc/twolines.hrc +++ b/cui/inc/twolines.hrc @@ -10,6 +10,7 @@ #pragma once #include <sal/types.h> +#include <unotools/resmgr.hxx> #include <utility> diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx index e083d4bd438e..8531907e805c 100644 --- a/cui/source/customize/cfg.cxx +++ b/cui/source/customize/cfg.cxx @@ -90,7 +90,6 @@ #include <comphelper/propertysequence.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/processfactory.hxx> -#include <officecfg/Office/Common.hxx> namespace uno = com::sun::star::uno; namespace frame = com::sun::star::frame; diff --git a/cui/source/dialogs/AdditionsDialog.cxx b/cui/source/dialogs/AdditionsDialog.cxx index d2337d7333a5..425de0230ff6 100644 --- a/cui/source/dialogs/AdditionsDialog.cxx +++ b/cui/source/dialogs/AdditionsDialog.cxx @@ -12,7 +12,6 @@ #include <algorithm> #include <cmath> -#include <string_view> #include <config_folders.h> diff --git a/cui/source/dialogs/FontFeaturesDialog.cxx b/cui/source/dialogs/FontFeaturesDialog.cxx index 4735de194255..8b01de6711f0 100644 --- a/cui/source/dialogs/FontFeaturesDialog.cxx +++ b/cui/source/dialogs/FontFeaturesDialog.cxx @@ -12,7 +12,6 @@ #include <rtl/ustrbuf.hxx> #include <vcl/font/FeatureParser.hxx> #include <FontFeatures.hxx> -#include <svtools/colorcfg.hxx> #include <unordered_set> using namespace css; diff --git a/cui/source/dialogs/GraphicTestsDialog.cxx b/cui/source/dialogs/GraphicTestsDialog.cxx index c6232c2e8868..ad0c25aab1f5 100644 --- a/cui/source/dialogs/GraphicTestsDialog.cxx +++ b/cui/source/dialogs/GraphicTestsDialog.cxx @@ -11,14 +11,17 @@ #include <comphelper/processfactory.hxx> #include <comphelper/DirectoryHelper.hxx> #include <osl/file.hxx> +#include <svx/FileExportedDialog.hxx> #include <unotools/ZipPackageHelper.hxx> #include <GraphicsTestsDialog.hxx> #include <vcl/test/GraphicsRenderTests.hxx> #include <svl/svlresid.hxx> #include <svl/svl.hrc> +#include <vcl/svapp.hxx> #include <dialmgr.hxx> #include <strings.hrc> +#include <ImageViewerDialog.hxx> GraphicTestEntry::GraphicTestEntry(weld::Container* pParent, weld::Dialog* pDialog, OUString aTestName, OUString aTestStatus, Bitmap aTestBitmap) diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx b/cui/source/dialogs/SignSignatureLineDialog.cxx index 0174cee0b178..1f1bd4551080 100644 --- a/cui/source/dialogs/SignSignatureLineDialog.cxx +++ b/cui/source/dialogs/SignSignatureLineDialog.cxx @@ -33,7 +33,6 @@ #include <com/sun/star/graphic/XGraphicProvider.hpp> #include <com/sun/star/security/CertificateKind.hpp> #include <com/sun/star/security/XCertificate.hpp> -#include <com/sun/star/ui/dialogs/FilePicker.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/ui/dialogs/XFilePicker3.hpp> diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx index 4cfd57d988af..559e878ce25c 100644 --- a/cui/source/dialogs/cuigaldlg.cxx +++ b/cui/source/dialogs/cuigaldlg.cxx @@ -46,7 +46,6 @@ #include <com/sun/star/sdbc/XRow.hpp> #include <com/sun/star/ucb/ContentCreationException.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <dialmgr.hxx> #include <strings.hrc> diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx index 114a2f07649c..cb1778329974 100644 --- a/cui/source/dialogs/hangulhanjadlg.cxx +++ b/cui/source/dialogs/hangulhanjadlg.cxx @@ -28,7 +28,6 @@ #include <osl/diagnose.h> #include <tools/debug.hxx> #include <i18nlangtag/languagetag.hxx> -#include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/weldutils.hxx> #include <unotools/lingucfg.hxx> diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx index 980a10d8c225..93921c0bd302 100644 --- a/cui/source/dialogs/hldocntp.cxx +++ b/cui/source/dialogs/hldocntp.cxx @@ -25,8 +25,6 @@ #include <svl/stritem.hxx> #include <com/sun/star/awt/XTopWindow.hpp> #include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/uno/Exception.hpp> #include <vcl/svapp.hxx> #include <vcl/weld.hxx> @@ -37,7 +35,7 @@ #include <unotools/ucbhelper.hxx> #include <comphelper/processfactory.hxx> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <cuihyperdlg.hxx> diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx index 01026742da15..ffee53198b39 100644 --- a/cui/source/dialogs/linkdlg.cxx +++ b/cui/source/dialogs/linkdlg.cxx @@ -37,7 +37,7 @@ #include <sfx2/objsh.hxx> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <comphelper/processfactory.hxx> #include <dialmgr.hxx> diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx index aba063eb7b13..545fb594ef9b 100644 --- a/cui/source/dialogs/multipat.cxx +++ b/cui/source/dialogs/multipat.cxx @@ -30,7 +30,7 @@ #include <strings.hrc> #include <comphelper/processfactory.hxx> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <unotools/pathoptions.hxx> diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx index b089f5f8e14b..1e8485513f16 100644 --- a/cui/source/dialogs/showcols.cxx +++ b/cui/source/dialogs/showcols.cxx @@ -19,7 +19,6 @@ #include <showcols.hxx> -#include <osl/diagnose.h> #include <com/sun/star/beans/XPropertySet.hpp> #include <comphelper/types.hxx> #include <tools/debug.hxx> diff --git a/cui/source/dialogs/tipofthedaydlg.cxx b/cui/source/dialogs/tipofthedaydlg.cxx index 34193bff90de..8e609122de50 100644 --- a/cui/source/dialogs/tipofthedaydlg.cxx +++ b/cui/source/dialogs/tipofthedaydlg.cxx @@ -27,7 +27,6 @@ #include <vcl/help.hxx> #include <vcl/window.hxx> -#include <com/sun/star/frame/XDesktop2.hpp> #include <com/sun/star/frame/XDispatch.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> #include <com/sun/star/util/URL.hpp> diff --git a/cui/source/inc/GraphicsTestsDialog.hxx b/cui/source/inc/GraphicsTestsDialog.hxx index 3f8a151f8080..2bf18de5dde7 100644 --- a/cui/source/inc/GraphicsTestsDialog.hxx +++ b/cui/source/inc/GraphicsTestsDialog.hxx @@ -8,13 +8,9 @@ */ #pragma once -#include <vcl/bitmapex.hxx> -#include <vcl/svapp.hxx> +#include <vcl/bitmap.hxx> #include <vcl/weld.hxx> #include <tools/link.hxx> -#include <svx/FileExportedDialog.hxx> - -#include "ImageViewerDialog.hxx" #include <vector> diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h index 2ac2fbd0b02c..f82e0a1c8166 100644 --- a/cui/source/inc/helpids.h +++ b/cui/source/inc/helpids.h @@ -18,6 +18,8 @@ */ #pragma once +#include <rtl/string.hxx> + inline constexpr OStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME = "CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"; inline constexpr OStringLiteral HID_OFA_FONT_SUBST_CLB = "CUI_HID_OFA_FONT_SUBST_CLB"; diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx index d48e87b7d759..a6a7f2bd6f46 100644 --- a/cui/source/inc/textattr.hxx +++ b/cui/source/inc/textattr.hxx @@ -19,7 +19,7 @@ #pragma once #include <svx/dlgctrl.hxx> -#include <svx/svdobj.hxx> +#include <svx/svdobjkind.hxx> class SdrView; diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 0932ac2e7a84..3aff94b3217e 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -16,7 +16,7 @@ #include <com/sun/star/xml/crypto/NSSInitializer.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <comphelper/processfactory.hxx> using namespace ::com::sun::star; diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx index 94a192cfddc7..50dce2c1cb8e 100644 --- a/cui/source/options/optasian.cxx +++ b/cui/source/options/optasian.cxx @@ -20,7 +20,6 @@ #include <memory> #include <map> #include <optasian.hxx> -#include <osl/diagnose.h> #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <o3tl/any.hxx> diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index 9c657176527f..91e8cf911e99 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -30,7 +30,6 @@ #include <i18nlangtag/mslangid.hxx> #include <o3tl/safeint.hxx> #include <vcl/svapp.hxx> -#include <unotools/saveopt.hxx> #include <svl/intitem.hxx> #include <vcl/settings.hxx> diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index 7fed385e595b..69302982214e 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -50,8 +50,6 @@ #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> -#include <com/sun/star/ucb/XContentProvider.hpp> #if HAVE_FEATURE_JAVA #include <jvmfwk/framework.hxx> #endif diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 39c9b69fd392..d6ccbf113e25 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -36,8 +36,8 @@ #include <com/sun/star/beans/PropertyAttribute.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/ui/dialogs/XAsynchronousExecutableDialog.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> -#include <com/sun/star/ui/dialogs/FilePicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> +#include <com/sun/star/ui/dialogs/XFilePicker3.hpp> #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> #include <com/sun/star/util/thePathSettings.hpp> #include <tools/diagnose_ex.h> diff --git a/cui/source/options/optupdt.cxx b/cui/source/options/optupdt.cxx index 6b0dbe2cd2cd..754fb5fdce27 100644 --- a/cui/source/options/optupdt.cxx +++ b/cui/source/options/optupdt.cxx @@ -25,7 +25,7 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/configuration/theDefaultProvider.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/ui/dialogs/FolderPicker.hpp> +#include <com/sun/star/ui/dialogs/XFolderPicker2.hpp> #include <com/sun/star/ui/dialogs/ExecutableDialogResults.hpp> #include <com/sun/star/deployment/UpdateInformationProvider.hpp> #include <com/sun/star/ucb/XWebDAVCommandEnvironment.hpp> diff --git a/cui/source/options/securityoptions.cxx b/cui/source/options/securityoptions.cxx index f5c94edf1029..4b00176ab490 100644 --- a/cui/source/options/securityoptions.cxx +++ b/cui/source/options/securityoptions.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <tools/debug.hxx> #include <unotools/securityoptions.hxx> #include "securityoptions.hxx" diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index c96b80b47dd9..ae9f8b8e422f 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -29,7 +29,6 @@ #include <svx/dialogs.hrc> #include <svx/svxids.hrc> -#include <unotools/resmgr.hxx> #include <treeopt.hrc> #include <helpids.h> @@ -90,7 +89,6 @@ #include <sfx2/viewfrm.hxx> #include <svl/flagitem.hxx> #include <svl/intitem.hxx> -#include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <svx/databaseregistrationui.hxx> diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 95a75d877271..e7a0883dc267 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -29,11 +29,9 @@ #include <unotools/charclass.hxx> #include <unotools/collatorwrapper.hxx> #include <comphelper/processfactory.hxx> -#include <comphelper/string.hxx> #include <vcl/svapp.hxx> #include <sfx2/module.hxx> #include <svl/eitem.hxx> -#include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <svx/SmartTagMgr.hxx> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index a3bd26d371b1..725ab44da0ee 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -19,8 +19,6 @@ #include <sal/config.h> -#include <string_view> - #include <sfx2/objsh.hxx> #include <svx/strings.hrc> #include <svx/svxids.hrc> diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx index 550213c99eff..4c190180e8c2 100644 --- a/cui/source/tabpages/chardlg.cxx +++ b/cui/source/tabpages/chardlg.cxx @@ -23,7 +23,6 @@ #include <sfx2/objsh.hxx> #include <svx/svxids.hrc> #include <svtools/unitconv.hxx> -#include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <chardlg.hxx> diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx index c445345c9e72..b79d2f5de7db 100644 --- a/cui/source/tabpages/numfmt.cxx +++ b/cui/source/tabpages/numfmt.cxx @@ -24,8 +24,6 @@ #include <svl/intitem.hxx> #include <sfx2/objsh.hxx> #include <vcl/outdev.hxx> -#include <vcl/svapp.hxx> -#include <vcl/settings.hxx> #include <i18nlangtag/lang.h> #include <svx/svxids.hrc> #include <svtools/colorcfg.hxx> diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 0e29feaaeae6..f78cda0ee602 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -22,7 +22,6 @@ #include <sfx2/objsh.hxx> #include <sfx2/printer.hxx> #include <sfx2/viewsh.hxx> -#include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <svl/ctloptions.hxx> #include <svtools/unitconv.hxx> diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index a7075bd862e7..427e2bdc5708 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -26,7 +26,6 @@ #include <svx/flagsdef.hxx> #include <svx/svxids.hrc> -#include <svl/languageoptions.hxx> #include <svl/cjkoptions.hxx> #include <editeng/pgrditem.hxx> #include <svx/strings.hrc> diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx index 0f4a33bba4fa..f773be6b8cb1 100644 --- a/cui/source/tabpages/textattr.cxx +++ b/cui/source/tabpages/textattr.cxx @@ -24,7 +24,6 @@ #include <svx/sdtaitm.hxx> #include <svx/sdtfsitm.hxx> #include <svx/sdtcfitm.hxx> -#include <svx/svdobj.hxx> #include <svx/svxids.hrc> #include <textattr.hxx> |