sw/source/core/layout/paintfrm.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 969937768a72a56dae3e55ea5d21fd77a0fed0c5
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Nov 27 09:02:09 2014 +0100
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
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 9ace578..2ab70d1 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() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
