diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-02-13 09:50:15 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-02-13 09:51:32 +0000 |
| commit | e1f4022b9ea7ae99a31773c445d8229ba3bdea93 (patch) | |
| tree | dc8e7707faf506d9b55755e73920150d72a77994 /sw | |
| parent | ecf0c4ba89e27cbb8cf7c7dd904cdd0b87dd5f52 (diff) | |
Resolves: tdf#76636 crash on merging certain cells imported from a .doc
Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11
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 a0699f0b551e..4b25ce72cbfd 100644 --- a/sw/source/core/layout/tabfrm.cxx +++ b/sw/source/core/layout/tabfrm.cxx @@ -4974,7 +4974,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; |