diff options
| author | Armin Le Grand <alg@apache.org> | 2013-04-16 08:41:07 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@suse.com> | 2013-05-20 11:33:13 +0100 |
| commit | 35aa48d80b4b800d408d26bd72fbdfd711abbb6f (patch) | |
| tree | 2756d4aa78cd67be7d1597b4222f0da0657c770d /sd/source/ui | |
| parent | 05038d1bd0a7bc9ecb6676ba1309576ac74f849f (diff) | |
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
Diffstat (limited to 'sd/source/ui')
| -rw-r--r-- | sd/source/ui/app/sddll2.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews2.cxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews6.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drvwshrg.cxx | 2 |
5 files changed, 5 insertions, 4 deletions
diff --git a/sd/source/ui/app/sddll2.cxx b/sd/source/ui/app/sddll2.cxx index e961cbf06c6e..308841523265 100644 --- a/sd/source/ui/app/sddll2.cxx +++ b/sd/source/ui/app/sddll2.cxx @@ -28,7 +28,7 @@ #include <svx/galbrws.hxx> #include <svx/srchdlg.hxx> #include <svx/fontwork.hxx> -#include <svx/colrctrl.hxx> +#include <svx/SvxColorChildWindow.hxx> #include <svx/verttexttbxctrl.hxx> #include <svx/hyperdlg.hxx> #include <svx/fillctrl.hxx> diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 7bb32b86995d..6f67a1b2b7f2 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -50,7 +50,7 @@ #include <svx/f3dchild.hxx> #include <svx/imapdlg.hxx> #include <svx/fontwork.hxx> -#include <svx/colrctrl.hxx> +#include <svx/SvxColorChildWindow.hxx> #include <svx/bmpmask.hxx> #include <svx/srchdlg.hxx> #include <svx/hyperdlg.hxx> diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx index e5c12ca7dbee..37619aa294c2 100644 --- a/sd/source/ui/view/drviews2.cxx +++ b/sd/source/ui/view/drviews2.cxx @@ -93,6 +93,7 @@ #include <editeng/shdditem.hxx> #include <svx/xtable.hxx> #include <svx/svdobj.hxx> +#include <svx/SvxColorChildWindow.hxx> #include <editeng/outlobj.hxx> #include <editeng/flstitem.hxx> #include <editeng/scripttypeitem.hxx> diff --git a/sd/source/ui/view/drviews6.cxx b/sd/source/ui/view/drviews6.cxx index 8ccc1bd51777..a4b0c2e116ed 100644 --- a/sd/source/ui/view/drviews6.cxx +++ b/sd/source/ui/view/drviews6.cxx @@ -30,7 +30,7 @@ #include <svx/galbrws.hxx> #include <svx/imapdlg.hxx> #include <svx/xftsfit.hxx> -#include <svx/colrctrl.hxx> +#include <svx/SvxColorChildWindow.hxx> #include <svx/f3dchild.hxx> #include "optsitem.hxx" #include <svx/extrusionbar.hxx> diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx index abe2d38f8c44..c71959c2f3ff 100644 --- a/sd/source/ui/view/drvwshrg.cxx +++ b/sd/source/ui/view/drvwshrg.cxx @@ -26,7 +26,7 @@ #include <svx/bmpmask.hxx> #include <svx/galbrws.hxx> #include <svx/imapdlg.hxx> -#include <svx/colrctrl.hxx> +#include <svx/SvxColorChildWindow.hxx> #include <sfx2/objface.hxx> #include <sfx2/sidebar/SidebarChildWindow.hxx> #include <svx/f3dchild.hxx> |