sw/source/core/layout/flowfrm.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 8f02c8042d0dd368b31b4245c1179a51c6f0b29f
Author: Caolán McNamara <caol...@redhat.com>
Date: Thu Jul 21 08:57:04 2016 +0100
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/27362
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 0f105c8..3f708e2 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();
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
