Kaydet (Commit) 4d94541a authored tarafından Chris Sherlock's avatar Chris Sherlock

Make Color a forward declaration

Change-Id: Ib28833555661b119de8e967b05e3c8691fca826a
Reviewed-on: https://gerrit.libreoffice.org/43227Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarChris Sherlock <chris.sherlock79@gmail.com>
üst 74b47af9
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <sal/types.h> #include <sal/types.h>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <tools/color.hxx>
#include <filter/msfilter/util.hxx> #include <filter/msfilter/util.hxx>
#include <unotest/bootstrapfixturebase.hxx> #include <unotest/bootstrapfixturebase.hxx>
......
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
#ifndef INCLUDED_EDITENG_BRUSHITEM_HXX #ifndef INCLUDED_EDITENG_BRUSHITEM_HXX
#define INCLUDED_EDITENG_BRUSHITEM_HXX #define INCLUDED_EDITENG_BRUSHITEM_HXX
#include <tools/color.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <vcl/wall.hxx> #include <vcl/wall.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
......
...@@ -26,7 +26,6 @@ ...@@ -26,7 +26,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <vcl/mapmod.hxx> #include <vcl/mapmod.hxx>
#include <tools/color.hxx>
#include <svl/poolitem.hxx> #include <svl/poolitem.hxx>
#include <editeng/editengdllapi.h> #include <editeng/editengdllapi.h>
#include <editeng/editeng.hxx> #include <editeng/editeng.hxx>
...@@ -36,6 +35,7 @@ ...@@ -36,6 +35,7 @@
struct ESelection; struct ESelection;
struct EFieldInfo; struct EFieldInfo;
struct EBulletInfo; struct EBulletInfo;
class Color;
class OutputDevice; class OutputDevice;
class SfxItemSet; class SfxItemSet;
class SvxTextForwarder; class SvxTextForwarder;
......
...@@ -35,13 +35,14 @@ ...@@ -35,13 +35,14 @@
#include <svtools/grfmgr.hxx> #include <svtools/grfmgr.hxx>
#include <svx/svdtypes.hxx> #include <svx/svdtypes.hxx>
#include <svx/msdffdef.hxx> #include <svx/msdffdef.hxx>
#include <tools/color.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/solar.h> #include <tools/solar.h>
#include <tools/stream.hxx> #include <tools/stream.hxx>
#include <vcl/mapmod.hxx> #include <vcl/mapmod.hxx>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
class Color;
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace awt { struct Rectangle; } namespace awt { struct Rectangle; }
namespace beans { class XPropertySet; } namespace beans { class XPropertySet; }
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sal/types.h> #include <sal/types.h>
#include <svx/msdffdef.hxx> #include <svx/msdffdef.hxx>
#include <tools/color.hxx>
#include <tools/colordata.hxx> #include <tools/colordata.hxx>
#include <vcl/errcode.hxx> #include <vcl/errcode.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
...@@ -47,6 +46,7 @@ ...@@ -47,6 +46,7 @@
#include <tools/solar.h> #include <tools/solar.h>
#include <vcl/graph.hxx> #include <vcl/graph.hxx>
class Color;
class GDIMetaFile; class GDIMetaFile;
class SotStorage; class SotStorage;
class SvStream; class SvStream;
......
...@@ -17,7 +17,8 @@ ...@@ -17,7 +17,8 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <sal/types.h> #include <sal/types.h>
#include <tools/datetime.hxx> #include <tools/datetime.hxx>
#include <tools/color.hxx>
class Color;
namespace com { namespace sun { namespace star { namespace com { namespace sun { namespace star {
namespace awt { struct Size; } namespace awt { struct Size; }
......
...@@ -19,13 +19,14 @@ ...@@ -19,13 +19,14 @@
#ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX #ifndef INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
#define INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX #define INCLUDED_SFX2_SOURCE_SIDEBAR_PAINT_HXX
#include <tools/color.hxx>
#include <vcl/gradient.hxx> #include <vcl/gradient.hxx>
#include <vcl/wall.hxx> #include <vcl/wall.hxx>
#include <com/sun/star/awt/Gradient.hpp> #include <com/sun/star/awt/Gradient.hpp>
#include <boost/variant.hpp> #include <boost/variant.hpp>
class Color;
namespace sfx2 { namespace sidebar { namespace sfx2 { namespace sidebar {
/** Abstraction of different ways to fill outlines. /** Abstraction of different ways to fill outlines.
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include <svtools/svtdllapi.h> #include <svtools/svtdllapi.h>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <svl/SfxBroadcaster.hxx> #include <svl/SfxBroadcaster.hxx>
#include <svl/lstner.hxx> #include <svl/lstner.hxx>
#include <memory> #include <memory>
......
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
#include <svx/SvxColorValueSet.hxx> #include <svx/SvxColorValueSet.hxx>
#include <svx/xtable.hxx> #include <svx/xtable.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/color.hxx>
class Color;
typedef std::pair<Color, OUString> NamedColor; typedef std::pair<Color, OUString> NamedColor;
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define INCLUDED_SVX_FRMSEL_HXX #define INCLUDED_SVX_FRMSEL_HXX
#include <memory> #include <memory>
#include <tools/color.hxx>
#include <vcl/ctrl.hxx> #include <vcl/ctrl.hxx>
#include <vcl/bitmap.hxx> #include <vcl/bitmap.hxx>
#include <editeng/borderline.hxx> #include <editeng/borderline.hxx>
...@@ -29,6 +28,8 @@ ...@@ -29,6 +28,8 @@
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
class Color;
namespace editeng { namespace editeng {
class SvxBorderLine; class SvxBorderLine;
} }
......
...@@ -23,12 +23,13 @@ ...@@ -23,12 +23,13 @@
#include <drawinglayer/attribute/fillgradientattribute.hxx> #include <drawinglayer/attribute/fillgradientattribute.hxx>
#include <drawinglayer/attribute/sdrfillattribute.hxx> #include <drawinglayer/attribute/sdrfillattribute.hxx>
#include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <drawinglayer/primitive2d/baseprimitive2d.hxx>
#include <tools/color.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>
#include <memory> #include <memory>
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////
class Color;
namespace drawinglayer namespace drawinglayer
{ {
namespace attribute namespace attribute
......
...@@ -21,11 +21,12 @@ ...@@ -21,11 +21,12 @@
#define INCLUDED_SVX_SVDHLPLN_HXX #define INCLUDED_SVX_SVDHLPLN_HXX
#include <sal/types.h> #include <sal/types.h>
#include <tools/color.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <vcl/pointr.hxx> #include <vcl/pointr.hxx>
#include <svx/svxdllapi.h> #include <svx/svxdllapi.h>
#include <vector>
#include <memory> #include <memory>
class OutputDevice; class OutputDevice;
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include <com/sun/star/awt/XControlContainer.hpp> #include <com/sun/star/awt/XControlContainer.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <svl/lstner.hxx> #include <svl/lstner.hxx>
#include <svx/svdhlpln.hxx> #include <svx/svdhlpln.hxx>
#include <svx/svdsob.hxx> #include <svx/svdsob.hxx>
......
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
#ifndef INCLUDED_VCL_BITMAP_HXX #ifndef INCLUDED_VCL_BITMAP_HXX
#define INCLUDED_VCL_BITMAP_HXX #define INCLUDED_VCL_BITMAP_HXX
#include <tools/color.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <tools/solar.h> #include <tools/solar.h>
#include <vcl/checksum.hxx> #include <vcl/checksum.hxx>
...@@ -30,6 +29,8 @@ ...@@ -30,6 +29,8 @@
#include <vcl/scopedbitmapaccess.hxx> #include <vcl/scopedbitmapaccess.hxx>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
class Color;
enum class BmpMirrorFlags enum class BmpMirrorFlags
{ {
NONE = 0x00, NONE = 0x00,
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#define INCLUDED_VCL_BUTTON_HXX #define INCLUDED_VCL_BUTTON_HXX
#include <tools/solar.h> #include <tools/solar.h>
#include <tools/color.hxx>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/image.hxx> #include <vcl/image.hxx>
#include <vcl/ctrl.hxx> #include <vcl/ctrl.hxx>
...@@ -34,6 +33,7 @@ ...@@ -34,6 +33,7 @@
#include <com/sun/star/frame/FeatureStateEvent.hpp> #include <com/sun/star/frame/FeatureStateEvent.hpp>
class Color;
class UserDrawEvent; class UserDrawEvent;
class ImplCommonButtonData; class ImplCommonButtonData;
enum class DrawButtonFlags; enum class DrawButtonFlags;
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <memory> #include <memory>
#include <vcl/vclenum.hxx> #include <vcl/vclenum.hxx>
#include <tools/color.hxx>
#include <tools/solar.h> #include <tools/solar.h>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/bitmapex.hxx> #include <vcl/bitmapex.hxx>
......
...@@ -27,10 +27,11 @@ ...@@ -27,10 +27,11 @@
#include <tools/solar.h> #include <tools/solar.h>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/color.hxx>
#include <tools/fontenum.hxx> #include <tools/fontenum.hxx>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
class Color;
// Flags for OutputDevice::Push() and OutDevState // Flags for OutputDevice::Push() and OutDevState
enum class PushFlags { enum class PushFlags {
NONE = 0x0000, NONE = 0x0000,
......
...@@ -23,8 +23,8 @@ ...@@ -23,8 +23,8 @@
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <vcl/checksum.hxx> #include <vcl/checksum.hxx>
#include <vcl/salgtype.hxx> #include <vcl/salgtype.hxx>
#include <tools/color.hxx>
#include <tools/helpers.hxx> #include <tools/helpers.hxx>
#include <tools/color.hxx>
#include <tools/solar.h> #include <tools/solar.h>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <o3tl/typed_flags_set.hxx> #include <o3tl/typed_flags_set.hxx>
......
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <tools/lineend.hxx> #include <tools/lineend.hxx>
#include <tools/link.hxx> #include <tools/link.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/color.hxx>
#include <vcl/font.hxx> #include <vcl/font.hxx>
#include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/lang/Locale.hpp>
......
...@@ -20,11 +20,11 @@ ...@@ -20,11 +20,11 @@
#ifndef INCLUDED_VCL_WALL_HXX #ifndef INCLUDED_VCL_WALL_HXX
#define INCLUDED_VCL_WALL_HXX #define INCLUDED_VCL_WALL_HXX
#include <tools/color.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <o3tl/cow_wrapper.hxx> #include <o3tl/cow_wrapper.hxx>
class Color;
class Gradient; class Gradient;
class BitmapEx; class BitmapEx;
class ImplWallpaper; class ImplWallpaper;
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#define INCLUDED_VCL_INC_IMPFONT_HXX #define INCLUDED_VCL_INC_IMPFONT_HXX
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
#include <vcl/vclenum.hxx> #include <vcl/vclenum.hxx>
......
...@@ -18,11 +18,12 @@ ...@@ -18,11 +18,12 @@
#include <basegfx/point/b2dpoint.hxx> #include <basegfx/point/b2dpoint.hxx>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/color.hxx>
#include <opengl/texture.hxx> #include <opengl/texture.hxx>
#include <unordered_map> #include <unordered_map>
class Color;
enum class TextureShaderType enum class TextureShaderType
{ {
Normal = 0, Normal = 0,
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
#include <tools/gen.hxx> #include <tools/gen.hxx>
#include <tools/color.hxx>
#include <vcl/dllapi.h> #include <vcl/dllapi.h>
#include <vcl/vclenum.hxx> #include <vcl/vclenum.hxx>
#include <vcl/fntstyle.hxx> #include <vcl/fntstyle.hxx>
......
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <ooxml/resourceids.hxx> #include <ooxml/resourceids.hxx>
#include <filter/msfilter/util.hxx> #include <filter/msfilter/util.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <tools/color.hxx>
namespace writerfilter { namespace writerfilter {
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <sal/macros.h> #include <sal/macros.h>
#include <filter/msfilter/util.hxx> #include <filter/msfilter/util.hxx>
#include <comphelper/sequence.hxx> #include <comphelper/sequence.hxx>
#include <tools/color.hxx>
namespace writerfilter { namespace writerfilter {
namespace dmapper { namespace dmapper {
......
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
#include "ConversionHelper.hxx" #include "ConversionHelper.hxx"
#include <ooxml/resourceids.hxx> #include <ooxml/resourceids.hxx>
#include <filter/msfilter/util.hxx> #include <filter/msfilter/util.hxx>
#include <tools/color.hxx>
#include <com/sun/star/table/BorderLine2.hpp> #include <com/sun/star/table/BorderLine2.hpp>
#include <com/sun/star/text/TableColumnSeparator.hpp> #include <com/sun/star/text/TableColumnSeparator.hpp>
#include <com/sun/star/text/VertOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment