adjust .ui widgets for centralized Color ValueSets
Change-Id: Ie6b86a2a48e6697f816e9975b6e34491ab0ad17e
diff --git a/extras/source/glade/libreoffice-catalog.xml.in b/extras/source/glade/libreoffice-catalog.xml.in
index 58b99ac..91a087d 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -78,6 +78,9 @@
<glade-widget-class title="ValueSet" name="svtlo-ValueSet"
generic-name="Set of Value Options" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ValueSet" name="svxlo-SvxColorValueSet"
generic-name="Set of Value Options" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
<glade-widget-class title="ValueSet" name="swuilo-ColumnValueSet"
generic-name="Set of Value Options" parent="GtkDrawingArea"
icon-name="widget-gtk-drawingarea"/>
diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx
index 34dfa6c..4363fa0 100644
--- a/svx/source/tbxctrls/SvxColorValueSet.cxx
+++ b/svx/source/tbxctrls/SvxColorValueSet.cxx
@@ -19,6 +19,7 @@
#include <svx/SvxColorValueSet.hxx>
#include <svx/xtable.hxx>
#include <svtools/accessibilityoptions.hxx>
#include <vcl/builder.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -27,6 +28,21 @@ SvxColorValueSet::SvxColorValueSet(Window* _pParent, WinBits nWinStyle)
{
}
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvxColorValueSet(Window *pParent, VclBuilder::stringmap &rMap)
{
WinBits nWinBits = WB_TABSTOP;
VclBuilder::stringmap::iterator aFind = rMap.find(OString("border"));
if (aFind != rMap.end())
{
if (toBool(aFind->second))
nWinBits |= WB_BORDER;
rMap.erase(aFind);
}
return new SvxColorValueSet(pParent, nWinBits);
}
SvxColorValueSet::SvxColorValueSet(Window* _pParent, const ResId& rResId)
: ValueSet(_pParent, rResId)
{
