diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2015-06-05 08:47:33 +0200 |
|---|---|---|
| committer | Philippe Jung <phil.jung@free.fr> | 2015-06-07 13:31:05 +0000 |
| commit | 339429879b0fe9a0de83167840391b09933fcc7d (patch) | |
| tree | fc3d7c973f6cb5f4a4a9321058f5832ae310c129 /svx | |
| parent | 5e00e9ac78a61199337910e1b0cee19722c2eefe (diff) | |
tdf#91840: Default to transparent text background
(+ label the button)
Change-Id: Ie2268d2a6ea0ceb1e8dd9e696db3b9ae613552a1
Reviewed-on: https://gerrit.libreoffice.org/16092
Reviewed-by: Philippe Jung <phil.jung@free.fr>
Tested-by: Philippe Jung <phil.jung@free.fr>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 50f20ee29959..24da648872aa 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -1228,7 +1228,8 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand, mpColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) ); mpRecentColorSet->SetStyle( WinBits(WB_FLATVALUESET | WB_ITEMBORDER | WB_3DLOOK | WB_NO_DIRECTSELECT | WB_TABSTOP) ); - if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId ) + if ( SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId || + SID_ATTR_CHAR_BACK_COLOR == theSlotId ) { mpButtonAutoColor->SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) ); mpColorSet->SetAccessibleName( SVX_RESSTR( RID_SVXSTR_BACKGROUND ) ); @@ -1367,7 +1368,8 @@ IMPL_LINK_NOARG(SvxColorWindow_Impl, SelectPaletteHdl) IMPL_LINK_NOARG(SvxColorWindow_Impl, AutoColorClickHdl) { Color aColor; - if (SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId) + if (SID_ATTR_CHAR_COLOR_BACKGROUND == theSlotId || SID_BACKGROUND_COLOR == theSlotId || + SID_ATTR_CHAR_BACK_COLOR == theSlotId) aColor = COL_TRANSPARENT; else if (SID_ATTR_CHAR_COLOR == theSlotId || SID_ATTR_CHAR_COLOR2 == theSlotId || SID_EXTRUSION_3D_COLOR == theSlotId) aColor = COL_AUTO; |