[Libreoffice-commits] core.git: Branch 'libreoffice-4-4-1' - sw/source

[Caolán McNamara]

 sw/source/core/layout/tabfrm.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 8a8734b582b756476f74cd046268c7fd117e46f7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Feb 13 09:50:15 2015 +0000

    Resolves: tdf#76636 crash on merging certain cells imported from a .doc
    
    Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11
    (cherry picked from commit e1f4022b9ea7ae99a31773c445d8229ba3bdea93)
    Reviewed-on: https://gerrit.libreoffice.org/14465
    Reviewed-by: Eike Rathke <erack at redhat.com>
    Tested-by: Eike Rathke <erack at redhat.com>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>

diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 76b6be8..ad4f02e 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -4964,7 +4964,7 @@ long SwCellFrm::GetLayoutRowSpan() const
     if ( nRet < 1 )
     {
         const SwFrm* pRow = GetUpper();
-        const SwTabFrm* pTab = static_cast<const SwTabFrm*>(pRow->GetUpper());
+        const SwTabFrm* pTab = pRow ? static_cast<const SwTabFrm*>(pRow->GetUpper()) : NULL;
 
         if ( pTab && pTab->IsFollow() && pRow == pTab->GetFirstNonHeadlineRow() )
             nRet = -nRet;