diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:52:33 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2008-03-18 13:52:33 +0000 |
| commit | c1e014252418cae9b983eefc690631715e651524 (patch) | |
| tree | 9929248f98b7dde3d17ba791940b15de2a514d6a /sc/source/ui/view/formatsh.cxx | |
| parent | 7fb97dc54c6a8ba91a175bff604ea59845d35509 (diff) | |
INTEGRATION: CWS dr60 (1.37.62); FILE MERGED
2008/03/10 12:06:43 dr 1.37.62.1: #i28752# show correct icon for transparent background
Diffstat (limited to 'sc/source/ui/view/formatsh.cxx')
| -rw-r--r-- | sc/source/ui/view/formatsh.cxx | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx index 2e97f7fa6fa1..8ed592e668c8 100644 --- a/sc/source/ui/view/formatsh.cxx +++ b/sc/source/ui/view/formatsh.cxx @@ -4,9 +4,9 @@ * * $RCSfile: formatsh.cxx,v $ * - * $Revision: 1.38 $ + * $Revision: 1.39 $ * - * last change: $Author: rt $ $Date: 2008-03-12 13:20:08 $ + * last change: $Author: vg $ $Date: 2008-03-18 14:52:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1677,7 +1677,6 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) const SfxItemSet& rAttrSet = pTabViewShell->GetSelectionPattern()->GetItemSet(); const SvxBorderLine* pLine = pTabViewShell->GetDefaultFrameLine(); const SvxBrushItem& rBrushItem = (const SvxBrushItem&)rAttrSet.Get( ATTR_BACKGROUND ); - UINT8 nTrans = rBrushItem.GetColor().GetTransparency(); SfxWhichIter aIter( rSet ); USHORT nWhich = aIter.FirstWhich(); @@ -1702,18 +1701,12 @@ void ScFormatShell::GetAttrState( SfxItemSet& rSet ) { case SID_BACKGROUND_COLOR: { - Color aColor; - if ( nTrans == 255 ) - aColor.SetColor( SC_MOD()->GetColorConfig().GetColorValue(svtools::DOCCOLOR).nColor ); - else - aColor = rBrushItem.GetColor(); - rSet.Put( SvxColorItem( aColor, SID_BACKGROUND_COLOR ) ); + rSet.Put( SvxColorItem( rBrushItem.GetColor(), SID_BACKGROUND_COLOR ) ); } break; case SID_FRAME_LINECOLOR: { - rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), - SID_FRAME_LINECOLOR ) ); + rSet.Put( SvxColorItem( pLine ? pLine->GetColor() : Color(), SID_FRAME_LINECOLOR ) ); } break; case SID_ATTR_BRUSH: |