diff options
Diffstat (limited to 'svx/source/tbxctrls/tbcontrl.cxx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 61 |
1 files changed, 36 insertions, 25 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 28bc427898bf..a73c223b1ee0 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1447,35 +1447,44 @@ NamedColor SvxColorWindow::GetNoneColor() const return std::make_pair(aColor, sColorName); } -NamedColor SvxColorWindow::GetAutoColor() const +namespace { - Color aColor; - OUString sColorName; - switch (theSlotId) + NamedColor GetAutoColor(sal_uInt16 nSlotId) { - case SID_ATTR_CHAR_COLOR_BACKGROUND: - case SID_BACKGROUND_COLOR: - case SID_ATTR_CHAR_BACK_COLOR: - aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_NOFILL); - break; - case SID_AUTHOR_COLOR: - aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_BY_AUTHOR); - break; - case SID_BMPMASK_COLOR: - aColor = COL_TRANSPARENT; - sColorName = SVX_RESSTR(RID_SVXSTR_TRANSPARENT); - break; - case SID_ATTR_CHAR_COLOR: - case SID_ATTR_CHAR_COLOR2: - case SID_EXTRUSION_3D_COLOR: - aColor = COL_AUTO; - sColorName = SVX_RESSTR(RID_SVXSTR_AUTOMATIC); - break; + Color aColor; + OUString sColorName; + switch (nSlotId) + { + case SID_ATTR_CHAR_COLOR_BACKGROUND: + case SID_BACKGROUND_COLOR: + case SID_ATTR_CHAR_BACK_COLOR: + aColor = COL_TRANSPARENT; + sColorName = SVX_RESSTR(RID_SVXSTR_NOFILL); + break; + case SID_AUTHOR_COLOR: + aColor = COL_TRANSPARENT; + sColorName = SVX_RESSTR(RID_SVXSTR_BY_AUTHOR); + break; + case SID_BMPMASK_COLOR: + aColor = COL_TRANSPARENT; + sColorName = SVX_RESSTR(RID_SVXSTR_TRANSPARENT); + break; + case SID_ATTR_CHAR_COLOR: + case SID_ATTR_CHAR_COLOR2: + case SID_EXTRUSION_3D_COLOR: + default: + aColor = COL_AUTO; + sColorName = SVX_RESSTR(RID_SVXSTR_AUTOMATIC); + break; + } + + return std::make_pair(aColor, sColorName); } +} - return std::make_pair(aColor, sColorName); +NamedColor SvxColorWindow::GetAutoColor() const +{ + return ::GetAutoColor(theSlotId); } IMPL_LINK(SvxColorWindow, AutoColorClickHdl, Button*, pButton, void) @@ -3209,7 +3218,9 @@ SvxColorListBox::SvxColorListBox(vcl::Window* pParent, WinBits nStyle) , m_nSlotId(0) , m_bShowNoneButton(false) { + m_aSelectedColor = GetAutoColor(m_nSlotId); LockWidthRequest(); + ShowPreview(m_aSelectedColor); SetActivateHdl(LINK(this, SvxColorListBox, MenuActivateHdl)); } |