diff options
26 files changed, 33 insertions, 18 deletions
diff --git a/filter/qa/cppunit/msfilter-test.cxx b/filter/qa/cppunit/msfilter-test.cxx index b6706f4af7e7..3fd553c05e25 100644 --- a/filter/qa/cppunit/msfilter-test.cxx +++ b/filter/qa/cppunit/msfilter-test.cxx @@ -14,6 +14,7 @@ #include <sal/types.h> #include <rtl/ustrbuf.hxx> +#include <tools/color.hxx> #include <filter/msfilter/util.hxx> #include <unotest/bootstrapfixturebase.hxx> diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx index 787fb3f1d8e0..516abdacd467 100644 --- a/include/editeng/brushitem.hxx +++ b/include/editeng/brushitem.hxx @@ -19,6 +19,7 @@ #ifndef INCLUDED_EDITENG_BRUSHITEM_HXX #define INCLUDED_EDITENG_BRUSHITEM_HXX +#include <tools/color.hxx> #include <svl/poolitem.hxx> #include <vcl/wall.hxx> #include <tools/link.hxx> diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx index 92ab6780977a..327ad7aeae19 100644 --- a/include/editeng/unoedsrc.hxx +++ b/include/editeng/unoedsrc.hxx @@ -26,7 +26,6 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> #include <vcl/mapmod.hxx> -#include <tools/color.hxx> #include <svl/poolitem.hxx> #include <editeng/editengdllapi.h> #include <editeng/editeng.hxx> @@ -36,6 +35,7 @@ struct ESelection; struct EFieldInfo; struct EBulletInfo; +class Color; class OutputDevice; class SfxItemSet; class SvxTextForwarder; diff --git a/include/filter/msfilter/escherex.hxx b/include/filter/msfilter/escherex.hxx index 47678f367739..3c125649e9d1 100644 --- a/include/filter/msfilter/escherex.hxx +++ b/include/filter/msfilter/escherex.hxx @@ -35,13 +35,14 @@ #include <svtools/grfmgr.hxx> #include <svx/svdtypes.hxx> #include <svx/msdffdef.hxx> -#include <tools/color.hxx> #include <tools/gen.hxx> #include <tools/solar.h> #include <tools/stream.hxx> #include <vcl/mapmod.hxx> #include <o3tl/typed_flags_set.hxx> +class Color; + namespace com { namespace sun { namespace star { namespace awt { struct Rectangle; } namespace beans { class XPropertySet; } diff --git a/include/filter/msfilter/msdffimp.hxx b/include/filter/msfilter/msdffimp.hxx index 41313001d772..ea6b6d6447a1 100644 --- a/include/filter/msfilter/msdffimp.hxx +++ b/include/filter/msfilter/msdffimp.hxx @@ -39,7 +39,6 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <svx/msdffdef.hxx> -#include <tools/color.hxx> #include <tools/colordata.hxx> #include <vcl/errcode.hxx> #include <tools/gen.hxx> @@ -47,6 +46,7 @@ #include <tools/solar.h> #include <vcl/graph.hxx> +class Color; class GDIMetaFile; class SotStorage; class SvStream; diff --git a/include/filter/msfilter/util.hxx b/include/filter/msfilter/util.hxx index 8aa01f5be952..8895a4181bec 100644 --- a/include/filter/msfilter/util.hxx +++ b/include/filter/msfilter/util.hxx @@ -17,7 +17,8 @@ #include <rtl/ustring.hxx> #include <sal/types.h> #include <tools/datetime.hxx> -#include <tools/color.hxx> + +class Color; namespace com { namespace sun { namespace star { namespace awt { struct Size; } diff --git a/include/sfx2/sidebar/Paint.hxx b/include/sfx2/sidebar/Paint.hxx index 91b36f093bf8..3328eb47624b 100644 --- a/include/sfx2/sidebar/Paint.hxx +++ b/include/sfx2/sidebar/Paint.hxx @@ -19,13 +19,14 @@ #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX -#include <tools/color.hxx> #include <vcl/gradient.hxx> #include <vcl/wall.hxx> #include <com/sun/star/awt/Gradient.hpp> #include <boost/variant.hpp> +class Color; + namespace sfx2 { namespace sidebar { /** Abstraction of different ways to fill outlines. diff --git a/include/svtools/extcolorcfg.hxx b/include/svtools/extcolorcfg.hxx index 16df99b9f756..52eeeb254326 100644 --- a/include/svtools/extcolorcfg.hxx +++ b/include/svtools/extcolorcfg.hxx @@ -21,7 +21,6 @@ #include <svtools/svtdllapi.h> #include <rtl/ustring.hxx> -#include <tools/color.hxx> #include <svl/SfxBroadcaster.hxx> #include <svl/lstner.hxx> #include <memory> diff --git a/include/svx/Palette.hxx b/include/svx/Palette.hxx index 64fde6f20948..a2d00f2ed166 100644 --- a/include/svx/Palette.hxx +++ b/include/svx/Palette.hxx @@ -22,7 +22,8 @@ #include <svx/SvxColorValueSet.hxx> #include <svx/xtable.hxx> #include <rtl/ustring.hxx> -#include <tools/color.hxx> + +class Color; typedef std::pair<Color, OUString> NamedColor; diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx index c91241b69653..8c35b2d29e29 100644 --- a/include/svx/frmsel.hxx +++ b/include/svx/frmsel.hxx @@ -21,7 +21,6 @@ #define INCLUDED_SVX_FRMSEL_HXX #include <memory> -#include <tools/color.hxx> #include <vcl/ctrl.hxx> #include <vcl/bitmap.hxx> #include <editeng/borderline.hxx> @@ -29,6 +28,8 @@ #include <svx/svxdllapi.h> #include <o3tl/typed_flags_set.hxx> +class Color; + namespace editeng { class SvxBorderLine; } diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx index 90f97035a92f..49fe55dc8092 100644 --- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx +++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx @@ -23,12 +23,13 @@ #include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <tools/color.hxx> #include <svl/itemset.hxx> #include <memory> ////////////////////////////////////////////////////////////////////////////// +class Color; + namespace drawinglayer { namespace attribute diff --git a/include/svx/svdhlpln.hxx b/include/svx/svdhlpln.hxx index ede56f82d279..a2920f2dbbe1 100644 --- a/include/svx/svdhlpln.hxx +++ b/include/svx/svdhlpln.hxx @@ -21,11 +21,12 @@ #define INCLUDED_SVX_SVDHLPLN_HXX #include <sal/types.h> -#include <tools/color.hxx> #include <tools/gen.hxx> #include <vcl/pointr.hxx> #include <svx/svxdllapi.h> + +#include <vector> #include <memory> class OutputDevice; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 26b971f8496b..b0f7b40e5e91 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -22,6 +22,7 @@ #include <com/sun/star/awt/XControlContainer.hpp> #include <rtl/ustring.hxx> +#include <tools/color.hxx> #include <svl/lstner.hxx> #include <svx/svdhlpln.hxx> #include <svx/svdsob.hxx> diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx index 0be13c12bf3e..e0d92edfd462 100644 --- a/include/vcl/bitmap.hxx +++ b/include/vcl/bitmap.hxx @@ -20,7 +20,6 @@ #ifndef INCLUDED_VCL_BITMAP_HXX #define INCLUDED_VCL_BITMAP_HXX -#include <tools/color.hxx> #include <tools/link.hxx> #include <tools/solar.h> #include <vcl/checksum.hxx> @@ -30,6 +29,8 @@ #include <vcl/scopedbitmapaccess.hxx> #include <o3tl/typed_flags_set.hxx> +class Color; + enum class BmpMirrorFlags { NONE = 0x00, diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx index 3ec0d467bf85..60a2aaff7249 100644 --- a/include/vcl/button.hxx +++ b/include/vcl/button.hxx @@ -21,7 +21,6 @@ #define INCLUDED_VCL_BUTTON_HXX #include <tools/solar.h> -#include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/image.hxx> #include <vcl/ctrl.hxx> @@ -34,6 +33,7 @@ #include <com/sun/star/frame/FeatureStateEvent.hpp> +class Color; class UserDrawEvent; class ImplCommonButtonData; enum class DrawButtonFlags; diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 680ccd9d5af2..669271494f4c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -22,7 +22,6 @@ #include <memory> #include <vcl/vclenum.hxx> -#include <tools/color.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> #include <vcl/bitmapex.hxx> diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx index 8e2236bb34ae..94cf877e03d0 100644 --- a/include/vcl/outdevstate.hxx +++ b/include/vcl/outdevstate.hxx @@ -27,10 +27,11 @@ #include <tools/solar.h> #include <tools/gen.hxx> -#include <tools/color.hxx> #include <tools/fontenum.hxx> #include <o3tl/typed_flags_set.hxx> +class Color; + // Flags for OutputDevice::Push() and OutDevState enum class PushFlags { NONE = 0x0000, diff --git a/include/vcl/salbtype.hxx b/include/vcl/salbtype.hxx index 97b0b213ba11..97ca0cf98493 100644 --- a/include/vcl/salbtype.hxx +++ b/include/vcl/salbtype.hxx @@ -23,8 +23,8 @@ #include <tools/debug.hxx> #include <vcl/checksum.hxx> #include <vcl/salgtype.hxx> -#include <tools/color.hxx> #include <tools/helpers.hxx> +#include <tools/color.hxx> #include <tools/solar.h> #include <vcl/dllapi.h> #include <o3tl/typed_flags_set.hxx> diff --git a/include/vcl/texteng.hxx b/include/vcl/texteng.hxx index 1596e0094c7b..c4e70d56d06e 100644 --- a/include/vcl/texteng.hxx +++ b/include/vcl/texteng.hxx @@ -31,6 +31,7 @@ #include <tools/lineend.hxx> #include <tools/link.hxx> #include <tools/gen.hxx> +#include <tools/color.hxx> #include <vcl/font.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/include/vcl/wall.hxx b/include/vcl/wall.hxx index d63fabf83e1d..c68bbf31ac10 100644 --- a/include/vcl/wall.hxx +++ b/include/vcl/wall.hxx @@ -20,11 +20,11 @@ #ifndef INCLUDED_VCL_WALL_HXX #define INCLUDED_VCL_WALL_HXX -#include <tools/color.hxx> #include <tools/gen.hxx> #include <vcl/dllapi.h> #include <o3tl/cow_wrapper.hxx> +class Color; class Gradient; class BitmapEx; class ImplWallpaper; diff --git a/vcl/inc/impfont.hxx b/vcl/inc/impfont.hxx index 654dc0c7429b..b9b8fb4654e4 100644 --- a/vcl/inc/impfont.hxx +++ b/vcl/inc/impfont.hxx @@ -21,6 +21,7 @@ #define INCLUDED_VCL_INC_IMPFONT_HXX #include <rtl/ustring.hxx> +#include <tools/color.hxx> #include <i18nlangtag/languagetag.hxx> #include <vcl/vclenum.hxx> diff --git a/vcl/inc/opengl/program.hxx b/vcl/inc/opengl/program.hxx index da2be164866f..fabd07ae1a1e 100644 --- a/vcl/inc/opengl/program.hxx +++ b/vcl/inc/opengl/program.hxx @@ -18,11 +18,12 @@ #include <basegfx/point/b2dpoint.hxx> #include <rtl/ustring.hxx> -#include <tools/color.hxx> #include <opengl/texture.hxx> #include <unordered_map> +class Color; + enum class TextureShaderType { Normal = 0, diff --git a/vcl/inc/unx/fc_fontoptions.hxx b/vcl/inc/unx/fc_fontoptions.hxx index 109120f9f69a..9cbb1cce172b 100644 --- a/vcl/inc/unx/fc_fontoptions.hxx +++ b/vcl/inc/unx/fc_fontoptions.hxx @@ -22,7 +22,6 @@ #include <rtl/ustring.hxx> #include <tools/gen.hxx> -#include <tools/color.hxx> #include <vcl/dllapi.h> #include <vcl/vclenum.hxx> #include <vcl/fntstyle.hxx> diff --git a/writerfilter/source/dmapper/BorderHandler.cxx b/writerfilter/source/dmapper/BorderHandler.cxx index 30117b24f16a..e2528c28d50e 100644 --- a/writerfilter/source/dmapper/BorderHandler.cxx +++ b/writerfilter/source/dmapper/BorderHandler.cxx @@ -24,6 +24,7 @@ #include <ooxml/resourceids.hxx> #include <filter/msfilter/util.hxx> #include <comphelper/sequence.hxx> +#include <tools/color.hxx> namespace writerfilter { diff --git a/writerfilter/source/dmapper/CellColorHandler.cxx b/writerfilter/source/dmapper/CellColorHandler.cxx index 5bd27fd272c1..cb8fccac1f71 100644 --- a/writerfilter/source/dmapper/CellColorHandler.cxx +++ b/writerfilter/source/dmapper/CellColorHandler.cxx @@ -26,6 +26,7 @@ #include <sal/macros.h> #include <filter/msfilter/util.hxx> #include <comphelper/sequence.hxx> +#include <tools/color.hxx> namespace writerfilter { namespace dmapper { diff --git a/writerfilter/source/dmapper/TDefTableHandler.cxx b/writerfilter/source/dmapper/TDefTableHandler.cxx index 0f560e452453..bd594fc510cb 100644 --- a/writerfilter/source/dmapper/TDefTableHandler.cxx +++ b/writerfilter/source/dmapper/TDefTableHandler.cxx @@ -21,6 +21,7 @@ #include "ConversionHelper.hxx" #include <ooxml/resourceids.hxx> #include <filter/msfilter/util.hxx> +#include <tools/color.hxx> #include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/VertOrientation.hpp> |