diff options
Diffstat (limited to 'vcl')
46 files changed, 103 insertions, 131 deletions
diff --git a/vcl/inc/bitmap/BitmapColorizeFilter.hxx b/vcl/inc/bitmap/BitmapColorizeFilter.hxx index ae511b322d0c..4dd7d3c0dcc7 100644 --- a/vcl/inc/bitmap/BitmapColorizeFilter.hxx +++ b/vcl/inc/bitmap/BitmapColorizeFilter.hxx @@ -11,7 +11,8 @@ #pragma once #include <tools/color.hxx> -#include <vcl/BitmapFilter.hxx> + +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapColorizeFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx b/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx index e1d9d21a9df7..7591125dd3d8 100644 --- a/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx +++ b/vcl/inc/bitmap/BitmapDisabledImageFilter.hxx @@ -11,7 +11,7 @@ #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPDISABLEDIMAGEFILTER_HXX #define INCLUDED_VCL_INC_BITMAP_BITMAPDISABLEDIMAGEFILTER_HXX -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class VCL_DLLPUBLIC BitmapDisabledImageFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapFastScaleFilter.hxx b/vcl/inc/bitmap/BitmapFastScaleFilter.hxx index ab2c14e67180..9d6dc14769e7 100644 --- a/vcl/inc/bitmap/BitmapFastScaleFilter.hxx +++ b/vcl/inc/bitmap/BitmapFastScaleFilter.hxx @@ -11,8 +11,7 @@ #ifndef VCL_INC_BITMAP_BITMAPFASTSCALEFILTER_HXX #define VCL_INC_BITMAP_BITMAPFASTSCALEFILTER_HXX -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapFastScaleFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx b/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx index 7d17c97d169a..66e309a9746d 100644 --- a/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx +++ b/vcl/inc/bitmap/BitmapInterpolateScaleFilter.hxx @@ -11,8 +11,7 @@ #ifndef VCL_INC_BITMAP_BITMAPINTERPOLATESCALEFILTER_HXX #define VCL_INC_BITMAP_BITMAPINTERPOLATESCALEFILTER_HXX -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapInterpolateScaleFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapLightenFilter.hxx b/vcl/inc/bitmap/BitmapLightenFilter.hxx index 98f249328599..541eb29f34da 100644 --- a/vcl/inc/bitmap/BitmapLightenFilter.hxx +++ b/vcl/inc/bitmap/BitmapLightenFilter.hxx @@ -11,7 +11,7 @@ #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPLIGHTENFILTER_HXX #define INCLUDED_VCL_INC_BITMAP_BITMAPLIGHTENFILTER_HXX -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapLightenFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx b/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx index 355d066846c1..378898191eea 100644 --- a/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx +++ b/vcl/inc/bitmap/BitmapMaskToAlphaFilter.hxx @@ -10,7 +10,7 @@ #pragma once -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapMaskToAlphaFilter final : public BitmapFilter { diff --git a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx index 1c9bb8e33035..c48cb7bb1610 100644 --- a/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx +++ b/vcl/inc/bitmap/BitmapScaleConvolutionFilter.hxx @@ -20,7 +20,7 @@ #ifndef VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX #define VCL_INC_BITMAP_BITMAPSCALECONVOLUTIONFILTER_HXX -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> #include <ResampleKernel.hxx> diff --git a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx index 46c21d8d78a3..172138670795 100644 --- a/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx +++ b/vcl/inc/bitmap/BitmapScaleSuperFilter.hxx @@ -20,7 +20,7 @@ #ifndef INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX #define INCLUDED_VCL_INC_BITMAP_BITMAPSCALESUPER_HXX -#include <vcl/BitmapFilter.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> class BitmapScaleSuperFilter final : public BitmapFilter { diff --git a/vcl/inc/pch/precompiled_vcl.hxx b/vcl/inc/pch/precompiled_vcl.hxx index fac11693cfa0..00d156760020 100644 --- a/vcl/inc/pch/precompiled_vcl.hxx +++ b/vcl/inc/pch/precompiled_vcl.hxx @@ -13,7 +13,7 @@ manual changes will be rewritten by the next run of update_pch.sh (which presumably also fixes all possible problems, so it's usually better to use it). - Generated on 2023-07-19 09:24:26 using: + Generated on 2024-09-15 00:23:48 using: ./bin/update_pch vcl vcl --cutoff=6 --exclude:system --include:module --include:local If after updating build fails, use the following command to locate conflicting headers: @@ -28,10 +28,10 @@ #include <cassert> #include <chrono> #include <cmath> +#include <compare> #include <cstddef> -#include <cstdio> +#include <cstdint> #include <cstdlib> -#include <cstring> #include <deque> #include <float.h> #include <functional> @@ -50,6 +50,7 @@ #include <optional> #include <ostream> #include <set> +#include <span> #include <stddef.h> #include <string.h> #include <string> @@ -70,17 +71,14 @@ #if PCH_LEVEL >= 2 #include <osl/conditn.hxx> #include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> #include <osl/endian.h> #include <osl/file.h> #include <osl/file.hxx> -#include <osl/getglobalmutex.hxx> #include <osl/interlck.h> #include <osl/module.hxx> #include <osl/mutex.h> #include <osl/mutex.hxx> #include <osl/nlsupport.h> -#include <osl/security.h> #include <osl/signal.h> #include <osl/socket.h> #include <osl/socket.hxx> @@ -93,7 +91,6 @@ #include <rtl/cipher.h> #include <rtl/crc.h> #include <rtl/digest.h> -#include <rtl/instance.hxx> #include <rtl/locale.h> #include <rtl/math.h> #include <rtl/math.hxx> @@ -121,7 +118,6 @@ #endif // PCH_LEVEL >= 2 #if PCH_LEVEL >= 3 #include <basegfx/basegfxdllapi.h> -#include <basegfx/color/bcolor.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> #include <basegfx/numeric/ftools.hxx> @@ -132,6 +128,7 @@ #include <basegfx/polygon/b2dpolypolygon.hxx> #include <basegfx/range/Range2D.hxx> #include <basegfx/range/b2drange.hxx> +#include <basegfx/range/b2drectangle.hxx> #include <basegfx/range/basicrange.hxx> #include <basegfx/tuple/Size2D.hxx> #include <basegfx/tuple/Tuple2D.hxx> @@ -140,12 +137,10 @@ #include <basegfx/tuple/b2ituple.hxx> #include <basegfx/tuple/b3dtuple.hxx> #include <basegfx/utils/common.hxx> -#include <basegfx/vector/b2dsize.hxx> #include <basegfx/vector/b2dvector.hxx> #include <basegfx/vector/b2enums.hxx> -#include <basegfx/vector/b2isize.hxx> #include <basegfx/vector/b2ivector.hxx> -#include <vcl/BitmapWriteAccess.hxx> +#include <com/sun/star/accessibility/XAccessible.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> @@ -161,11 +156,10 @@ #include <com/sun/star/embed/Aspects.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/i18n/Calendar2.hpp> +#include <com/sun/star/i18n/TransliterationModules.hpp> +#include <com/sun/star/i18n/TransliterationModulesExtra.hpp> +#include <com/sun/star/i18n/UnicodeScript.hpp> #include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/DisposedException.hpp> #include <com/sun/star/lang/EventObject.hpp> #include <com/sun/star/lang/Locale.hpp> @@ -173,6 +167,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> +#include <com/sun/star/style/NumberingType.hpp> #include <com/sun/star/uno/Any.h> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Reference.h> @@ -183,7 +178,6 @@ #include <com/sun/star/uno/Type.h> #include <com/sun/star/uno/Type.hxx> #include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XAggregation.hpp> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uno/XInterface.hpp> #include <com/sun/star/uno/XWeak.hpp> @@ -191,17 +185,18 @@ #include <com/sun/star/uno/genfunc.hxx> #include <com/sun/star/util/Date.hpp> #include <com/sun/star/util/DateTime.hpp> +#include <comphelper/base64.hxx> #include <comphelper/comphelperdllapi.h> +#include <comphelper/configuration.hxx> #include <comphelper/diagnose_ex.hxx> +#include <comphelper/errcode.hxx> #include <comphelper/fileformat.h> -#include <comphelper/interfacecontainer4.hxx> #include <comphelper/lok.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/propertyvalue.hxx> #include <comphelper/scopeguard.hxx> #include <comphelper/sequence.hxx> #include <comphelper/string.hxx> -#include <comphelper/unoimplbase.hxx> #include <cppu/cppudllapi.h> #include <cppu/unotype.hxx> #include <cppuhelper/cppuhelperdllapi.h> @@ -209,8 +204,9 @@ #include <cppuhelper/queryinterface.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/weak.hxx> -#include <cppuhelper/weakagg.hxx> -#include <cppuhelper/weakref.hxx> +#include <editeng/EPosition.hxx> +#include <editeng/ESelection.hxx> +#include <editeng/editengdllapi.h> #include <font/FontSelectPattern.hxx> #include <font/PhysicalFontCollection.hxx> #include <font/PhysicalFontFace.hxx> @@ -220,6 +216,7 @@ #include <i18nlangtag/mslangid.hxx> #include <i18nutil/i18nutildllapi.h> #include <o3tl/cow_wrapper.hxx> +#include <o3tl/deleter.hxx> #include <o3tl/hash_combine.hxx> #include <o3tl/safeint.hxx> #include <o3tl/sorted_vector.hxx> @@ -235,12 +232,14 @@ #include <salhelper/thread.hxx> #include <sot/exchange.hxx> #include <sot/formats.hxx> +#include <svl/SfxBroadcaster.hxx> #include <svl/hint.hxx> #include <svl/macitem.hxx> #include <svl/poolitem.hxx> #include <svl/svldllapi.h> #include <svl/typedwhich.hxx> #include <test/outputdevice.hxx> +#include <tools/UnitConversion.hxx> #include <tools/color.hxx> #include <tools/contnr.hxx> #include <tools/date.hxx> @@ -278,7 +277,6 @@ #include <unotools/localedatawrapper.hxx> #include <unotools/resmgr.hxx> #include <unotools/syslocale.hxx> -#include <unotools/tempfile.hxx> #include <unotools/ucbstreamhelper.hxx> #include <unotools/unotoolsdllapi.h> #endif // PCH_LEVEL >= 3 @@ -287,12 +285,11 @@ #include <accel.hxx> #include <brdwin.hxx> #include <configsettings.hxx> +#include <dndlistenercontainer.hxx> #include <drawmode.hxx> #include <fontattributes.hxx> -#include <glyphid.hxx> #include <impfontcache.hxx> #include <impglyphitem.hxx> -#include <ppdparser.hxx> #include <salbmp.hxx> #include <salframe.hxx> #include <salgdi.hxx> @@ -312,13 +309,14 @@ #include <vcl/AccessibleBrowseBoxObjType.hxx> #include <vcl/BinaryDataContainer.hxx> #include <vcl/BitmapColor.hxx> -#include <vcl/BitmapFilter.hxx> #include <vcl/BitmapReadAccess.hxx> #include <vcl/BitmapTools.hxx> +#include <vcl/BitmapWriteAccess.hxx> #include <vcl/FilterConfigItem.hxx> #include <vcl/QueueInfo.hxx> #include <vcl/TypeSerializer.hxx> #include <vcl/bitmap.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> #include <vcl/bitmapex.hxx> #include <vcl/builder.hxx> #include <vcl/canvastools.hxx> @@ -342,7 +340,6 @@ #include <vcl/formatter.hxx> #include <vcl/gdimtf.hxx> #include <vcl/gfxlink.hxx> -#include <vcl/glyphitem.hxx> #include <vcl/gradient.hxx> #include <vcl/graph.hxx> #include <vcl/graphicfilter.hxx> @@ -363,6 +360,7 @@ #include <vcl/salnativewidgets.hxx> #include <vcl/scheduler.hxx> #include <vcl/settings.hxx> +#include <vcl/skia/SkiaHelper.hxx> #include <vcl/svapp.hxx> #include <vcl/syswin.hxx> #include <vcl/tabctrl.hxx> @@ -393,7 +391,6 @@ #include <vcl/unohelp.hxx> #include <vcl/vclenum.hxx> #include <vcl/vclevent.hxx> -#include <vcl/vcllayout.hxx> #include <vcl/vclptr.hxx> #include <vcl/virdev.hxx> #include <vcl/weld.hxx> diff --git a/vcl/qa/cppunit/BitmapFilterTest.cxx b/vcl/qa/cppunit/BitmapFilterTest.cxx index c34b121e4959..9a7c00a1d0fa 100644 --- a/vcl/qa/cppunit/BitmapFilterTest.cxx +++ b/vcl/qa/cppunit/BitmapFilterTest.cxx @@ -9,21 +9,20 @@ #include <test/bootstrapfixture.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/BitmapWriteAccess.hxx> - #include <tools/stream.hxx> + +#include <vcl/BitmapWriteAccess.hxx> +#include <vcl/bitmap/BitmapAlphaClampFilter.hxx> +#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx> +#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx> +#include <vcl/bitmap/BitmapLightenBlendFilter.hxx> +#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx> +#include <vcl/bitmap/BitmapNormalBlendFilter.hxx> +#include <vcl/bitmap/BitmapScreenBlendFilter.hxx> +#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx> +#include <vcl/bitmap/BitmapFilterStackBlur.hxx> #include <vcl/graphicfilter.hxx> -#include <vcl/BitmapAlphaClampFilter.hxx> -#include <vcl/BitmapArithmeticBlendFilter.hxx> -#include <vcl/BitmapDarkenBlendFilter.hxx> -#include <vcl/BitmapLightenBlendFilter.hxx> -#include <vcl/BitmapMultiplyBlendFilter.hxx> -#include <vcl/BitmapNormalBlendFilter.hxx> -#include <vcl/BitmapScreenBlendFilter.hxx> -#include <vcl/BitmapBasicMorphologyFilter.hxx> -#include <vcl/BitmapFilterStackBlur.hxx> #include <BitmapSymmetryCheck.hxx> #include <chrono> diff --git a/vcl/qa/cppunit/BitmapTest.cxx b/vcl/qa/cppunit/BitmapTest.cxx index e00f2e0dc873..2a1249f40b10 100644 --- a/vcl/qa/cppunit/BitmapTest.cxx +++ b/vcl/qa/cppunit/BitmapTest.cxx @@ -16,12 +16,11 @@ #include <rtl/strbuf.hxx> #include <vcl/BitmapTools.hxx> -#include <vcl/bitmap.hxx> +#include <vcl/BitmapWriteAccess.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <vcl/virdev.hxx> #include <vcl/skia/SkiaHelper.hxx> -#include <vcl/BitmapMonochromeFilter.hxx> -#include <vcl/BitmapWriteAccess.hxx> #include <bitmap/Octree.hxx> #include <salinst.hxx> #include <svdata.hxx> diff --git a/vcl/qa/cppunit/png/PngFilterTest.cxx b/vcl/qa/cppunit/png/PngFilterTest.cxx index b9160d1602f7..8d979d393c91 100644 --- a/vcl/qa/cppunit/png/PngFilterTest.cxx +++ b/vcl/qa/cppunit/png/PngFilterTest.cxx @@ -25,8 +25,7 @@ #include <tools/stream.hxx> #include <vcl/filter/PngImageReader.hxx> #include <vcl/filter/PngImageWriter.hxx> -#include <vcl/BitmapReadAccess.hxx> -#include <vcl/BitmapMonochromeFilter.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/alpha.hxx> #include <vcl/graphicfilter.hxx> diff --git a/vcl/source/animate/Animation.cxx b/vcl/source/animate/Animation.cxx index 0233288e77fd..f0256f345021 100644 --- a/vcl/source/animate/Animation.cxx +++ b/vcl/source/animate/Animation.cxx @@ -26,9 +26,9 @@ #include <sal/log.hxx> #include <vcl/animate/Animation.hxx> -#include <vcl/outdev.hxx> +#include <vcl/bitmap/BitmapColorQuantizationFilter.hxx> #include <vcl/dibtools.hxx> -#include <vcl/BitmapColorQuantizationFilter.hxx> +#include <vcl/outdev.hxx> #include <animate/AnimationRenderer.hxx> diff --git a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx index d36261b2eb4d..a12ee67cc145 100644 --- a/vcl/source/bitmap/BitmapAlphaClampFilter.cxx +++ b/vcl/source/bitmap/BitmapAlphaClampFilter.cxx @@ -8,8 +8,7 @@ * */ -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapAlphaClampFilter.hxx> +#include <vcl/bitmap/BitmapAlphaClampFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapAlphaClampFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx index 8f88fac58e60..60c274abd8ae 100644 --- a/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapArithmeticBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapArithmeticBlendFilter.hxx> + +#include <vcl/bitmap/BitmapArithmeticBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx index e4285cb53a9f..11b0b456e35c 100644 --- a/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx +++ b/vcl/source/bitmap/BitmapBasicMorphologyFilter.cxx @@ -10,9 +10,10 @@ #include <sal/config.h> -#include <comphelper/threadpool.hxx> #include <sal/log.hxx> -#include <vcl/BitmapBasicMorphologyFilter.hxx> +#include <comphelper/threadpool.hxx> + +#include <vcl/bitmap/BitmapBasicMorphologyFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <algorithm> diff --git a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx index df57b5d44246..e8bb7817b95c 100644 --- a/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx +++ b/vcl/source/bitmap/BitmapColorQuantizationFilter.cxx @@ -10,9 +10,7 @@ #include <sal/config.h> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapColorQuantizationFilter.hxx> +#include <vcl/bitmap/BitmapColorQuantizationFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <algorithm> diff --git a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx index 4caed2b7b3be..2d5355439db4 100644 --- a/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx +++ b/vcl/source/bitmap/BitmapConvolutionMatrixFilter.cxx @@ -10,10 +10,8 @@ #include <tools/helpers.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapConvolutionMatrixFilter.hxx> -#include <vcl/BitmapSharpenFilter.hxx> +#include <vcl/bitmap/BitmapConvolutionMatrixFilter.hxx> +#include <vcl/bitmap/BitmapSharpenFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <array> diff --git a/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx b/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx index 708829dc7c76..2924a78c7e11 100644 --- a/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapDarkenBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapDarkenBlendFilter.hxx> + +#include <vcl/bitmap/BitmapDarkenBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapDuoToneFilter.cxx b/vcl/source/bitmap/BitmapDuoToneFilter.cxx index c9cc10b1d1a4..99e25efa145a 100644 --- a/vcl/source/bitmap/BitmapDuoToneFilter.cxx +++ b/vcl/source/bitmap/BitmapDuoToneFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapDuoToneFilter.hxx> +#include <vcl/bitmap/BitmapDuoToneFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> static sal_uInt8 lcl_getDuotoneColorComponent(sal_uInt8 base, sal_uInt16 color1, sal_uInt16 color2) diff --git a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx index 325badb4d16a..cb5c81438c9f 100644 --- a/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx +++ b/vcl/source/bitmap/BitmapEmbossGreyFilter.cxx @@ -12,9 +12,7 @@ #include <tools/helpers.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapEmbossGreyFilter.hxx> +#include <vcl/bitmap/BitmapEmbossGreyFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <algorithm> diff --git a/vcl/source/bitmap/BitmapEx.cxx b/vcl/source/bitmap/BitmapEx.cxx index 457ed4942994..b44a1ca5cad9 100644 --- a/vcl/source/bitmap/BitmapEx.cxx +++ b/vcl/source/bitmap/BitmapEx.cxx @@ -26,13 +26,13 @@ #include <basegfx/color/bcolormodifier.hxx> #include <vcl/ImageTree.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <vcl/outdev.hxx> #include <vcl/alpha.hxx> #include <vcl/bitmapex.hxx> #include <vcl/svapp.hxx> #include <vcl/virdev.hxx> #include <vcl/settings.hxx> -#include <vcl/BitmapMonochromeFilter.hxx> // BitmapEx::Create #include <salbmp.hxx> diff --git a/vcl/source/bitmap/BitmapFilterStackBlur.cxx b/vcl/source/bitmap/BitmapFilterStackBlur.cxx index 787ed27054da..09a44cafb59c 100644 --- a/vcl/source/bitmap/BitmapFilterStackBlur.cxx +++ b/vcl/source/bitmap/BitmapFilterStackBlur.cxx @@ -8,12 +8,12 @@ * */ -#include <vcl/BitmapFilterStackBlur.hxx> -#include <vcl/BitmapWriteAccess.hxx> #include <sal/log.hxx> - #include <comphelper/threadpool.hxx> +#include <vcl/bitmap/BitmapFilterStackBlur.hxx> +#include <vcl/BitmapWriteAccess.hxx> + namespace { const sal_Int16 constMultiplyTable[255] diff --git a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx index d1bc188c95a7..8489162ab8ca 100644 --- a/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx +++ b/vcl/source/bitmap/BitmapGaussianSeparableBlurFilter.cxx @@ -10,9 +10,7 @@ #include <tools/helpers.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapGaussianSeparableBlurFilter.hxx> +#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapGaussianSeparableBlurFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapLightenBlendFilter.cxx b/vcl/source/bitmap/BitmapLightenBlendFilter.cxx index b683034c1f4c..8d06ae1228d9 100644 --- a/vcl/source/bitmap/BitmapLightenBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapLightenBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapLightenBlendFilter.hxx> + +#include <vcl/bitmap/BitmapLightenBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapMedianFilter.cxx b/vcl/source/bitmap/BitmapMedianFilter.cxx index ccae104b4c20..bee7e47cda90 100644 --- a/vcl/source/bitmap/BitmapMedianFilter.cxx +++ b/vcl/source/bitmap/BitmapMedianFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapMedianFilter.hxx> +#include <vcl/bitmap/BitmapMedianFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #define S2(a, b) \ diff --git a/vcl/source/bitmap/BitmapMonochromeFilter.cxx b/vcl/source/bitmap/BitmapMonochromeFilter.cxx index 012abb287c26..c8205c2d2384 100644 --- a/vcl/source/bitmap/BitmapMonochromeFilter.cxx +++ b/vcl/source/bitmap/BitmapMonochromeFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapMonochromeFilter.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapMonochromeFilter::execute(BitmapEx const& aBitmapEx) const diff --git a/vcl/source/bitmap/BitmapMosaicFilter.cxx b/vcl/source/bitmap/BitmapMosaicFilter.cxx index 070b4932cf09..273c4040cc15 100644 --- a/vcl/source/bitmap/BitmapMosaicFilter.cxx +++ b/vcl/source/bitmap/BitmapMosaicFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapMosaicFilter.hxx> +#include <vcl/bitmap/BitmapMosaicFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapMosaicFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx b/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx index 168e6c3ecdfc..d944c5173655 100644 --- a/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapMultiplyBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapMultiplyBlendFilter.hxx> + +#include <vcl/bitmap/BitmapMultiplyBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapNormalBlendFilter.cxx b/vcl/source/bitmap/BitmapNormalBlendFilter.cxx index 922680fea2b1..88a4f3180c63 100644 --- a/vcl/source/bitmap/BitmapNormalBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapNormalBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapNormalBlendFilter.hxx> + +#include <vcl/bitmap/BitmapNormalBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapPopArtFilter.cxx b/vcl/source/bitmap/BitmapPopArtFilter.cxx index bbb42843d397..375539f3168d 100644 --- a/vcl/source/bitmap/BitmapPopArtFilter.cxx +++ b/vcl/source/bitmap/BitmapPopArtFilter.cxx @@ -9,9 +9,8 @@ */ #include <tools/solar.h> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapPopArtFilter.hxx> + +#include <vcl/bitmap/BitmapPopArtFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapPopArtFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx index e954fce7c364..f141aeaafc4c 100644 --- a/vcl/source/bitmap/BitmapScreenBlendFilter.cxx +++ b/vcl/source/bitmap/BitmapScreenBlendFilter.cxx @@ -9,7 +9,8 @@ */ #include <comphelper/diagnose_ex.hxx> -#include <vcl/BitmapScreenBlendFilter.hxx> + +#include <vcl/bitmap/BitmapScreenBlendFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <vcl/BitmapTools.hxx> diff --git a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx index a65cd6ee5606..91a3b5483a7f 100644 --- a/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx +++ b/vcl/source/bitmap/BitmapSeparableUnsharpenFilter.cxx @@ -10,10 +10,8 @@ #include <tools/helpers.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapGaussianSeparableBlurFilter.hxx> -#include <vcl/BitmapSeparableUnsharpenFilter.hxx> +#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx> +#include <vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapSeparableUnsharpenFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapSepiaFilter.cxx b/vcl/source/bitmap/BitmapSepiaFilter.cxx index 991df6935fb5..877647b21f9d 100644 --- a/vcl/source/bitmap/BitmapSepiaFilter.cxx +++ b/vcl/source/bitmap/BitmapSepiaFilter.cxx @@ -10,9 +10,7 @@ #include <sal/config.h> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapSepiaFilter.hxx> +#include <vcl/bitmap/BitmapSepiaFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <algorithm> diff --git a/vcl/source/bitmap/BitmapShadowFilter.cxx b/vcl/source/bitmap/BitmapShadowFilter.cxx index 76da85b3bf0b..00174fd67ec1 100644 --- a/vcl/source/bitmap/BitmapShadowFilter.cxx +++ b/vcl/source/bitmap/BitmapShadowFilter.cxx @@ -8,9 +8,8 @@ * */ -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap/BitmapShadowFilter.hxx> #include <vcl/BitmapColor.hxx> -#include <vcl/BitmapShadowFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapShadowFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx index 5819f4afb206..d885d66beab3 100644 --- a/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx +++ b/vcl/source/bitmap/BitmapSimpleColorQuantizationFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapSimpleColorQuantizationFilter.hxx> +#include <vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <bitmap/Octree.hxx> diff --git a/vcl/source/bitmap/BitmapSmoothenFilter.cxx b/vcl/source/bitmap/BitmapSmoothenFilter.cxx index e9c135f8ec59..3fa43e67fb11 100644 --- a/vcl/source/bitmap/BitmapSmoothenFilter.cxx +++ b/vcl/source/bitmap/BitmapSmoothenFilter.cxx @@ -8,10 +8,9 @@ * */ -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapGaussianSeparableBlurFilter.hxx> -#include <vcl/BitmapSeparableUnsharpenFilter.hxx> -#include <vcl/BitmapSmoothenFilter.hxx> +#include <vcl/bitmap/BitmapGaussianSeparableBlurFilter.hxx> +#include <vcl/bitmap/BitmapSeparableUnsharpenFilter.hxx> +#include <vcl/bitmap/BitmapSmoothenFilter.hxx> BitmapEx BitmapSmoothenFilter::execute(BitmapEx const& rBitmapEx) const { diff --git a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx index 92a5ba2f9bdb..6c798a595422 100644 --- a/vcl/source/bitmap/BitmapSobelGreyFilter.cxx +++ b/vcl/source/bitmap/BitmapSobelGreyFilter.cxx @@ -10,9 +10,7 @@ #include <sal/config.h> -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapSobelGreyFilter.hxx> +#include <vcl/bitmap/BitmapSobelGreyFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <algorithm> diff --git a/vcl/source/bitmap/BitmapSolarizeFilter.cxx b/vcl/source/bitmap/BitmapSolarizeFilter.cxx index ca2485a7f4e0..2e35fb94d2ff 100644 --- a/vcl/source/bitmap/BitmapSolarizeFilter.cxx +++ b/vcl/source/bitmap/BitmapSolarizeFilter.cxx @@ -8,9 +8,7 @@ * */ -#include <vcl/bitmap.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/BitmapSolarizeFilter.hxx> +#include <vcl/bitmap/BitmapSolarizeFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> BitmapEx BitmapSolarizeFilter::execute(BitmapEx const& rBitmapEx) const diff --git a/vcl/source/bitmap/bitmap.cxx b/vcl/source/bitmap/bitmap.cxx index 267a34323c2d..33f44d967e81 100644 --- a/vcl/source/bitmap/bitmap.cxx +++ b/vcl/source/bitmap/bitmap.cxx @@ -34,7 +34,7 @@ #if HAVE_FEATURE_SKIA #include <vcl/skia/SkiaHelper.hxx> #endif -#include <vcl/BitmapMonochromeFilter.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <bitmap/BitmapScaleSuperFilter.hxx> #include <bitmap/BitmapScaleConvolutionFilter.hxx> diff --git a/vcl/source/bitmap/bitmapfilter.cxx b/vcl/source/bitmap/bitmapfilter.cxx index 63ccd2b13021..3ca1bcae2977 100644 --- a/vcl/source/bitmap/bitmapfilter.cxx +++ b/vcl/source/bitmap/bitmapfilter.cxx @@ -8,11 +8,11 @@ * */ -#include <vcl/BitmapFilter.hxx> -#include <vcl/animate/Animation.hxx> - #include <sal/log.hxx> +#include <vcl/animate/Animation.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> + BitmapFilter::BitmapFilter() {} BitmapFilter::~BitmapFilter() {} diff --git a/vcl/source/graphic/UnoGraphic.cxx b/vcl/source/graphic/UnoGraphic.cxx index 484d04443f72..b91d6ad9de09 100644 --- a/vcl/source/graphic/UnoGraphic.cxx +++ b/vcl/source/graphic/UnoGraphic.cxx @@ -26,7 +26,7 @@ #include <vcl/dibtools.hxx> #include <vcl/graph.hxx> #include <vcl/BitmapColor.hxx> -#include <vcl/BitmapDuoToneFilter.hxx> +#include <vcl/bitmap/BitmapDuoToneFilter.hxx> #include <comphelper/servicehelper.hxx> #include <cppuhelper/supportsservice.hxx> #include <cppuhelper/queryinterface.hxx> diff --git a/vcl/source/image/ImplImage.cxx b/vcl/source/image/ImplImage.cxx index 89b8cc2b5989..fa469bc20e69 100644 --- a/vcl/source/image/ImplImage.cxx +++ b/vcl/source/image/ImplImage.cxx @@ -18,21 +18,23 @@ */ #include <sal/log.hxx> -#include <utility> +#include <comphelper/lok.hxx> + #include <vcl/svapp.hxx> -#include <vcl/bitmapex.hxx> +#include <vcl/bitmap/BitmapFilter.hxx> #include <vcl/gdimtf.hxx> #include <vcl/settings.hxx> #include <vcl/virdev.hxx> -#include <vcl/BitmapFilter.hxx> #include <vcl/ImageTree.hxx> #include <vcl/skia/SkiaHelper.hxx> + #include <bitmap/BitmapDisabledImageFilter.hxx> -#include <comphelper/lok.hxx> #include <image.h> #include <salgdi.hxx> +#include <utility> + ImplImage::ImplImage(const BitmapEx &rBitmapEx) : maBitmapChecksum(0) , maSizePixel(rBitmapEx.GetSizePixel()) diff --git a/vcl/source/rendercontext/drawmode.cxx b/vcl/source/rendercontext/drawmode.cxx index fd3f29ac275f..d4c59f97618c 100644 --- a/vcl/source/rendercontext/drawmode.cxx +++ b/vcl/source/rendercontext/drawmode.cxx @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <vcl/BitmapMonochromeFilter.hxx> +#include <vcl/bitmap/BitmapMonochromeFilter.hxx> #include <vcl/bitmap/BitmapTypes.hxx> #include <vcl/rendercontext/DrawModeFlags.hxx> #include <vcl/settings.hxx> diff --git a/vcl/unx/generic/dtrans/bmp.cxx b/vcl/unx/generic/dtrans/bmp.cxx index d66cff30ae07..256967668004 100644 --- a/vcl/unx/generic/dtrans/bmp.cxx +++ b/vcl/unx/generic/dtrans/bmp.cxx @@ -23,7 +23,7 @@ #include <vcl/svapp.hxx> #include <vcl/bitmap.hxx> #include <vcl/bitmapex.hxx> -#include <vcl/BitmapSimpleColorQuantizationFilter.hxx> +#include <vcl/bitmap/BitmapSimpleColorQuantizationFilter.hxx> #include <sal/log.hxx> #include <unx/x11/xlimits.hxx> diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index 215fd92a2d7c..0f89a68c1156 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -51,7 +51,7 @@ #include <vcl/kernarray.hxx> #include <vcl/menu.hxx> #include <vcl/ImageTree.hxx> -#include <vcl/BitmapEmbossGreyFilter.hxx> +#include <vcl/bitmap/BitmapEmbossGreyFilter.hxx> #include <vcl/BitmapWriteAccess.hxx> #include <basegfx/numeric/ftools.hxx> |