summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCédric Bosdonnat <cedric.bosdonnat.ooo@free.fr>2011-05-13 15:25:01 +0200
committerFridrich Štrba <fridrich.strba@bluewin.ch>2011-05-13 16:53:54 +0200
commitcec2e2a1272d79b138cb190dcca68337b866cde6 (patch)
tree3cff4cf8f208a8baa0c1f016c61f50d772f56d93
parent55a0c66901f701ad13ddd8fd41dbdcb443ca2171 (diff)
fdo#36826: draw background before borders or borders may be hidden
Signed-off-by: Fridrich Štrba <fridrich.strba@bluewin.ch>
-rw-r--r--sw/source/core/layout/paintfrm.cxx5
1 files changed, 2 insertions, 3 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx
index 904c2c9dd0..144d2b0585 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5810,13 +5810,12 @@ void SwFrm::PaintBackground( const SwRect &rRect, const SwPageFrm *pPage,
{
SwBorderAttrAccess aAccess( SwFrm::GetCache(), (SwFrm*)pFrm );
const SwBorderAttrs &rTmpAttrs = *aAccess.Get();
- /// OD 06.08.2002 #99657# - paint border before painting background
- if ( bLowerBorder )
- pFrm->PaintBorder( aBorderRect, pPage, rTmpAttrs );
if ( ( pFrm->IsLayoutFrm() && bLowerBorder ) ||
aFrmRect.IsOver( aRect ) )
pFrm->PaintBackground( aRect, pPage, rTmpAttrs, bLowMode,
bLowerBorder );
+ if ( bLowerBorder )
+ pFrm->PaintBorder( aBorderRect, pPage, rTmpAttrs );
}
pFrm = pFrm->GetNext();
} while ( pFrm && pFrm->GetUpper() == this &&