summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorChris Sherlock <chris.sherlock79@gmail.com>2017-10-07 22:01:45 +1100
committerChris Sherlock <chris.sherlock79@gmail.com>2017-10-08 04:48:46 +0200
commit4d94541a7b88b76d856e30dba7f8a3de48260eda (patch)
tree1e23707309a73cf0b11db25adfc2d4d4fe980e97 /include/svx
parent74b47af9885ba4c59195fedc1e0510b8b056a025 (diff)
Make Color a forward declaration
Change-Id: Ib28833555661b119de8e967b05e3c8691fca826a Reviewed-on: https://gerrit.libreoffice.org/43227 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Chris Sherlock <chris.sherlock79@gmail.com>
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/Palette.hxx3
-rw-r--r--include/svx/frmsel.hxx3
-rw-r--r--include/svx/sdr/attribute/sdrallfillattributeshelper.hxx3
-rw-r--r--include/svx/svdhlpln.hxx3
-rw-r--r--include/svx/svdpagv.hxx1
5 files changed, 9 insertions, 4 deletions
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>