Skip to content

C
core
Kaydet (Commit) e1f4022b authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

Resolves: tdf#76636 crash on merging certain cells imported from a .doc 

Change-Id: I61d5088a6f2e0b444b2943a2f9ce9feeb2e09c11
üst ecf0c4ba
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
sw/source/core/layout/tabfrm.cxx
Dosyayı görüntüle @ e1f4022b
...@@ -4974,7 +4974,7 @@ long SwCellFrm::GetLayoutRowSpan() const ...@@ -4974,7 +4974,7 @@ long SwCellFrm::GetLayoutRowSpan() const
if ( nRet < 1 ) if ( nRet < 1 )
{ {
const SwFrm* pRow = GetUpper(); 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() ) if ( pTab && pTab->IsFollow() && pRow == pTab->GetFirstNonHeadlineRow() )
nRet = -nRet; nRet = -nRet;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment