diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-07-21 08:57:04 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@collabora.com> | 2016-07-29 20:01:26 +0200 |
| commit | 18deb1f3f04f078dc888a57a261f38be86698525 (patch) | |
| tree | 2069e8ebe7d6d255077beb08d5a5e533836302bd | |
| parent | 30a2f3c692e2c2603f54666f57c0b399b3942447 (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>
(cherry picked from commit be1cd0aded725d307ee9b53529c1122655b2a391)
| -rw-r--r-- | sw/source/core/layout/flowfrm.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx index f2f062ad5207..a266e3f9b7ae 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(); } |