summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-02-13 09:50:15 +0000
committerAdolfo Jayme Barrientos <fitojb@ubuntu.com>2015-02-20 09:15:24 +0000
commit8a8734b582b756476f74cd046268c7fd117e46f7 (patch)
tree96bc9d6c718bd5e96fa8943d592b5a4c842bc8c1
parentb806d64748c8bcfcb9e6c4af835b893a1aef9dab (diff)
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@redhat.com> Tested-by: Eike Rathke <erack@redhat.com> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk> Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
-rw-r--r--sw/source/core/layout/tabfrm.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 76b6be8bf532..ad4f02eb64fe 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;