summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-21 08:57:04 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-21 09:09:28 +0100
commite1b90609d50b9b8bb48e7c6548b197ed7de77253 (patch)
tree30bd0d299f0c2c6b6c3284ac2a969e908c836748
parent56823b52e50b6229265e92724732c123d1567e3c (diff)
Related: tdf#100813 crash in this doc on scrolling past page 44
Change-Id: Ib9f1f6f43229ce29e7db7e3fcdacaa10fb692ca4
-rw-r--r--sw/source/core/layout/flowfrm.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 3e4187175780..42d008c117ca 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -227,9 +227,9 @@ bool SwFlowFrame::IsKeep( const SwAttrSet& rAttrs, bool bCheckIfLastRowShouldKee
{
const SwAttrSet* pSet = nullptr;
- if ( pNxt->IsInTab() )
+ SwTabFrame* pTab = pNxt->IsInTab() ? pNxt->FindTabFrame() : nullptr;
+ if (pTab)
{
- SwTabFrame* pTab = pNxt->FindTabFrame();
if ( ! m_rThis.IsInTab() || m_rThis.FindTabFrame() != pTab )
pSet = &pTab->GetFormat()->GetAttrSet();
}