summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-10-31 10:08:46 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-10-31 10:14:18 +0000
commite8e12b32ae23ee9b1613ef7794b83adbde27e9f8 (patch)
tree75bd6eb5a774dcf89e32da40e73c916580ba9c43
parent495cd12da44f3efc9626aa68a5c06653c2049b26 (diff)
Resolves: fdo#70358 crash when deleting tables
Change-Id: I87282e363425a1bb6d9ab92e07717f66ee56a6c5
-rw-r--r--sw/source/core/layout/wsfrm.cxx11
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 05d90e500be0..985b7875063f 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2607,8 +2607,15 @@ SwTwips SwLayoutFrm::ShrinkFrm( SwTwips nDist, sal_Bool bTst, sal_Bool bInfo )
{
_InvalidateAll();
InvalidatePage( pPage );
- const SvxGraphicPosition ePos = GetFmt()->GetBackground().GetGraphicPos();
- if ( GPOS_NONE != ePos && GPOS_TILED != ePos )
+ bool bCompletePaint = true;
+ const SwFrmFmt* pFmt = GetFmt();
+ if (pFmt)
+ {
+ const SvxGraphicPosition ePos = pFmt->GetBackground().GetGraphicPos();
+ if ( GPOS_NONE == ePos || GPOS_TILED == ePos )
+ bCompletePaint = false;
+ }
+ if (bCompletePaint)
SetCompletePaint();
}