summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-21 08:57:04 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2016-07-28 14:33:00 +0000
commitbe1cd0aded725d307ee9b53529c1122655b2a391 (patch)
tree6406c31e41c5602c90343c5f78580301e9d930dd
parentb80a85b160126c758e210b7243047b83705b1efd (diff)
Related: tdf#100813 crash in this doc on scrolling past page 44
Change-Id: Ib9f1f6f43229ce29e7db7e3fcdacaa10fb692ca4 (cherry picked from commit e1b90609d50b9b8bb48e7c6548b197ed7de77253) Reviewed-on: https://gerrit.libreoffice.org/27361 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
-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 8420956a4a18..87739405a7f5 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -224,9 +224,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();
}