[Libreoffice-commits] core.git: sw/source

[Caolán McNamara]

 sw/source/core/layout/wsfrm.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit e8e12b32ae23ee9b1613ef7794b83adbde27e9f8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Oct 31 10:08:46 2013 +0000

    Resolves: fdo#70358 crash when deleting tables
    
    Change-Id: I87282e363425a1bb6d9ab92e07717f66ee56a6c5

diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 05d90e5..985b787 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();
         }