From 35aa48d80b4b800d408d26bd72fbdfd711abbb6f Mon Sep 17 00:00:00 2001
From: Armin Le Grand <alg@apache.org>
Date: Tue, 16 Apr 2013 08:41:07 +0000
Subject: Resolves: #i122041# Unified and centralized control for Color
 ValueSets

(cherry picked from commit 68e707bbc6fe23881b822e6efab8a2933343dc1a)

Conflicts:
	cui/source/inc/backgrnd.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/tpcolor.cxx
	sd/source/ui/view/drviews6.cxx
	svx/Package_inc.mk
	svx/inc/svx/colrctrl.hxx
	svx/source/sidebar/tools/ColorControl.cxx
	svx/source/tbxctrls/colorwindow.hxx
	svx/source/tbxctrls/colrctrl.cxx
	svx/source/tbxctrls/tbcontrl.cxx

Change-Id: Ie06fe355846b737ec8aae9aade4d408232c83193

Related: #i122041# Add a11y values for defining behaviour of ColorValueSets

(cherry picked from commit 401e8f2db607081e62eaaa1f08a8cd8971a3f637)

Conflicts:
	cui/source/tabpages/backgrnd.cxx
	officecfg/registry/schema/org/openoffice/Office/Common.xcs
	sc/source/ui/miscdlgs/tabbgcolordlg.cxx
	svtools/inc/svtools/accessibilityoptions.hxx
	svtools/source/inc/configitems/accessibilityoptions_const.hxx
	vcl/inc/vcl/bitmap.hxx
	vcl/source/gdi/bitmap4.cxx

Change-Id: If9d0db5f22974cad1ac886eca3719ca92ca7f240
---
 svx/inc/svx/sidebar/ColorControl.hxx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'svx/inc')

diff --git a/svx/inc/svx/sidebar/ColorControl.hxx b/svx/inc/svx/sidebar/ColorControl.hxx
index 58ab534c1aa1..606a906eccdb 100644
--- a/svx/inc/svx/sidebar/ColorControl.hxx
+++ b/svx/inc/svx/sidebar/ColorControl.hxx
@@ -19,6 +19,7 @@
 
 #include <svtools/valueset.hxx>
 #include <boost/function.hpp>
+#include <svx/SvxColorValueSet.hxx>
 
 class Window;
 class SfxBindings;
@@ -69,7 +70,7 @@ public:
 
 private:
     SfxBindings* mpBindings;
-    ValueSet maVSColor;
+    SvxColorValueSet maVSColor;
     FloatingWindow* mpFloatingWindow;
     const String msNoColorString;
     ::boost::function<Color(void)> maNoColorGetter;
-- 
cgit