Kaydet (Commit) 85388f93 authored tarafından Armin Le Grand's avatar Armin Le Grand

i29105 when a page background garphic is set in sw, use GlobalRetoucheColor as…

i29105 when a page background garphic is set in sw, use GlobalRetoucheColor as fallback for draw object text edit
üst 7b0d095c
......@@ -6383,10 +6383,27 @@ const Color& SwPageFrm::GetDrawBackgrdColor() const
const SvxBrushItem* pBrushItem;
const Color* pDummyColor;
SwRect aDummyRect;
if ( GetBackgroundBrush( pBrushItem, pDummyColor, aDummyRect, true) )
return pBrushItem->GetColor();
else
return aGlobalRetoucheColor;
{
const Graphic* pGraphic = pBrushItem->GetGraphic();
if(pGraphic)
{
// #29105# when a graphic is set, it may be possible to calculate a single
// color which looks good in all places of the graphic. Since it is
// planned to have text edit on the overlay one day and the fallback
// to aGlobalRetoucheColor returns something useful, just use that
// for now.
}
else
{
// not a graphic, use (hopefully) initialized color
return pBrushItem->GetColor();
}
}
return aGlobalRetoucheColor;
}
/*************************************************************************
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment