include/IwyuFilter_include.yaml | 4 ---- include/tools/degree.hxx | 1 - include/tools/helpers.hxx | 1 - include/ucbhelper/interceptedinteraction.hxx | 1 - include/vbahelper/vbahelper.hxx | 3 +-- include/vcl/BinaryDataContainer.hxx | 2 -- include/vcl/BitmapBuffer.hxx | 1 - include/vcl/IDialogRenderable.hxx | 1 - include/vcl/WindowPosSize.hxx | 2 -- include/vcl/cairo.hxx | 2 -- include/vcl/checksum.hxx | 1 - include/vcl/errinf.hxx | 3 --- include/vcl/filter/PngImageReader.hxx | 3 --- include/vcl/glyphitem.hxx | 1 - include/vcl/glyphitemcache.hxx | 2 -- include/vcl/gradient.hxx | 1 - include/vcl/htmltransferable.hxx | 1 - include/vcl/kernarray.hxx | 2 ++ include/vcl/lazydelete.hxx | 1 - include/vcl/metaact.hxx | 2 -- include/vcl/notebookbar/notebookbar.hxx | 1 - include/vcl/outdev.hxx | 1 + include/vcl/pdfwriter.hxx | 1 - include/vcl/salgtype.hxx | 1 - include/vcl/scrollable.hxx | 1 + include/vcl/syswin.hxx | 1 - include/vcl/threadex.hxx | 1 - include/vcl/toolboxid.hxx | 4 ++++ include/vcl/vectorgraphicdata.hxx | 2 -- include/vcl/windowstate.hxx | 3 +++ include/xmloff/XMLComplexColorContext.hxx | 1 - include/xmloff/XMLComplexColorHandler.hxx | 2 +- include/xmloff/namespacemap.hxx | 2 -- include/xmloff/xmlexp.hxx | 1 - include/xmloff/xmlictxt.hxx | 1 + include/xmlreader/span.hxx | 1 - starmath/source/mathml/export.cxx | 1 + vbahelper/source/vbahelper/vbahelper.cxx | 1 + vcl/inc/skia/utils.hxx | 1 + vcl/source/bitmap/alpha.cxx | 2 ++ vcl/source/graphic/BinaryDataContainer.cxx | 2 ++ 41 files changed, 21 insertions(+), 45 deletions(-)
New commits: commit 2c6f28f43167118b5149bc74cb48852d509dfc74 Author: Gabor Kelemen <[email protected]> AuthorDate: Sun Sep 17 13:05:56 2023 +0200 Commit: Thorsten Behrens <[email protected]> CommitDate: Tue Dec 12 18:51:27 2023 +0100 tdf#146619 Recheck include/[v-x]* with IWYU Change-Id: I3cecd622aa04d842a449b4bfd6c55d0b8b96aabf Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156992 Tested-by: Jenkins Reviewed-by: Thorsten Behrens <[email protected]> diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml index e0a5b159fd79..f0fc1ef2a297 100644 --- a/include/IwyuFilter_include.yaml +++ b/include/IwyuFilter_include.yaml @@ -104,10 +104,6 @@ excludelist: include/ucbhelper/interceptedinteraction.hxx: # base class has to be a complete type - com/sun/star/task/XInteractionHandler.hpp - include/ucbhelper/fd_inputstream.hxx: - # Needed for typedef - - com/sun/star/io/XInputStream.hpp - - com/sun/star/io/XSeekable.hpp include/ucbhelper/macros.hxx: # Used in macros defined here - cppuhelper/typeprovider.hxx diff --git a/include/tools/degree.hxx b/include/tools/degree.hxx index 560f9b115fce..d70a76346a3f 100644 --- a/include/tools/degree.hxx +++ b/include/tools/degree.hxx @@ -15,7 +15,6 @@ #include <o3tl/strong_int.hxx> #include <o3tl/unit_conversion.hxx> #include <cstdlib> -#include <math.h> #include <numeric> template <int N> struct FractionTag; diff --git a/include/tools/helpers.hxx b/include/tools/helpers.hxx index 05ee59960f50..1c224179ab58 100644 --- a/include/tools/helpers.hxx +++ b/include/tools/helpers.hxx @@ -11,7 +11,6 @@ #include <sal/config.h> #include <sal/types.h> #include <tools/long.hxx> -#include <cassert> #include <limits> #include <type_traits> diff --git a/include/ucbhelper/interceptedinteraction.hxx b/include/ucbhelper/interceptedinteraction.hxx index 738c0f2b002d..78344c319903 100644 --- a/include/ucbhelper/interceptedinteraction.hxx +++ b/include/ucbhelper/interceptedinteraction.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX #define INCLUDED_UCBHELPER_INTERCEPTEDINTERACTION_HXX -#include <span> #include <vector> #include <com/sun/star/task/XInteractionHandler.hpp> diff --git a/include/vbahelper/vbahelper.hxx b/include/vbahelper/vbahelper.hxx index e9d8fa8bc01f..5dd3e00dbdc1 100644 --- a/include/vbahelper/vbahelper.hxx +++ b/include/vbahelper/vbahelper.hxx @@ -19,14 +19,13 @@ #ifndef INCLUDED_VBAHELPER_VBAHELPER_HXX #define INCLUDED_VBAHELPER_VBAHELPER_HXX -#include <memory> #include <string_view> #include <com/sun/star/lang/IllegalArgumentException.hpp> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <basic/sbxmeth.hxx> +#include <basic/sbxvar.hxx> #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/color.hxx> diff --git a/include/vcl/BinaryDataContainer.hxx b/include/vcl/BinaryDataContainer.hxx index 72bd852281ce..390c3412dd98 100644 --- a/include/vcl/BinaryDataContainer.hxx +++ b/include/vcl/BinaryDataContainer.hxx @@ -14,11 +14,9 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/io/XInputStream.hpp> -#include <unotools/tempfile.hxx> #include <tools/stream.hxx> #include <vcl/dllapi.h> -#include <vector> #include <memory> /** Container for the binary data, whose responsibility is to manage the diff --git a/include/vcl/BitmapBuffer.hxx b/include/vcl/BitmapBuffer.hxx index a02a459489b5..aed62ea6b6a4 100644 --- a/include/vcl/BitmapBuffer.hxx +++ b/include/vcl/BitmapBuffer.hxx @@ -22,7 +22,6 @@ #include <sal/config.h> -#include <memory> #include <optional> #include <vcl/dllapi.h> diff --git a/include/vcl/IDialogRenderable.hxx b/include/vcl/IDialogRenderable.hxx index 49e22c3c5357..386ed1e865c8 100644 --- a/include/vcl/IDialogRenderable.hxx +++ b/include/vcl/IDialogRenderable.hxx @@ -11,7 +11,6 @@ #ifndef INCLUDED_VCL_IDIALOGRENDERABLE_HXX #define INCLUDED_VCL_IDIALOGRENDERABLE_HXX -#include <config_options.h> #include <vcl/dllapi.h> #include <rtl/ustring.hxx> diff --git a/include/vcl/WindowPosSize.hxx b/include/vcl/WindowPosSize.hxx index 6c5484c47b30..b3d3ff77ed47 100644 --- a/include/vcl/WindowPosSize.hxx +++ b/include/vcl/WindowPosSize.hxx @@ -21,8 +21,6 @@ #define INCLUDED_VCL_FRAMEPOSSIZE_HXX #include <vcl/dllapi.h> -#include <o3tl/typed_flags_set.hxx> -#include <rtl/string.hxx> #include <sal/types.h> #include <tools/gen.hxx> diff --git a/include/vcl/cairo.hxx b/include/vcl/cairo.hxx index 9596b24ccb24..5a634b68eecc 100644 --- a/include/vcl/cairo.hxx +++ b/include/vcl/cairo.hxx @@ -21,9 +21,7 @@ #include <sal/config.h> #include <osl/endian.h> -#include <vcl/Scanline.hxx> #include <vcl/vclptr.hxx> -#include <config_features.h> #include <config_cairo_rgba.h> #include <memory> diff --git a/include/vcl/checksum.hxx b/include/vcl/checksum.hxx index ea2c9adb2e51..0affa62728a8 100644 --- a/include/vcl/checksum.hxx +++ b/include/vcl/checksum.hxx @@ -20,7 +20,6 @@ #include <sal/config.h> #include <sal/types.h> -#include <vcl/dllapi.h> #define BITMAP_CHECKSUM_SIZE 4 diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx index 0f4d8d781de7..4d91fcf64dd0 100644 --- a/include/vcl/errinf.hxx +++ b/include/vcl/errinf.hxx @@ -21,15 +21,12 @@ #define INCLUDED_VCL_ERRINF_HXX #include <rtl/ustring.hxx> -#include <utility> #include <comphelper/errcode.hxx> #include <vcl/dllapi.h> #include <vector> #include <memory> -#include <limits.h> - namespace weld { class Window; } class ErrorHandler; diff --git a/include/vcl/filter/PngImageReader.hxx b/include/vcl/filter/PngImageReader.hxx index 201e3a08b8c0..86306ad746f4 100644 --- a/include/vcl/filter/PngImageReader.hxx +++ b/include/vcl/filter/PngImageReader.hxx @@ -13,9 +13,6 @@ #include <sal/config.h> -#include <memory> -#include <vector> - #include <vcl/dllapi.h> #include <vcl/BinaryDataContainer.hxx> diff --git a/include/vcl/glyphitem.hxx b/include/vcl/glyphitem.hxx index 23ae5a877abb..8f804d286c55 100644 --- a/include/vcl/glyphitem.hxx +++ b/include/vcl/glyphitem.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_GLYPHITEM_HXX #define INCLUDED_VCL_GLYPHITEM_HXX -#include <sal/types.h> #include <vcl/dllapi.h> #include <vector> diff --git a/include/vcl/glyphitemcache.hxx b/include/vcl/glyphitemcache.hxx index a5a8ec1518e4..0dc15d82f6f1 100644 --- a/include/vcl/glyphitemcache.hxx +++ b/include/vcl/glyphitemcache.hxx @@ -24,12 +24,10 @@ #include <vcl/dllapi.h> #include <o3tl/lru_map.hxx> -#include <o3tl/hash_combine.hxx> #include <vcl/glyphitem.hxx> #include <vcl/metric.hxx> #include <vcl/outdev.hxx> #include <vcl/vclptr.hxx> -#include <tools/gen.hxx> #include <optional> diff --git a/include/vcl/gradient.hxx b/include/vcl/gradient.hxx index fdb8df0b9a4c..2979e2277604 100644 --- a/include/vcl/gradient.hxx +++ b/include/vcl/gradient.hxx @@ -27,7 +27,6 @@ #include <o3tl/cow_wrapper.hxx> #include <vcl/dllapi.h> -#include <vcl/vclenum.hxx> #include <com/sun/star/awt/GradientStyle.hpp> namespace tools { class Rectangle; } diff --git a/include/vcl/htmltransferable.hxx b/include/vcl/htmltransferable.hxx index 2576c7e31bb4..2b0ae4f1d05c 100644 --- a/include/vcl/htmltransferable.hxx +++ b/include/vcl/htmltransferable.hxx @@ -21,7 +21,6 @@ #include <com/sun/star/datatransfer/XTransferable.hpp> #include <cppuhelper/weak.hxx> -#include <rtl/ustring.hxx> #include <vcl/dllapi.h> namespace vcl::unohelper diff --git a/include/vcl/kernarray.hxx b/include/vcl/kernarray.hxx index 2e8939b542b5..e9e5462faf95 100644 --- a/include/vcl/kernarray.hxx +++ b/include/vcl/kernarray.hxx @@ -9,6 +9,8 @@ #pragma once #include <sal/config.h> + +#include <sal/types.h> #include <cmath> #include <span> #include <vector> diff --git a/include/vcl/lazydelete.hxx b/include/vcl/lazydelete.hxx index e700582f1297..427ff8373911 100644 --- a/include/vcl/lazydelete.hxx +++ b/include/vcl/lazydelete.hxx @@ -25,7 +25,6 @@ #include <com/sun/star/lang/XComponent.hpp> #include <optional> -#include <utility> namespace vcl { diff --git a/include/vcl/metaact.hxx b/include/vcl/metaact.hxx index 8f64669ac26c..8f6c4dfafa96 100644 --- a/include/vcl/metaact.hxx +++ b/include/vcl/metaact.hxx @@ -22,8 +22,6 @@ #include <sal/config.h> -#include <config_options.h> - #include <rtl/ref.hxx> #include <salhelper/simplereferenceobject.hxx> #include <tools/poly.hxx> diff --git a/include/vcl/notebookbar/notebookbar.hxx b/include/vcl/notebookbar/notebookbar.hxx index 15186fce2cc3..1d19ffd7109b 100644 --- a/include/vcl/notebookbar/notebookbar.hxx +++ b/include/vcl/notebookbar/notebookbar.hxx @@ -13,7 +13,6 @@ #include <vcl/ctrl.hxx> #include <vcl/notebookbar/NotebookBarAddonsMerger.hxx> #include <vcl/settings.hxx> -#include <set> #include <vector> namespace com::sun::star::ui { class XContextChangeEventListener; } diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 329364559108..eefb2c6028e4 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -50,6 +50,7 @@ #include <vcl/metaactiontypes.hxx> #include <vcl/salnativewidgets.hxx> #include <vcl/settings.hxx> +#include <vcl/vclenum.hxx> #include <vcl/vclreferencebase.hxx> #include <basegfx/numeric/ftools.hxx> diff --git a/include/vcl/pdfwriter.hxx b/include/vcl/pdfwriter.hxx index cd8be2a50581..5587dd2c9da2 100644 --- a/include/vcl/pdfwriter.hxx +++ b/include/vcl/pdfwriter.hxx @@ -19,7 +19,6 @@ #ifndef INCLUDED_VCL_PDFWRITER_HXX #define INCLUDED_VCL_PDFWRITER_HXX -#include <config_options.h> #include <sal/types.h> #include <tools/gen.hxx> diff --git a/include/vcl/salgtype.hxx b/include/vcl/salgtype.hxx index 65213d4f7af5..a0615bcd1ea8 100644 --- a/include/vcl/salgtype.hxx +++ b/include/vcl/salgtype.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_SALGTYPE_HXX #include <o3tl/typed_flags_set.hxx> -#include <tools/color.hxx> #include <tools/gen.hxx> #include <ostream> diff --git a/include/vcl/scrollable.hxx b/include/vcl/scrollable.hxx index 7544fe9b0e15..03757fb8290a 100644 --- a/include/vcl/scrollable.hxx +++ b/include/vcl/scrollable.hxx @@ -19,6 +19,7 @@ #pragma once +#include <tools/gen.hxx> #include <tools/long.hxx> #include <vcl/dllapi.h> diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx index c59d7a24760c..65388e14de51 100644 --- a/include/vcl/syswin.hxx +++ b/include/vcl/syswin.hxx @@ -21,7 +21,6 @@ #include <vcl/dllapi.h> #include <vcl/idle.hxx> -#include <vcl/vclenum.hxx> #include <vcl/window.hxx> #include <vcl/windowstate.hxx> #include <com/sun/star/frame/XFrame.hpp> diff --git a/include/vcl/threadex.hxx b/include/vcl/threadex.hxx index 918b072ae2be..f75e8efe5893 100644 --- a/include/vcl/threadex.hxx +++ b/include/vcl/threadex.hxx @@ -27,7 +27,6 @@ #include <exception> #include <optional> #include <memory> -#include <utility> namespace vcl { diff --git a/include/vcl/toolboxid.hxx b/include/vcl/toolboxid.hxx index 009a10d74e7c..3f8a99677426 100644 --- a/include/vcl/toolboxid.hxx +++ b/include/vcl/toolboxid.hxx @@ -10,6 +10,10 @@ #pragma once #include <o3tl/strong_int.hxx> +#include <sal/types.h> + +#include <cstddef> +#include <string_view> typedef o3tl::strong_int<sal_uInt16, struct ToolBoxItemIdTag> ToolBoxItemId; namespace std diff --git a/include/vcl/vectorgraphicdata.hxx b/include/vcl/vectorgraphicdata.hxx index bfa30b7af3bc..6c3a829ab95d 100644 --- a/include/vcl/vectorgraphicdata.hxx +++ b/include/vcl/vectorgraphicdata.hxx @@ -21,12 +21,10 @@ #define INCLUDED_VCL_VECTORGRAPHICDATA_HXX #include <basegfx/range/b2drange.hxx> -#include <com/sun/star/uno/Sequence.hxx> #include <vcl/bitmapex.hxx> #include <vcl/BinaryDataContainer.hxx> #include <rtl/ustring.hxx> #include <deque> -#include <memory> #include <algorithm> #include <optional> diff --git a/include/vcl/windowstate.hxx b/include/vcl/windowstate.hxx index 527e3661e9ce..fdae315f9324 100644 --- a/include/vcl/windowstate.hxx +++ b/include/vcl/windowstate.hxx @@ -20,6 +20,9 @@ #ifndef INCLUDED_VCL_WINDOWSTATE_HXX #define INCLUDED_VCL_WINDOWSTATE_HXX +#include <o3tl/typed_flags_set.hxx> +#include <rtl/ustring.hxx> +#include <vcl/dllapi.h> #include <vcl/WindowPosSize.hxx> namespace vcl diff --git a/include/xmloff/XMLComplexColorContext.hxx b/include/xmloff/XMLComplexColorContext.hxx index 5654cc204206..e84f0f5fe7cd 100644 --- a/include/xmloff/XMLComplexColorContext.hxx +++ b/include/xmloff/XMLComplexColorContext.hxx @@ -11,7 +11,6 @@ #include <xmloff/dllapi.h> -#include <memory> #include <xmloff/XMLElementPropertyContext.hxx> #include <xmloff/xmlictxt.hxx> #include <docmodel/color/ComplexColor.hxx> diff --git a/include/xmloff/XMLComplexColorHandler.hxx b/include/xmloff/XMLComplexColorHandler.hxx index 8d40c8459f30..7b7dcc10d165 100644 --- a/include/xmloff/XMLComplexColorHandler.hxx +++ b/include/xmloff/XMLComplexColorHandler.hxx @@ -10,9 +10,9 @@ #pragma once #include <xmloff/dllapi.h> +#include <xmloff/xmlprhdl.hxx> #include <docmodel/uno/UnoComplexColor.hxx> -using namespace ::xmloff::token; using namespace css; class XMLOFF_DLLPUBLIC XMLComplexColorHandler : public XMLPropertyHandler diff --git a/include/xmloff/namespacemap.hxx b/include/xmloff/namespacemap.hxx index 6fbc389bd7ee..946e36656a2f 100644 --- a/include/xmloff/namespacemap.hxx +++ b/include/xmloff/namespacemap.hxx @@ -28,8 +28,6 @@ #include <xmloff/dllapi.h> #include <sal/types.h> #include <rtl/ustring.hxx> -#include <rtl/ref.hxx> -#include <salhelper/simplereferenceobject.hxx> #include <limits.h> diff --git a/include/xmloff/xmlexp.hxx b/include/xmloff/xmlexp.hxx index 2db5a90949ef..f8bb5ca423c2 100644 --- a/include/xmloff/xmlexp.hxx +++ b/include/xmloff/xmlexp.hxx @@ -45,7 +45,6 @@ #include <xmloff/XMLPageExport.hxx> #include <comphelper/attributelist.hxx> -#include <comphelper/servicehelper.hxx> #include <cppuhelper/implbase.hxx> #include <tools/fldunit.hxx> #include <comphelper/errcode.hxx> diff --git a/include/xmloff/xmlictxt.hxx b/include/xmloff/xmlictxt.hxx index ab7a70442ffa..6dfcbb449755 100644 --- a/include/xmloff/xmlictxt.hxx +++ b/include/xmloff/xmlictxt.hxx @@ -22,6 +22,7 @@ #include <sal/config.h> #include <xmloff/dllapi.h> +#include <rtl/ref.hxx> #include <sal/log.hxx> #include <sal/types.h> #include <com/sun/star/xml/sax/XFastContextHandler.hpp> diff --git a/include/xmlreader/span.hxx b/include/xmlreader/span.hxx index 4d1455cd358d..63bd2279cbaa 100644 --- a/include/xmlreader/span.hxx +++ b/include/xmlreader/span.hxx @@ -21,7 +21,6 @@ #include <sal/config.h> -#include <cstddef> #include <cstring> #include <sal/types.h> diff --git a/starmath/source/mathml/export.cxx b/starmath/source/mathml/export.cxx index 923668f45425..60328c89dabf 100644 --- a/starmath/source/mathml/export.cxx +++ b/starmath/source/mathml/export.cxx @@ -33,6 +33,7 @@ #include <comphelper/genericpropertyset.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertysetinfo.hxx> +#include <comphelper/servicehelper.hxx> #include <sfx2/frame.hxx> #include <sfx2/docfile.hxx> #include <sfx2/sfxsids.hrc> diff --git a/vbahelper/source/vbahelper/vbahelper.cxx b/vbahelper/source/vbahelper/vbahelper.cxx index 0e0c7b9c8f28..db4949e5f270 100644 --- a/vbahelper/source/vbahelper/vbahelper.cxx +++ b/vbahelper/source/vbahelper/vbahelper.cxx @@ -59,6 +59,7 @@ #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> +#include <basic/sbxmeth.hxx> #include <basic/sbmod.hxx> #include <basic/sbuno.hxx> #include <basic/sberrors.hxx> diff --git a/vcl/inc/skia/utils.hxx b/vcl/inc/skia/utils.hxx index 3c19192e1c3a..e1bed3dffdd9 100644 --- a/vcl/inc/skia/utils.hxx +++ b/vcl/inc/skia/utils.hxx @@ -22,6 +22,7 @@ #include <vcl/skia/SkiaHelper.hxx> +#include <tools/color.hxx> #include <tools/gen.hxx> #include <driverblocklist.hxx> #include <vcl/bitmap.hxx> diff --git a/vcl/source/bitmap/alpha.cxx b/vcl/source/bitmap/alpha.cxx index 634fc3cdd609..52372c5d9139 100644 --- a/vcl/source/bitmap/alpha.cxx +++ b/vcl/source/bitmap/alpha.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <config_features.h> + #include <tools/color.hxx> #include <vcl/alpha.hxx> diff --git a/vcl/source/graphic/BinaryDataContainer.cxx b/vcl/source/graphic/BinaryDataContainer.cxx index 89ae5eb8da1e..f5ca4a4b309b 100644 --- a/vcl/source/graphic/BinaryDataContainer.cxx +++ b/vcl/source/graphic/BinaryDataContainer.cxx @@ -15,6 +15,8 @@ #include <comphelper/seqstream.hxx> #include <sal/log.hxx> +#include <vector> + struct BinaryDataContainer::Impl { // temp file to store the data out of RAM if necessary
