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 /cui/uiconfig/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 'cui/uiconfig/ui')
| -rw-r--r-- | cui/uiconfig/ui/backgroundpage.ui | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/colorpage.ui | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/cui/uiconfig/ui/backgroundpage.ui b/cui/uiconfig/ui/backgroundpage.ui index 3182e288179f..78d761fb24f8 100644 --- a/cui/uiconfig/ui/backgroundpage.ui +++ b/cui/uiconfig/ui/backgroundpage.ui @@ -217,7 +217,7 @@ </packing> </child> <child> - <object class="svtlo-ValueSet" id="backgroundcolorset"> + <object class="svxlo-SvxColorValueSet" id="backgroundcolorset"> <property name="width_request">150</property> <property name="height_request">150</property> <property name="visible">True</property> diff --git a/cui/uiconfig/ui/colorpage.ui b/cui/uiconfig/ui/colorpage.ui index 48da1f31b5f6..0146da13b28b 100644 --- a/cui/uiconfig/ui/colorpage.ui +++ b/cui/uiconfig/ui/colorpage.ui @@ -129,7 +129,7 @@ </packing> </child> <child> - <object class="svtlo-ValueSet" id="colorset"> + <object class="svxlo-SvxColorValueSet" id="colorset"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> |