https://bugs.documentfoundation.org/show_bug.cgi?id=100813
--- Comment #25 from V Stuart Foote <[email protected]> ---
(In reply to Pedro from comment #24)
>
> Was this patch committed only to the 5.1 branch? Unfortunately there aren't
> any Windows daily builds except for the Master branch.
>
> I tried a daily from the Master branch and it still crashed
>
> crashreport.libreoffice.org/stats/crash_details/c6a87fff-47a9-4ec7-8a89-
> 0397fcb1fea9
>
> Version: 5.3.0.0.alpha0+
> Build ID: 4a6329badc9c8679945d1a1ec225e26e15d7bfd2
> CPU Threads: 4; OS Version: Windows 6.2; UI Render: GL;
> TinderBox: Win-x86@62-merge-TDF, Branch:MASTER, Time: 2016-07-30_10:25:39
> Locale: pt-PT (pt_PT); Calc: CL
There are two patches to flowfrm.cxx on master and both have been back-ported
to the 5.1, and 5.2 builds. Both present on current master, and 5.2.0.4--but
just the first is in 5.1.5.2
1.
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -2017,6 +2017,9 @@ bool SwFlowFrame::MoveBwd( bool &rbReformat )
}
SwFootnoteBossFrame * pOldBoss = m_rThis.FindFootnoteBossFrame();
+ if (!pOldBoss)
+ return false;
+
SwPageFrame * const pOldPage = pOldBoss->FindPageFrame();
SwLayoutFrame *pNewUpper = nullptr;
bool bCheckPageDescs = false;
2.
--- 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();
}
--
You are receiving this mail because:
You are the assignee for the bug._______________________________________________
Libreoffice-bugs mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs
