diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-27 09:02:09 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-27 09:23:34 +0100 |
| commit | 969937768a72a56dae3e55ea5d21fd77a0fed0c5 (patch) | |
| tree | 0668bd9256ff3ad0fedc2c22a5f57e7ce5529fc0 /sw | |
| parent | 7eab7fc586b4a3d4d1a1c3b192567c58b72b369d (diff) | |
SwFrm::GetBackgroundBrush(): silence assert
getSdrAllFillAttributesHelper() should be called on an SwFrm in case
supportsFullDrawingLayerFillAttributeSet() retruns true, otherwise we
get:
getSdrAllFillAttributesHelper() call only valid for RES_FLYFRMFMT and RES_FRMFMT (!)
Change-Id: I08b5bffee4f2ebd852017640f9c2e5a5075ca2ec
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 9ace578bdb49..2ab70d10c205 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7477,7 +7477,8 @@ bool SwFrm::GetBackgroundBrush( return false; //UUUU - rFillAttributes = pFrm->getSdrAllFillAttributesHelper(); + if (pFrm->supportsFullDrawingLayerFillAttributeSet()) + rFillAttributes = pFrm->getSdrAllFillAttributesHelper(); const SvxBrushItem &rBack = pFrm->GetAttrSet()->GetBackground(); if( pFrm->IsSctFrm() ) |