[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - sw/source

[Caolán McNamara]

 sw/source/core/layout/flowfrm.cxx |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit be1cd0aded725d307ee9b53529c1122655b2a391
Author: Caolán McNamara <caolanm at 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/27361
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sw/source/core/layout/flowfrm.cxx b/sw/source/core/layout/flowfrm.cxx
index 8420956..8773940 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();
                     }