diff options
Diffstat (limited to 'sw/source/core/text/inftxt.cxx')
| -rw-r--r-- | sw/source/core/text/inftxt.cxx | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 7ce119cc9441..1b133fb167e2 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -64,9 +64,6 @@ #include <EnhancedPDFExportHelper.hxx> #include <docufld.hxx> -//UUUU -#include <frmfmt.hxx> - #include <unomid.h> #if OSL_DEBUG_LEVEL > 1 @@ -502,16 +499,15 @@ static bool lcl_IsDarkBackground( const SwTxtPaintInfo& rInf ) if( ! pCol || COL_TRANSPARENT == pCol->GetColor() ) { const SvxBrushItem* pItem; + const XFillStyleItem* pFillStyleItem; + const XFillGradientItem* pFillGradientItem; SwRect aOrigBackRect; - //UUUU - FillAttributesPtr aFillAttributes; - // Consider, that [GetBackgroundBrush(...)] can set <pCol> // See implementation in /core/layout/paintfrm.cxx // There is a background color, if there is a background brush and // its color is *not* "no fill"/"auto fill". - if( rInf.GetTxtFrm()->GetBackgroundBrush( aFillAttributes, pItem, pCol, aOrigBackRect, false ) ) + if( rInf.GetTxtFrm()->GetBackgroundBrush( pItem, pFillStyleItem, pFillGradientItem, pCol, aOrigBackRect, false ) ) { if ( !pCol ) pCol = &pItem->GetColor(); @@ -903,14 +899,8 @@ void SwTxtPaintInfo::DrawRect( const SwRect &rRect, bool bNoGraphic, m_pOut->DrawRect( rRect.SVRect() ); else { - if(pBrushItem != ((SvxBrushItem*)-1)) - { - ::DrawGraphic( pBrushItem, m_pOut, aItemRect, rRect ); - } - else - { - OSL_ENSURE(false, "DrawRect: Uninitialized BrushItem!" ); - } + OSL_ENSURE( ((SvxBrushItem*)-1) != pBrushItem, "DrawRect: Uninitialized BrushItem!" ); + ::DrawGraphic( pBrushItem, 0, 0, m_pOut, aItemRect, rRect ); } } } |