diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-10-31 10:08:46 +0000 |
|---|---|---|
| committer | Eike Rathke <erack@redhat.com> | 2013-11-02 16:17:54 -0500 |
| commit | c5112b0ab7c97a092981fe0d1a6c8bf37931b53e (patch) | |
| tree | 8cc64872e005282ab322fa93d860ea4d71df9b9c | |
| parent | cc502dadd01658e80a4f36fe43ac16c46e819b30 (diff) | |
Resolves: fdo#70358 crash when deleting tables
Change-Id: I87282e363425a1bb6d9ab92e07717f66ee56a6c5
(cherry picked from commit e8e12b32ae23ee9b1613ef7794b83adbde27e9f8)
Reviewed-on: https://gerrit.libreoffice.org/6509
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
| -rw-r--r-- | sw/source/core/layout/wsfrm.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx index de45f50dad6e..007de688805d 100644 --- a/sw/source/core/layout/wsfrm.cxx +++ b/sw/source/core/layout/wsfrm.cxx @@ -2650,8 +2650,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(); } |