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

1 files changed, 10 insertions, 26 deletions

diff --git a/include/svx/colrctrl.hxx b/include/svx/colrctrl.hxx
index ee3451bc857c..cd0fa07d2748 100644
--- a/include/svx/colrctrl.hxx
+++ b/include/svx/colrctrl.hxx
@@ -21,7 +21,7 @@
 
 #include <sfx2/dockwin.hxx>
 #include <sfx2/childwin.hxx>
-#include <svtools/valueset.hxx>
+#include <svx/SvxColorValueSet.hxx>
 #include <svtools/transfer.hxx>
 #include <svl/lstner.hxx>
 #include <svx/svxdllapi.h>
@@ -31,17 +31,16 @@ class SvData;
 
 /*************************************************************************
 |*
-|* SvxColorValueSet
+|* SvxColorValueSet_docking
 |*
 \************************************************************************/
 
-class SvxColorValueSet : public ValueSet, public DragSourceHelper
+class SvxColorValueSet_docking : public SvxColorValueSet, public DragSourceHelper
 {
-    using ValueSet::StartDrag;
-
 private:
+    using SvxColorValueSet::StartDrag;
 
-    sal_Bool            bLeft;
+    bool            mbLeftButton;
     Point           aDragPosPixel;
 
 protected:
@@ -56,27 +55,13 @@ protected:
     // DragSourceHelper
     virtual void    StartDrag( sal_Int8 nAction, const Point& rPtPixel );
 
-                    DECL_STATIC_LINK(SvxColorValueSet, ExecDragHdl, void*);
+                    DECL_STATIC_LINK(SvxColorValueSet_docking, ExecDragHdl, void*);
 
 public:
-                    SvxColorValueSet( Window* pParent, const ResId& rResId );
-
-    sal_Bool            IsLeftButton() const { return bLeft; }
-};
-
-/*************************************************************************
-|*
-|* Derivation from SfxChildWindow as "container" for Controller
-|*
-\************************************************************************/
-
-class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
-{
- public:
-    SvxColorChildWindow( Window*, sal_uInt16, SfxBindings*,
-                         SfxChildWinInfo* );
+                    SvxColorValueSet_docking( Window* pParent, WinBits nWinStyle = WB_ITEMBORDER );
+                    SvxColorValueSet_docking( Window* pParent, const ResId& rResId );
 
-    SFX_DECL_CHILDWINDOW_WITHID(SvxColorChildWindow);
+    bool IsLeftButton() const { return mbLeftButton; }
 };
 
 /*************************************************************************
@@ -91,13 +76,12 @@ class SvxColorDockingWindow : public SfxDockingWindow, public SfxListener
 
 private:
     XColorListRef       pColorList;
-    SvxColorValueSet    aColorSet;
+    SvxColorValueSet_docking aColorSet;
     sal_uInt16          nLeftSlot;
     sal_uInt16          nRightSlot;
     sal_uInt16          nCols;
     sal_uInt16          nLines;
     long                nCount;
-    Size                aColorSize;
     Size                aItemSize;
 
     void                FillValueSet();