diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-13 09:50:15 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-02-23 10:34:30 +0100 |
| commit | d8bd515d58b21552813bb16bdcec0b34193ae968 (patch) | |
| tree | cb71b40998e29eab162238c0f76854db2f40f4af /sw | |
| parent | 5c8a3f2aba8c1f5a5d0573e9369119e321c55564 (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/14464
Reviewed-by: Eike Rathke <erack@redhat.com>
Tested-by: Eike Rathke <erack@redhat.com>
(cherry picked from commit a3c8e7deea306ba3efb513c8fa7311a995f7fc73)
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/tabfrm.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx index 110459d55d70..556fe2283c99 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4965,7 +4965,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; |